From 8d23bc89e8e6d7f3d78cc577ed40886859d78052 Mon Sep 17 00:00:00 2001 From: Matt Portune <59324545+mportune-bw@users.noreply.github.com> Date: Thu, 23 Sep 2021 13:11:51 -0400 Subject: [PATCH] Update XF to remove AndroidX dependency hack (#1544) * update forms and other libs * change async pattern --- src/Android/Android.csproj | 16 +++++++--------- src/Android/Renderers/CustomTabbedRenderer.cs | 4 ++-- src/App/App.csproj | 4 ++-- src/Core/Core.csproj | 2 +- src/iOS.Autofill/iOS.Autofill.csproj | 2 +- src/iOS.Extension/iOS.Extension.csproj | 2 +- test/Common/Common.csproj | 2 +- test/Core.Test/Core.Test.csproj | 2 +- 8 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index 5414e8255..de1b03b29 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -76,13 +76,11 @@ 1.8.10 - - - - - - - + + + + + 1.7.0 @@ -90,10 +88,10 @@ 122.0.0 - + - 117.0.0 + 117.0.1 diff --git a/src/Android/Renderers/CustomTabbedRenderer.cs b/src/Android/Renderers/CustomTabbedRenderer.cs index 74d1c0dd3..ee11f56a2 100644 --- a/src/Android/Renderers/CustomTabbedRenderer.cs +++ b/src/Android/Renderers/CustomTabbedRenderer.cs @@ -49,11 +49,11 @@ namespace Bit.Droid.Renderers return null; } - async void BottomNavigationView.IOnNavigationItemReselectedListener.OnNavigationItemReselected(IMenuItem item) + public void OnNavigationItemReselected(IMenuItem item) { if (_page?.CurrentPage?.Navigation != null && _page.CurrentPage.Navigation.NavigationStack.Count > 0) { - await _page.CurrentPage.Navigation.PopToRootAsync(); + Device.BeginInvokeOnMainThread(async () => await _page.CurrentPage.Navigation.PopToRootAsync()); } } } diff --git a/src/App/App.csproj b/src/App/App.csproj index 9e85ac823..fdafa7f28 100644 --- a/src/App/App.csproj +++ b/src/App/App.csproj @@ -13,11 +13,11 @@ - + - + diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index 35ba155e0..5b7d9d959 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/iOS.Autofill/iOS.Autofill.csproj b/src/iOS.Autofill/iOS.Autofill.csproj index b6712c1e7..c45a673e1 100644 --- a/src/iOS.Autofill/iOS.Autofill.csproj +++ b/src/iOS.Autofill/iOS.Autofill.csproj @@ -253,7 +253,7 @@ - 4.3.0 + 4.4.0 diff --git a/src/iOS.Extension/iOS.Extension.csproj b/src/iOS.Extension/iOS.Extension.csproj index a21af8489..973e94876 100644 --- a/src/iOS.Extension/iOS.Extension.csproj +++ b/src/iOS.Extension/iOS.Extension.csproj @@ -231,7 +231,7 @@ - 4.3.0 + 4.4.0 diff --git a/test/Common/Common.csproj b/test/Common/Common.csproj index 684b990f2..11277dd56 100644 --- a/test/Common/Common.csproj +++ b/test/Common/Common.csproj @@ -15,7 +15,7 @@ - + diff --git a/test/Core.Test/Core.Test.csproj b/test/Core.Test/Core.Test.csproj index 05a117c93..fab0a8163 100644 --- a/test/Core.Test/Core.Test.csproj +++ b/test/Core.Test/Core.Test.csproj @@ -7,7 +7,7 @@ - +