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

Fix material colors to match previous version better #13666

Merged
merged 9 commits into from
Feb 6, 2021
Merged

Fix material colors to match previous version better #13666

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
faaad33
Bump Google Material
PureWeen Feb 3, 2021
ec87a5d
Bump material and set HintText to transparent on multi line controls
PureWeen Feb 4, 2021
35620fa
Fix material colors to match previous version better
PureWeen Feb 5, 2021
bc2b9da
- additional test cases
PureWeen Feb 5, 2021
c7557bc
- fix issue with button background color
PureWeen Feb 5, 2021
5a03795
- push button to bottom of page
PureWeen Feb 5, 2021
f8c0b56
Update VisualGallery.xaml.cs
PureWeen Feb 5, 2021
2483c94
Merge branch '5.0.0' into fix_13416
PureWeen Feb 5, 2021
287e182
Update MaterialColors.cs
PureWeen Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nuspec/Xamarin.Forms.Visual.Material.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.2.0.4" />
<dependency id="Xamarin.Google.Android.Material" version="1.1.0.5" />
<dependency id="Xamarin.Google.Android.Material" version="1.2.1.1" />
</group>
<group targetFramework="Xamarin.iOS10">
<dependency id="Xamarin.iOS.MaterialComponents" version="92.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion .nuspec/Xamarin.Forms.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<dependencies>
<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.2.0.4" />
<dependency id="Xamarin.Google.Android.Material" version="1.1.0.5" />
<dependency id="Xamarin.Google.Android.Material" version="1.2.1.1" />
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.6" />
<dependency id="Xamarin.AndroidX.Browser" version="1.3.0" />
</group>
Expand Down
2 changes: 1 addition & 1 deletion DualScreen/DualScreen.Android/DualScreen.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.6" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0" />
<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.1.0.5" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 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 @@ -24,7 +24,7 @@
<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.6" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0.5" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0.6" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Xamarin.Forms.ControlGallery.Android/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.6" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.6" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
</ItemGroup>
Expand Down
348 changes: 32 additions & 316 deletions Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml
View file
Open in desktop

Large diffs are not rendered by default.

45 changes: 1 addition & 44 deletions ...rin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,61 +13,18 @@ namespace Xamarin.Forms.Controls.Issues
{
public partial class VisualControlsPage : TestShell
{
bool isVisible = false;
double percentage = 0.0;

public VisualControlsPage()
{
#if APP
InitializeComponent();
#endif
}

protected override void Init()
{
BindingContext = this;
}

public double PercentageCounter
{
get { return percentage; }
set
{
percentage = value;
OnPropertyChanged();
OnPropertyChanged(nameof(Counter));
}
}

public double Counter => percentage * 10;

protected override void OnAppearing()
{
isVisible = true;

base.OnAppearing();

Device.StartTimer(TimeSpan.FromSeconds(1), () =>
{
var progress = PercentageCounter + 0.1;
if (progress > 1)
progress = 0;

PercentageCounter = progress;

return isVisible;
});
}

protected override void OnDisappearing()
{
isVisible = false;

base.OnDisappearing();
}




[Preserve(AllMembers = true)]
[Issue(IssueTracker.Github, 4435, "Visual Gallery Loads",
PlatformAffected.iOS | PlatformAffected.Android)]
Expand Down