Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Androidx bumps #14506

Merged
merged 3 commits into from
Sep 8, 2021
Merged

Androidx bumps #14506

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4debbff
Update to Latest Android X Libraries
PureWeen Aug 13, 2021
5b90fe2
- fix android forwarders
PureWeen Aug 13, 2021
bc10a96
Moar updates
jfversluis Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .nuspec/Xamarin.Forms.Visual.Material.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</group>

<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.2.0.4,2.3)" />
<dependency id="Xamarin.Google.Android.Material" version="[1.2.1.1,1.3)" />
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.3.1.1,2.4)" />
<dependency id="Xamarin.Google.Android.Material" version="[1.4.0.2,1.5)" />
</group>
<group targetFramework="Xamarin.iOS10">
<dependency id="Xamarin.iOS.MaterialComponents" version="92.0.0"/>
Expand Down
18 changes: 9 additions & 9 deletions .nuspec/Xamarin.Forms.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.2.0.4,2.3)" />
<dependency id="Xamarin.Google.Android.Material" version="[1.2.1.1,1.3)" />
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="[1.0.0.7,1.1)" />
<dependency id="Xamarin.AndroidX.Browser" version="[1.3.0.5,1.4)" />
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.3.1.1,2.4)" />
<dependency id="Xamarin.Google.Android.Material" version="[1.4.0.2,1.5)" />
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="[1.0.0.8,1.1)" />
<dependency id="Xamarin.AndroidX.Browser" version="[1.3.0.6,1.4)" />

<!-- Because of a misspelled reference these all need to be explicitly included so the fixed version
is transitively loaded https://github.com/xamarin/AndroidX/issues/283#issuecomment-788103573 -->
<dependency id="Xamarin.AndroidX.Core" version="[1.3.2.3,1.4)" />
<dependency id="Xamarin.AndroidX.CustomView" version="[1.1.0.6,1.2)" />
<dependency id="Xamarin.AndroidX.Preference" version="[1.1.1.8,1.2)" />
<dependency id="Xamarin.AndroidX.RecyclerView" version="[1.1.0.8,1.2)" />
<dependency id="Xamarin.AndroidX.Navigation.UI" version="[2.3.2.1,2.4)" />
<dependency id="Xamarin.AndroidX.Core" version="[1.6.0.1,1.7)" />
<dependency id="Xamarin.AndroidX.CustomView" version="[1.1.0.7,1.2)" />
<dependency id="Xamarin.AndroidX.Preference" version="[1.1.1.9,1.2)" />
<dependency id="Xamarin.AndroidX.RecyclerView" version="[1.2.1.1,1.3)" />
<dependency id="Xamarin.AndroidX.Navigation.UI" version="[2.3.5.1,2.4)" />
</group>
<group targetFramework="uap10.0.14393">
<dependency id="NETStandard.Library" version="2.0.1"/>
Expand Down
6 changes: 3 additions & 3 deletions DualScreen/DualScreen.Android/DualScreen.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
Expand Down
10 changes: 5 additions & 5 deletions EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.5" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.6" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10.0'">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0.8" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Xamarin.Forms.ControlGallery.Android/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project>
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.5" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.6" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.6" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
</ItemGroup>
<Import Project="Nuget.Build.targets" />
<Import Project="..\Nuget.targets" Condition="'$(FromSource)' == 'false'" />
Expand Down
10 changes: 5 additions & 5 deletions Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.5" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.6" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,12 +349,12 @@
</PackageReference>
<PackageReference Include="Xam.Plugin.DeviceInfo">
<Version>3.0.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.3.2.3" />
<PackageReference Include="Xamarin.AndroidX.CustomView" Version="1.1.0.6" />
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.1.1.8" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0.8" />
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.6.0.1" />
<PackageReference Include="Xamarin.AndroidX.CustomView" Version="1.1.0.7" />
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.1.1.9" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.1" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\fonts\ionicons.ttf">
Expand Down
6 changes: 3 additions & 3 deletions Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10.0'">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="117.0.0" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="117.0.1" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<AndroidResource Include="Resources\**\*" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) " >
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
Expand Down
9 changes: 5 additions & 4 deletions Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using AndroidX.ViewPager.Widget;
using Google.Android.Material.BottomNavigation;
using Google.Android.Material.BottomSheet;
using Google.Android.Material.Navigation;
using Google.Android.Material.Tabs;
using Xamarin.Forms.Internals;
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
Expand All @@ -26,7 +27,7 @@ public class TabbedPageRenderer : VisualElementRenderer<TabbedPage>,
#pragma warning disable CS0618 // Type or member is obsolete
TabLayout.IOnTabSelectedListener,
#pragma warning restore CS0618 // Type or member is obsolete
ViewPager.IOnPageChangeListener, IManageFragments, BottomNavigationView.IOnNavigationItemSelectedListener
ViewPager.IOnPageChangeListener, IManageFragments, NavigationBarView.IOnItemSelectedListener
{
Drawable _backgroundDrawable;
Drawable _wrappedBackgroundDrawable;
Expand Down Expand Up @@ -197,7 +198,7 @@ protected override void Dispose(bool disposing)

if (_bottomNavigationView != null)
{
_bottomNavigationView.SetOnNavigationItemSelectedListener(null);
_bottomNavigationView.SetOnItemSelectedListener(null);
_bottomNavigationView.Dispose();
_bottomNavigationView = null;
}
Expand Down Expand Up @@ -267,7 +268,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<TabbedPage> e)
if (_bottomNavigationView != null)
{
_relativeLayout.RemoveView(_bottomNavigationView);
_bottomNavigationView.SetOnNavigationItemSelectedListener(null);
_bottomNavigationView.SetOnItemSelectedListener(null);
}

