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

Commit a62cdc2

Browse files
davidbritchdavidbritch
committed
Build fixes.
1 parent ca8783d commit a62cdc2

File tree

14 files changed

+2719
-161
lines changed

14 files changed

+2719
-161
lines changed

‎FormsGallery/FormsGallery/FormsGallery.Android/MainActivity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ protected override void OnCreate(Bundle bundle)
1414

1515
base.OnCreate(bundle);
1616

17-
Xamarin.Forms.Forms.SetFlags(new string[] {"SwipeView_Experimental", "IndicatorView_Experimental", "CarouselView_Experimental" });
17+
Xamarin.Forms.Forms.SetFlags(new string[] {"SwipeView_Experimental", "IndicatorView_Experimental", "CarouselView_Experimental", "MediaElement_Experimental" });
1818
global::Xamarin.Forms.Forms.Init(this, bundle);
1919
global::Xamarin.FormsMaps.Init(this, bundle);
2020
LoadApplication(new App());

‎FormsGallery/FormsGallery/FormsGallery.UWP/App.xaml.cs

100755100644
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
5858

5959
rootFrame.NavigationFailed += OnNavigationFailed;
6060

61+
Xamarin.Forms.Forms.SetFlags(new string[] { "SwipeView_Experimental", "IndicatorView_Experimental", "CarouselView_Experimental", "MediaElement_Experimental" });
6162
Xamarin.Forms.Forms.Init(e);
6263

6364
Xamarin.FormsMaps.Init("MAP_KEY");

‎FormsGallery/FormsGallery/FormsGallery.iOS/AppDelegate.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsAppli
1818
//
1919
public override bool FinishedLaunching(UIApplication app, NSDictionary options)
2020
{
21-
Xamarin.Forms.Forms.SetFlags(new string[] { "SwipeView_Experimental", "IndicatorView_Experimental", "CarouselView_Experimental" });
21+
Xamarin.Forms.Forms.SetFlags(new string[] { "SwipeView_Experimental", "CarouselView_Experimental", "IndicatorView_Experimental", "MediaElement_Experimental" });
2222
global::Xamarin.Forms.Forms.Init();
2323
global::Xamarin.FormsMaps.Init();
2424
LoadApplication(new App());

‎FormsGallery/FormsGallery/FormsGallery/App.xaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ public partial class App : Application
88
{
99
public App()
1010
{
11-
Device.SetFlags(new string[] { "MediaElement_Experimental" });
1211
InitializeComponent();
1312
MainPage = new NavigationPage(new HomePage());
1413
}

‎FormsGallery/FormsGallery/FormsGallery/CodeExamples/IndicatorViewDemoPage.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@ public IndicatorViewDemoPage()
1717
HorizontalOptions = LayoutOptions.Center
1818
};
1919

20+
// Create the IndicatorView.
21+
IndicatorView indicatorView = new IndicatorView
22+
{
23+
Margin = new Thickness(0, 0, 0, 40),
24+
IndicatorColor = Color.LightGray,
25+
SelectedIndicatorColor = Color.DarkGray,
26+
HorizontalOptions = LayoutOptions.Center
27+
};
28+
2029
// Create the CarouselView.
2130
CarouselView carouselView = new CarouselView
2231
{
@@ -78,19 +87,10 @@ public IndicatorViewDemoPage()
7887
rootStackLayout.Children.Add(frame);
7988

8089
return rootStackLayout;
81-
})
90+
}),
91+
IndicatorView = indicatorView
8292
};
8393
carouselView.SetBinding(ItemsView.ItemsSourceProperty, "Monkeys");
84-
85-
// Create the IndicatorView.
86-
IndicatorView indicatorView = new IndicatorView
87-
{
88-
Margin = new Thickness(0,0,0,40),
89-
IndicatorColor = Color.LightGray,
90-
SelectedIndicatorColor = Color.DarkGray,
91-
HorizontalOptions = LayoutOptions.Center
92-
};
93-
IndicatorView.SetItemsSourceBy(indicatorView, carouselView);
9494

9595
// Build the page.
9696
Title = "IndicatorView Demo";

‎FormsGallery/FormsGallery/FormsGallery/XamlExamples/IndicatorViewDemoPage.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
FontSize="50"
99
FontAttributes="Bold"
1010
HorizontalOptions="Center" />
11-
<CarouselView x:Name="carouselView"
12-
ItemsSource="{Binding Monkeys}">
11+
<CarouselView ItemsSource="{Binding Monkeys}"
12+
IndicatorView="indicatorView">
1313
<CarouselView.ItemTemplate>
1414
<DataTemplate>
1515
<StackLayout>
@@ -44,7 +44,7 @@
4444
</DataTemplate>
4545
</CarouselView.ItemTemplate>
4646
</CarouselView>
47-
<IndicatorView IndicatorView.ItemsSourceBy="carouselView"
47+
<IndicatorView x:Name="indicatorView"
4848
Margin="0,0,0,40"
4949
IndicatorColor="LightGray"
5050
SelectedIndicatorColor="DarkGray"

‎SignInWithApple/XamarinFormsAppleSignIn/XamarinFormsAppleSignIn.Android/Properties/AndroidManifest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.xamarinformsapplesignin">
3-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
4-
<application android:label="XamarinFormsAppleSignIn.Android"></application>
5-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
6-
</manifest>
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
4+
<application android:label="XamarinFormsAppleSignIn.Android"></application>
5+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
6+
</manifest>

