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

Commit 6cfbf26

Browse files
rylryl
committed
Merged master. Resolved conflicts.
2 parents ea6e902 + 4cfa825 commit 6cfbf26

File tree

60 files changed

+1714
-288
lines changed

Some content is hidden

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

60 files changed

+1714
-288
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,6 @@ AndroidNative/gradlew.bat
6363
*.pdb
6464
# temporary vim files
6565
*.swp
66+
tools/
67+
!tools/mdoc/**/*
68+
caketools/

‎Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@
162162
<ProjectReference Include="..\Xamarin.Forms.Material.iOS\Xamarin.Forms.Material.iOS.csproj">
163163
<Project>{8A75B1DC-CEED-4B1B-8675-A7DFFD1E6DE4}</Project>
164164
<Name>Xamarin.Forms.Material.iOS</Name>
165+
<IsAppExtension>false</IsAppExtension>
166+
<IsWatchApp>false</IsWatchApp>
165167
</ProjectReference>
166168
</ItemGroup>
167169
<ItemGroup>

‎Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1332.cs

-73
This file was deleted.

‎Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1760.cs

+10-67
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,27 @@
33
using Xamarin.Forms.CustomAttributes;
44
using Xamarin.Forms.Internals;
55

6-
#if UITEST
7-
using NUnit.Framework;
8-
#endif
9-
106
namespace Xamarin.Forms.Controls.Issues
117
{
128
[Preserve(AllMembers = true)]
139
[Issue(IssueTracker.Github, 1760, "Content set after an await is not visible", PlatformAffected.Android)]
1410
public class Issue1760 : TestMasterDetailPage
1511
{
16-
public const string Before = "Before";
17-
public const string After = "After";
12+
const string Before = "Before";
13+
const string After = "After";
1814
const int Wait = 3;
1915

2016
protected override void Init()
2117
{
22-
Master = new _1760Master(true);
23-
Detail = new _1760TestPage(true);
18+
Master = new _1760Master();
19+
Detail = new _1760TestPage();
2420
IsPresented = true;
2521
}
2622

2723
[Preserve(AllMembers = true)]
2824
public class _1760Master : ContentPage
2925
{
30-
readonly bool _scrollEnabled;
31-
32-
public _1760Master(bool scrollEnabled)
26+
public _1760Master()
3327
{
3428
var instructions = new Label { Text = $"Select one of the menu items. The detail page text should change to {Before}. After {Wait} seconds the text should change to {After}." };
3529

@@ -42,23 +36,19 @@ public _1760Master(bool scrollEnabled)
4236

4337
Content = new StackLayout{Children = { instructions, menuView }};
4438
Title = "GH 1760 Test App";
45-
46-
_scrollEnabled = scrollEnabled;
4739
}
4840

4941
void OnMenuClicked(object sender, SelectedItemChangedEventArgs e)
5042
{
5143
var mainPage = (MasterDetailPage)Parent;
52-
mainPage.Detail = new _1760TestPage(_scrollEnabled);
44+
mainPage.Detail = new _1760TestPage();
5345
mainPage.IsPresented = false;
5446
}
5547
}
5648

5749
[Preserve(AllMembers = true)]
5850
public class _1760TestPage : ContentPage
5951
{
60-
readonly bool _scrollEnabled;
61-
6252
public async Task DisplayPage()
6353
{
6454
IsBusy = true;
@@ -76,9 +66,8 @@ public View HeaderPageContent
7666
set => _headerPageContent.Content = value;
7767
}
7868

79-
public _1760TestPage(bool scrollEnabled)
69+
public _1760TestPage()
8070
{
81-
_scrollEnabled = scrollEnabled;
8271
CreateHeaderPage();
8372
DisplayPage();
8473
}
@@ -95,57 +84,11 @@ void CreateHeaderPage()
9584

9685
Title = "_1760 Test Page";
9786

98-
if (_scrollEnabled)
99-
{
100-
Content = new ScrollView
101-
{
102-
Content = _headerPageContent
103-
};
104-
}
105-
else
87+
Content = new ScrollView
10688
{
107-
var _headerLabel = new Label
108-
{
109-
Text = Title,
110-
TextColor = Color.FromHex("333333"),
111-
HeightRequest = 25,
112-
};
113-
114-
var headerLayout = new RelativeLayout
115-
{
116-
BackgroundColor = Color.White,
117-
HorizontalOptions = LayoutOptions.Start,
118-
VerticalOptions = LayoutOptions.Start,
119-
};
120-
121-
headerLayout.Children.Add(_headerLabel,
122-
Forms.Constraint.Constant(0),
123-
Forms.Constraint.Constant(0),
124-
Forms.Constraint.RelativeToParent(parent => parent.Width));
125-
126-
Content = new StackLayout
127-
{
128-
HorizontalOptions = LayoutOptions.FillAndExpand,
129-
VerticalOptions = LayoutOptions.FillAndExpand,
130-
Children = {
131-
_headerLabel, _headerPageContent
132-
}
133-
};
134-
}
89+
Content = _headerPageContent
90+
};
13591
}
13692
}
137-
138-
#if UITEST && __ANDROID__
139-
[Test]
140-
public void Issue1760Test()
141-
{
142-
RunningApp.WaitForElement(Before);
143-
RunningApp.WaitForElement(After);
144-
145-
RunningApp.Tap("Test Page 1");
146-
RunningApp.WaitForElement(Before);
147-
RunningApp.WaitForElement(After);
148-
}
149-
#endif
15093
}
15194
}