var bottomNavigationViewLayoutParams = new AWidget.RelativeLayout.LayoutParams(
Expand Down Expand Up @@ -470,7 +471,7 @@ void OnChildrenCollectionChanged(object sender, NotifyCollectionChangedEventArgs
else
{
SetupBottomNavigationView(e);
bottomNavigationView.SetOnNavigationItemSelectedListener(this);
bottomNavigationView.SetOnItemSelectedListener(this);
}

UpdateIgnoreContainerAreas();
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ internal void MarkNativeSelection(object selectedItem)

for (int i = 0; i < _currentViewHolders.Count; i++)
{
if (_currentViewHolders[i].AdapterPosition == position)
if (_currentViewHolders[i].BindingAdapterPosition == position)
{
_currentViewHolders[i].IsSelected = true;
return;
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Forms.Platform.Android/CollectionView/SelectableViewHolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void OnClick(global::Android.Views.View view)
{
if (_isSelectionEnabled)
{
OnViewHolderClicked(AdapterPosition);
OnViewHolderClicked(BindingAdapterPosition);
}
}

Expand Down
13 changes: 7 additions & 6 deletions Xamarin.Forms.Platform.Android/Renderers/ShellItemRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using Android.Widget;
using Google.Android.Material.BottomNavigation;
using Google.Android.Material.BottomSheet;
using Google.Android.Material.Navigation;
using AColor = Android.Graphics.Color;
using AView = Android.Views.View;
using IMenu = Android.Views.IMenu;
Expand All @@ -17,16 +18,16 @@

namespace Xamarin.Forms.Platform.Android
{
public class ShellItemRenderer : ShellItemRendererBase, BottomNavigationView.IOnNavigationItemSelectedListener, IAppearanceObserver
public class ShellItemRenderer : ShellItemRendererBase, NavigationBarView.IOnItemSelectedListener, IAppearanceObserver
{
#region IOnNavigationItemSelectedListener
#region IOnItemSelectedListener

bool BottomNavigationView.IOnNavigationItemSelectedListener.OnNavigationItemSelected(IMenuItem item)
bool NavigationBarView.IOnItemSelectedListener.OnNavigationItemSelected(IMenuItem item)
{
return OnItemSelected(item);
}

#endregion IOnNavigationItemSelectedListener
#endregion IOnItemSelectedListener

#region IAppearanceObserver

Expand Down Expand Up @@ -63,7 +64,7 @@ public override AView OnCreateView(LayoutInflater inflater, ViewGroup container,
_navigationArea = _outerLayout.FindViewById<FrameLayout>(Resource.Id.bottomtab_navarea);

_bottomView.SetBackgroundColor(Color.White.ToAndroid());
_bottomView.SetOnNavigationItemSelectedListener(this);
_bottomView.SetOnItemSelectedListener(this);

if (ShellItem == null)
throw new InvalidOperationException("Active Shell Item not set. Have you added any Shell Items to your Shell?");
Expand Down Expand Up @@ -102,7 +103,7 @@ void Destroy()

if (_bottomView != null)
{
_bottomView?.SetOnNavigationItemSelectedListener(null);
_bottomView.SetOnItemSelectedListener(null);
_bottomView?.Background?.Dispose();
_bottomView?.Dispose();
}
Expand Down
8 changes: 4 additions & 4 deletions Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.3.2.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.3.5.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
Expand Down