‎SignInWithApple/XamarinFormsAppleSignIn/XamarinFormsAppleSignIn.Android/XamarinFormsAppleSignIn.Android.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1616
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1717
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
18-
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
1918
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
2019
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
2120
<AndroidUseAapt2>true</AndroidUseAapt2>
@@ -109,7 +108,7 @@
109108
<Name>Xamarin.AppleSignIn</Name>
110109
</ProjectReference>
111110
<ProjectReference Include="..\XamarinFormsAppleSignIn\XamarinFormsAppleSignIn.csproj">
112-
<Project>{200A5384-0471-4356-93B3-C021A827E139}</Project>
111+
<Project>{6E2CA9EF-74FC-42F2-AC28-66F0D9280C07}</Project>
113112
<Name>XamarinFormsAppleSignIn</Name>
114113
</ProjectReference>
115114
</ItemGroup>

‎SkiaSharpForms/Demos/Demos/SkiaSharpFormsDemos.Droid/SkiaSharpFormsDemos.Droid.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
<WarningLevel>4</WarningLevel>
3131
<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
3232
<AndroidLinkMode>None</AndroidLinkMode>
33-
<AotAssemblies>false</AotAssemblies>
34-
<EnableLLVM>false</EnableLLVM>
35-
<BundleAssemblies>false</BundleAssemblies>
3633
<JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
3734
<AndroidSupportedAbis />
3835
</PropertyGroup>

‎UserInterface/CarouselViewDemos/CarouselViewDemos/Views/Indicators/HorizontalLayoutWithIndicatorsPage.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<viewmodels:MonkeysViewModel />
99
</ContentPage.BindingContext>
1010
<StackLayout>
11-
<CarouselView x:Name="carouselView"
12-
ItemsSource="{Binding Monkeys}">
11+
<CarouselView ItemsSource="{Binding Monkeys}"
12+
IndicatorView="indicatorView">
1313
<CarouselView.ItemTemplate>
1414
<DataTemplate>
1515
<StackLayout>
@@ -44,8 +44,8 @@
4444
</DataTemplate>
4545
</CarouselView.ItemTemplate>
4646
</CarouselView>
47-
<IndicatorView IndicatorsShape="Square"
48-
IndicatorView.ItemsSourceBy="carouselView"
47+
<IndicatorView x:Name="indicatorView"
48+
IndicatorsShape="Square"
4949
IndicatorColor="LightGray"
5050
SelectedIndicatorColor="DarkGray"
5151
HorizontalOptions="Center"

‎UserInterface/IndicatorViewDemos/IndicatorViewDemos/Views/BasicIndicatorViewPage.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<viewmodels:MonkeysViewModel />
99
</ContentPage.BindingContext>
1010
<StackLayout Margin="10">
11-
<CarouselView x:Name="carouselView"
12-
ItemsSource="{Binding Monkeys}">
11+
<CarouselView ItemsSource="{Binding Monkeys}"
12+
IndicatorView="indicatorView">
1313
<CarouselView.ItemTemplate>
1414
<DataTemplate>
1515
<StackLayout>
@@ -44,7 +44,7 @@
4444
</DataTemplate>
4545
</CarouselView.ItemTemplate>
4646
</CarouselView>
47-
<IndicatorView IndicatorView.ItemsSourceBy="carouselView"
47+
<IndicatorView x:Name="indicatorView"
4848
MaximumVisible="6"
4949
Margin="0,0,0,40"
5050
IndicatorColor="LightGray"

‎UserInterface/IndicatorViewDemos/IndicatorViewDemos/Views/ConfigurableIndicatorViewPage.xaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
</Picker>
6767
<CarouselView Grid.Row="4"
6868
Grid.ColumnSpan="2"
69-
x:Name="carouselView"
70-
ItemsSource="{Binding Monkeys}">
69+
ItemsSource="{Binding Monkeys}"
70+
IndicatorView="indicatorView">
7171
<CarouselView.ItemTemplate>
7272
<DataTemplate>
7373
<StackLayout>
@@ -105,7 +105,6 @@
105105
<IndicatorView x:Name="indicatorView"
106106
Grid.Row="5"
107107
Grid.ColumnSpan="2"
108-
IndicatorView.ItemsSourceBy="carouselView"
109108
Margin="0,0,0,40"
110109
HorizontalOptions="Center" />
111110
</Grid>

‎UserInterface/IndicatorViewDemos/IndicatorViewDemos/Views/TemplatedIndicatorViewPage.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<viewmodels:MonkeysViewModel />
99
</ContentPage.BindingContext>
1010
<StackLayout Margin="10">
11-
<CarouselView x:Name="carouselView"
12-
ItemsSource="{Binding Monkeys}">
11+
<CarouselView ItemsSource="{Binding Monkeys}"
12+
IndicatorView="indicatorView">
1313
<CarouselView.ItemTemplate>
1414
<DataTemplate>
1515
<StackLayout>
@@ -44,7 +44,7 @@
4444
</DataTemplate>
4545
</CarouselView.ItemTemplate>
4646
</CarouselView>
47-
<IndicatorView IndicatorView.ItemsSourceBy="carouselView"
47+
<IndicatorView x:Name="indicatorView"
4848
Margin="0,0,0,40"
4949
IndicatorColor="LightGray"
5050
SelectedIndicatorColor="Black"

0 commit comments

Comments
 (0)