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

Commit

Permalink
Merge branch '5.0.0' into fix-13918
Browse files Browse the repository at this point in the history
  • Loading branch information
jsuarezruiz committed Sep 24, 2021
2 parents 46347cc + 8426694 commit 86ecc93
Show file tree
Hide file tree
Showing 108 changed files with 2,326 additions and 238 deletions.
4 changes: 2 additions & 2 deletions .nuspec/Xamarin.Forms.Visual.Material.nuspec
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
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
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
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>
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
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
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>
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
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ protected override void Init()
var testListView = new ListView();
var items = new[] { "Foo" };
testListView.ItemsSource = items;
testListView.RowHeight = 23;
testListView.ItemTemplate = new DataTemplate(() =>
{
var result = new ViewCell
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8" ?>
<local:TestContentPage
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Title="Frame Backgrund Issue" xmlns:local="using:Xamarin.Forms.Controls"
x:Class="Xamarin.Forms.Controls.Issues.FrameBackgroundIssue">
<ScrollView>
<StackLayout
Padding="12">
<Frame
HasShadow="False"
WidthRequest="150"
BackgroundColor="LightGray"
BorderColor="DarkGreen"
CornerRadius="0"
Padding="0">
<StackLayout>
<BoxView
BackgroundColor="GreenYellow" />
<Label
Margin="8"
Text="Frame using BackgroundColor"
TextColor="Black" />
</StackLayout>
</Frame>
<Frame
HasShadow="False"
WidthRequest="150"
BackgroundColor="LightGray"
BorderColor="DarkGreen"
CornerRadius="{Binding Source={x:Reference CornerRadiusSlider}, Path=Value}"
Padding="0">
<StackLayout>
<BoxView
BackgroundColor="GreenYellow" />
<Label
Margin="8"
Text="Frame using BackgroundColor"
TextColor="Black" />
</StackLayout>
</Frame>
<Frame
HasShadow="False"
WidthRequest="150"
Background="LightGray"
BorderColor="DeepPink"
CornerRadius="0"
Padding="0">
<StackLayout>
<BoxView
Background="LightPink" />
<Label
Margin="8"
Text="Frame using Background"
TextColor="Black" />
</StackLayout>
</Frame>
<Frame
HasShadow="False"
WidthRequest="150"
Background="LightGray"
BorderColor="DeepPink"
CornerRadius="{Binding Source={x:Reference CornerRadiusSlider}, Path=Value}"
Padding="0">
<StackLayout>
<BoxView
Background="LightPink" />
<Label
Margin="8"
Text="Frame using Background"
TextColor="Black" />
</StackLayout>
</Frame>
<Label
FontSize="Micro"
Text="Frame CornerRadius"/>
<Slider
x:Name="CornerRadiusSlider"
Minimum="0"
Maximum="48"
Value="12"/>
</StackLayout>
</ScrollView>
</local:TestContentPage>
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;

#if UITEST
using Xamarin.UITest;
using NUnit.Framework;
using Xamarin.Forms.Core.UITests;
#endif

namespace Xamarin.Forms.Controls.Issues
{
#if UITEST
[Category(UITestCategories.Frame)]
#endif
[Preserve(AllMembers = true)]
[Issue(IssueTracker.Github, 0,
"[Bug] Frame Background not working",
PlatformAffected.Android)]
public partial class FrameBackgroundIssue : TestContentPage
{
public FrameBackgroundIssue()
{
#if APP
InitializeComponent();
#endif
}

protected override void Init()
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ namespace Xamarin.Forms.Controls.Issues
{
#if UITEST
[Category(UITestCategories.CollectionView)]
[Category(UITestCategories.UwpIgnore)]
[NUnit.Framework.Category(Core.UITests.UITestCategories.Github5000)]
#endif
#if APP
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
<?xml version="1.0" encoding="utf-8" ?>
<controls:TestContentPage
xmlns:controls="clr-namespace:Xamarin.Forms.Controls"
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Title="Issue 11795"
x:Class="Xamarin.Forms.Controls.Issues.Issue11795">
<controls:TestContentPage.Resources>
<ResourceDictionary>

<LinearGradientBrush x:Key="LinearBrush" StartPoint="0, 0" EndPoint="1, 0">
<LinearGradientBrush.GradientStops>
<GradientStop Color="YellowGreen" Offset="0.1"/>
<GradientStop Color="Green" Offset="0.9"/>
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>

<Style TargetType="Slider">
<Setter Property="MinimumTrackColor" Value="LightGray" />
<Setter Property="MaximumTrackColor" Value="Gray" />
</Style>

</ResourceDictionary>
</controls:TestContentPage.Resources>
<StackLayout>
<Label
Padding="12"
BackgroundColor="Black"
TextColor="White"
Text="Modify the Brush Offset values. If you modify the gradient, the test has passed."/>
<Grid>
<!-- EXPLORER -->
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<StackLayout
Grid.Row="0"
Margin="12, 0"
Padding="12">
<Label
Text="Color BoxView"
FontSize="Micro"/>
<BoxView
x:Name="SolidBoxView"
HeightRequest="60"
WidthRequest="120"
CornerRadius="12"
BackgroundColor="Red"/>
<Label
Text="Gradient BoxView"
FontSize="Micro"/>
<BoxView
x:Name="GradientBoxView"
HeightRequest="60"
WidthRequest="120"
CornerRadius="12"
Background="{StaticResource LinearBrush}"/>
<Label
Text="Color Frame"
FontSize="Micro"/>
<Frame
x:Name="SolidFrame"
HasShadow="True"
HeightRequest="60"
WidthRequest="120"
CornerRadius="12"
Padding="6"
BackgroundColor="Red">
<Grid>
<Label
HorizontalOptions="Center"
VerticalOptions="Center"
TextColor="White"
Text="Color"/>
</Grid>
</Frame>
<Label
Text="Gradient Frame"
FontSize="Micro"/>
<Frame
x:Name="GradientFrame"
HasShadow="True"
HeightRequest="60"
WidthRequest="120"
CornerRadius="12"
Padding="6"
Background="{StaticResource LinearBrush}">
<Grid>
<Label
HorizontalOptions="Center"
VerticalOptions="Center"
Text="LinearGradientBrush"/>
</Grid>
</Frame>
</StackLayout>
<ScrollView
Grid.Row="1"
Margin="12, 0"
Padding="12">
<StackLayout>
<Label
Text="Color 1 Offset"/>
<Slider
x:Name="Offset1Slider"
Minimum="0.0"
Maximum="1.0"
Value="0.1"
ValueChanged="OnOffset1SliderValueChanged"/>
<Label
Text="Color 2 Offset"/>
<Slider
x:Name="Offset2Slider"
Minimum="0.0"
Margin="1.0"
Value="0.9"
ValueChanged="OnOffset2SliderValueChanged"/>
</StackLayout>
</ScrollView>
</Grid>
</Grid>
</StackLayout>
</controls:TestContentPage>
Loading

0 comments on commit 86ecc93

Please sign in to comment.