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

Commit 7e28228

Browse files
jfversluisAndreiMisiukevichjsuarezruizgithub-actions[bot]WebDucer
authored
Merge main into dev (#913)
* [Android] Fix Long Press blocks CollectionView selection (#764) * #760 * Moved helper methods to VisualElementExtensions * Update src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/VisualElementExtension.shared.cs * Update src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/VisualElementExtension.shared.cs Co-authored-by: Javier Suárez <[email protected]> Co-authored-by: Gerald Versluis <[email protected]> * [Android] Fix SideMenuView + Slider issue (#824) * [Android] Allow using slider inside SideMenu with disabled gestures #810 * Refactored gesture default threshold #810 * Cleaned code. Added linker safety code * Fixed build Co-authored-by: Javier Suárez <[email protected]> * Automated dotnet-format update (#837) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Remove `Device` dependency from command implementation (#825) (#830) * Remove `Device` dependency from command implementation (#804) * Move Xamarin.CommunityToolkit.ObjectModel.Internals classes to `Internals` folder * Add Platform-Specific MainThread Implementations, Update Unit Tests to Acommidate Context Switching * Update BaseCommand.uwp.cs * Add BaseCommand.wpf.cs * Finish BaseCommand.gtk.cs * Update BaseCommand.shared.cs Co-authored-by: Eugen Richter <[email protected]> Co-authored-by: Brandon Minnick <[email protected]> * Automated dotnet-format update (#865) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fixes #859 (#864) Co-authored-by: Gerald Versluis <[email protected]> * ValidationBehavior: Added IsNotValid property (#836) * Added IsNotValid property to validators * small fix * Updated sample * #822 (#877) * Fixes AvatarView - Valid source images dont load for the first time they are created (#849) * #805 * Update src/CommunityToolkit/Xamarin.CommunityToolkit/Views/AvatarView/AvatarView.shared.cs Co-authored-by: Gerald Versluis <[email protected]> * Fixed image loading * Fixed null ref * Fixes crashes Co-authored-by: Gerald Versluis <[email protected]> Co-authored-by: Javier Suárez <[email protected]> Co-authored-by: Pedro Jesus <[email protected]> * Added inline docs (#882) * Update ViewsGalleryViewModel.cs (#888) removed duplicated text "used to" * Document all behaviors and associated (#895) * Housekeeping remove XamlCompilation from code-behind. (#897) * Changed TabView SelectedIndex property to use TwoWay binding mode (#903) * Add inline Docs/Comments to Converters (#907) * Update azure-pipelines.yml Co-authored-by: Andrei <[email protected]> Co-authored-by: Javier Suárez <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Eugen Richter <[email protected]> Co-authored-by: Eugen Richter <[email protected]> Co-authored-by: Brandon Minnick <[email protected]> Co-authored-by: Pedro Jesus <[email protected]> Co-authored-by: WillAutioItrax <[email protected]> Co-authored-by: Cfun <[email protected]>
1 parent 0d55a63 commit 7e28228

File tree

79 files changed

+1348
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1348
-302
lines changed

‎azure-pipelines.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ variables:
44
PreviewNumber: $[counter(variables['CurrentSemanticVersionBase'], 1001)]
55
CurrentSemanticVersion: '$(CurrentSemanticVersionBase)-preview$(PreviewNumber)'
66
NugetPackageVersion: '$(CurrentSemanticVersion)'
7-
MONO_VERSION: 6_4_0
8-
XCODE_VERSION: 11.4
7+
#MONO_VERSION: 6_4_0
8+
#XCODE_VERSION: 11.4
99
NETCORE_VERSION: '3.1.x'
1010
NETCORE_TEST_VERSION: '3.1.x'
1111
RunPoliCheck: 'false'
@@ -153,11 +153,12 @@ jobs:
153153
Write-Host ("##vso[task.setvariable variable=NugetPackageVersion;]$tagVersion")
154154
displayName: Set NuGet Version to Tag Number
155155
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
156+
# 16feb21 jfversluis: let's not pin this anymore and use latest
156157
# make sure to select the correct Xamarin and mono
157-
- bash: sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(MONO_VERSION)
158-
displayName: Switch to the latest Xamarin SDK
159-
- bash: echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(XCODE_VERSION).app;sudo xcode-select --switch /Applications/Xcode_$(XCODE_VERSION).app/Contents/Developer
160-
displayName: Switch to the latest Xcode
158+
#- bash: sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(MONO_VERSION)
159+
# displayName: Switch to the latest Xamarin SDK
160+
#- bash: echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(XCODE_VERSION).app;sudo xcode-select --switch /Applications/Xcode_$(XCODE_VERSION).app/Contents/Developer
161+
# displayName: Switch to the latest Xcode
161162
# restore, build and pack the packages
162163
- task: UseDotNet@2
163164
displayName: 'Use .Net Core sdk'

‎samples/XCT.Sample/Pages/AboutPage.xaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using Xamarin.CommunityToolkit.Sample.ViewModels;
23

34
namespace Xamarin.CommunityToolkit.Sample.Pages
45
{

‎samples/XCT.Sample/Pages/Behaviors/EmailValidationBehaviorPage.xaml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,21 @@
1515
Spacing="50"
1616
VerticalOptions="CenterAndExpand">
1717
<Label Text="Text color will change accordingly to the style that is configured when a invalid value (email address) is entered." />
18-
<Entry Placeholder="Email">
19-
<Entry.Behaviors>
20-
<xct:EmailValidationBehavior DecorationFlags="Trim" InvalidStyle="{StaticResource InvalidEntryStyle}"/>
21-
</Entry.Behaviors>
22-
</Entry>
18+
<StackLayout Spacing="3">
19+
<Entry Placeholder="Email">
20+
<Entry.Behaviors>
21+
<xct:EmailValidationBehavior
22+
x:Name="EmailValidator"
23+
DecorationFlags="Trim"
24+
InvalidStyle="{StaticResource InvalidEntryStyle}"/>
25+
</Entry.Behaviors>
26+
</Entry>
27+
<Label Text="Invalid email"
28+
TextColor="Red"
29+
FontSize="10"
30+
IsVisible="{Binding IsNotValid, Source={x:Reference EmailValidator}}"
31+
/>
32+
</StackLayout>
2333
</StackLayout>
2434

2535
</pages:BasePage>

‎samples/XCT.Sample/Pages/Behaviors/ImpliedOrderGridBehaviorPage.xaml.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
using System;
22
using System.Linq;
33
using Xamarin.Forms;
4-
using Xamarin.Forms.Xaml;
54

65
namespace Xamarin.CommunityToolkit.Sample.Pages.Behaviors
76
{
8-
[XamlCompilation(XamlCompilationOptions.Compile)]
97
public partial class ImpliedOrderGridBehaviorPage
108
{
119
public ImpliedOrderGridBehaviorPage() => InitializeComponent();

‎samples/XCT.Sample/Pages/Behaviors/MaxLengthReachedBehaviorPage.xaml.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
using Xamarin.CommunityToolkit.Behaviors;
2-
using Xamarin.Forms.Xaml;
32

43
namespace Xamarin.CommunityToolkit.Sample.Pages.Behaviors
54
{
6-
[XamlCompilation(XamlCompilationOptions.Compile)]
75
public partial class MaxLengthReachedBehaviorPage : BasePage
86
{
97
public MaxLengthReachedBehaviorPage()

‎samples/XCT.Sample/Pages/Behaviors/RequiredStringValidationBehaviorPage.xaml.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
using Xamarin.Forms.Xaml;
2-
3-
namespace Xamarin.CommunityToolkit.Sample.Pages.Behaviors
1+
namespace Xamarin.CommunityToolkit.Sample.Pages.Behaviors
42
{
5-
[XamlCompilation(XamlCompilationOptions.Compile)]
63
public partial class RequiredStringValidationBehaviorPage : BasePage
74
{
85
public RequiredStringValidationBehaviorPage()

‎samples/XCT.Sample/Pages/Behaviors/UserStoppedTypingBehaviorPage.xaml.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
using Xamarin.Forms.Xaml;
2-
3-
namespace Xamarin.CommunityToolkit.Sample.Pages.Behaviors
1+
namespace Xamarin.CommunityToolkit.Sample.Pages.Behaviors
42
{
5-
[XamlCompilation(XamlCompilationOptions.Compile)]
63
public partial class UserStoppedTypingBehaviorPage : BasePage
74
{
85
public UserStoppedTypingBehaviorPage() => InitializeComponent();

‎samples/XCT.Sample/Pages/Converters/DateTimeOffsetConverterPage.xaml.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
using Xamarin.Forms.Xaml;
2-
3-
namespace Xamarin.CommunityToolkit.Sample.Pages.Converters
1+
namespace Xamarin.CommunityToolkit.Sample.Pages.Converters
42
{
5-
[XamlCompilation(XamlCompilationOptions.Compile)]
63
public partial class DateTimeOffsetConverterPage : BasePage
74
{
85
public DateTimeOffsetConverterPage()

‎samples/XCT.Sample/Pages/Effects/EffectsGalleryPage.xaml.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
using Xamarin.Forms.Xaml;
2-
3-
namespace Xamarin.CommunityToolkit.Sample.Pages.Effects
1+
namespace Xamarin.CommunityToolkit.Sample.Pages.Effects
42
{
5-
[XamlCompilation(XamlCompilationOptions.Compile)]
63
public partial class EffectsGalleryPage
74
{
85
public EffectsGalleryPage() => InitializeComponent();

‎samples/XCT.Sample/Pages/Effects/IconTintColorEffectPage.xaml.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
using Xamarin.Forms.Xaml;
2-
3-
namespace Xamarin.CommunityToolkit.Sample.Pages.Effects
1+
namespace Xamarin.CommunityToolkit.Sample.Pages.Effects
42
{
5-
[XamlCompilation(XamlCompilationOptions.Compile)]
63
public partial class IconTintColorEffectPage : BasePage
74
{
85
public IconTintColorEffectPage()

0 commit comments

Comments
 (0)