-Removed unused refs.

-Further implemented AndroidNavigationManager.
WilliamABradley · Nov 21, 2017 · 6484015 · 6484015
1 parent aeb19ef
commit 6484015
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/Android/Activities/ActivityHandler.cs b/Android/Activities/ActivityHandler.cs
@@ -120,6 +120,6 @@ public bool OnCreateContextMenu(IContextMenu menu, View v, IContextMenuContextMe
         private Dictionary<View, Tuple<Controls.MenuLayout.Menu, AndroidContextMenuBinding>> ContextMenuActivations { get; } = new Dictionary<View, Tuple<Controls.MenuLayout.Menu, AndroidContextMenuBinding>>();
         private Dictionary<int, TaskCompletionSource<ActivityResult>> ActivityResultWaiters { get; } = new Dictionary<int, TaskCompletionSource<ActivityResult>>();
 
-        private static Dictionary<Activity, ActivityHandler> Handlers { get; } = new Dictionary<Activity, ActivityHandler>();
+        internal static Dictionary<Activity, ActivityHandler> Handlers { get; } = new Dictionary<Activity, ActivityHandler>();
     }
 }
diff --git a/Android/PlatformBindings-Android.csproj b/Android/PlatformBindings-Android.csproj
@@ -10,7 +10,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xam.Plugin.Connectivity" Version="3.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="26.1.0.1" />
   </ItemGroup>
 

diff --git a/Android/Services/AndroidNavigationManager.cs b/Android/Services/AndroidNavigationManager.cs
@@ -1,4 +1,6 @@
 using Android.App;
+using Android.Support.V7.App;
+using PlatformBindings.Activities;
 using PlatformBindings.Common;
 using System;
 
@@ -8,19 +10,45 @@ public class AndroidNavigationManager : INavigationManager
     {
         public bool CanGoBack => throw new NotImplementedException();
 
-        public bool ShowBackButton { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public bool ShowBackButton
+        {
+            get
+            {
+                return false;
+            }
+            set
+            {
+                var activity = CurrentActivity;
+                if (activity is AppCompatActivity compatAct)
+                {
+                    compatAct.SupportActionBar?.SetDisplayHomeAsUpEnabled(true);
+                }
+                else if (activity.ActionBar != null)
+                {
+                    activity.ActionBar.SetDisplayHomeAsUpEnabled(true);
+                }
+            }
+        }
+
         public bool MenuOpen { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
         public event EventHandler<bool> BackButtonStateChanged;
 
         public void ClearBackStack()
         {
-            throw new NotImplementedException();
+            foreach (var handle in ActivityHandler.Handlers)
+            {
+                if (handle.Key != CurrentActivity)
+                {
+                    handle.Key.Finish();
+                    ActivityHandler.Handlers.Remove(handle.Key);
+                }
+            }
         }
 
         public void GoBack()
         {
-            throw new NotImplementedException();
+            CurrentActivity.Finish();
         }
 
         public virtual void Navigate(object PageRequest, object Parameter)

diff --git a/Core/PlatformBindings-Core.csproj b/Core/PlatformBindings-Core.csproj
@@ -21,7 +21,6 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="System.Net.NetworkInformation" Version="4.3.0" />
-    <PackageReference Include="Xam.Plugin.Connectivity" Version="3.0.3" />
   </ItemGroup>
 
   <ItemGroup>