‎Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1760_1.cs

-34
This file was deleted.

‎Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4629.cs

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
using System.Collections.Generic;
2+
using Xamarin.Forms.CustomAttributes;
3+
using Xamarin.Forms.Internals;
4+
5+
namespace Xamarin.Forms.Controls.Issues
6+
{
7+
[Preserve(AllMembers = true)]
8+
[Issue(IssueTracker.Github, 4629, "Picker/DatePicker/TimePicker on iOS iPad should NOT have word suggestions", PlatformAffected.iOS)]
9+
public class Issue4629 : ContentPage
10+
{
11+
public Issue4629()
12+
{
13+
var picker = new Picker()
14+
{
15+
ItemsSource = new List<string>()
16+
{
17+
"Apple",
18+
"Banana",
19+
"Peach"
20+
},
21+
HorizontalOptions = LayoutOptions.FillAndExpand
22+
};
23+
var datePicker = new DatePicker();
24+
var timePicker = new TimePicker();
25+
Content = new StackLayout()
26+
{
27+
Children = { picker, datePicker,timePicker },
28+
VerticalOptions = LayoutOptions.CenterAndExpand,
29+
HorizontalOptions = LayoutOptions.CenterAndExpand
30+
};
31+
}
32+
}
33+
}
34+

‎Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5172.cs

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
using System;
2+
using Xamarin.Forms.CustomAttributes;
3+
using Xamarin.Forms.Internals;
4+
5+
#if UITEST
6+
using Xamarin.Forms.Core.UITests;
7+
using Xamarin.UITest;
8+
using NUnit.Framework;
9+
#endif
10+
11+
namespace Xamarin.Forms.Controls.Issues
12+
{
13+
#if UITEST
14+
[Category(UITestCategories.ManualReview)]
15+
#endif
16+
[Preserve(AllMembers = true)]
17+
[Issue(IssueTracker.Github, 5172, "ImageCell does not load image from URI - Android", PlatformAffected.Android)]
18+
public class Issue5172 : TestContentPage // or TestMasterDetailPage, etc ...
19+
{
20+
protected override void Init()
21+
{
22+
Label header = new Label
23+
{
24+
Text = "Please make sure a image is shown in the ImageCell bellow",
25+
FontSize = Device.GetNamedSize(NamedSize.Large, typeof(Label)),
26+
HorizontalOptions = LayoutOptions.Center
27+
};
28+
29+
TableView tableView = new TableView
30+
{
31+
Intent = TableIntent.Form,
32+
Root = new TableRoot
33+
{
34+
new TableSection
35+
{
36+
new ImageCell
37+
{
38+
// Some differences with loading images in initial release.
39+
ImageSource = ImageSource.FromUri(new Uri("https://raw.githubusercontent.com/xamarin/Xamarin.Forms/543da8aec914efc6ce98794302792ef948cc28c8/Xamarin.Forms.ControlGallery.Android/Resources/drawable/coffee.png")),
40+
Text = "This is an ImageCell",
41+
Detail = "This is some detail text",
42+
}
43+
}
44+
}
45+
};
46+
47+
Padding = new Thickness(10, 20, 10, 5);
48+
49+
Content = new StackLayout
50+
{
51+
Children =
52+
{
53+
header,
54+
tableView
55+
}
56+
};
57+
}
58+
59+
}
60+
}

‎Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@
1414
<DependentUpon>Bugzilla60787.xaml</DependentUpon>
1515
<SubType>Code</SubType>
1616
</Compile>
17-
<Compile Include="$(MSBuildThisFileDirectory)Issue1332.cs" />
1817
<Compile Include="$(MSBuildThisFileDirectory)Issue2102.cs" />
1918
<Compile Include="$(MSBuildThisFileDirectory)Issue1588.xaml.cs">
2019
<DependentUpon>Issue1588.xaml</DependentUpon>
2120
<SubType>Code</SubType>
2221
</Compile>
22+
<Compile Include="$(MSBuildThisFileDirectory)Issue4629.cs" />
2323
<Compile Include="$(MSBuildThisFileDirectory)Issue4384.cs" />
24-
<Compile Include="$(MSBuildThisFileDirectory)Issue1760_1.cs" />
2524
<Compile Include="$(MSBuildThisFileDirectory)Issue4782.cs" />
2625
<Compile Include="$(MSBuildThisFileDirectory)Issue4484.cs" />
2726
<Compile Include="$(MSBuildThisFileDirectory)Issue3509.cs" />
@@ -879,6 +878,7 @@
879878
<Compile Include="$(MSBuildThisFileDirectory)Issue4314.cs" />
880879
<Compile Include="$(MSBuildThisFileDirectory)Issue3318.cs" />
881880
<Compile Include="$(MSBuildThisFileDirectory)Issue5150.cs" />
881+
<Compile Include="$(MSBuildThisFileDirectory)Issue5172.cs" />
882882
</ItemGroup>
883883
<ItemGroup>
884884
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Bugzilla22229.xaml">
@@ -1092,4 +1092,4 @@
10921092
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
10931093
</EmbeddedResource>
10941094
</ItemGroup>
1095-
</Project>
1095+
</Project>

0 commit comments

Comments
 (0)