Skip to content

Commit bda518d

Browse files
committed
Merge branch 'canaries/dev' of https://github.com/unoplatform/Uno.Gallery into canaries/dev
2 parents b49ce29 + 14d60a4 commit bda518d

6 files changed

Lines changed: 10 additions & 9 deletions

File tree

Uno.Gallery/Platforms/MacCatalyst/Main.maccatalyst.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ static void Main(string[] args)
1212
// you can specify it here.
1313
UIApplication.Main(args, null, typeof(App));
1414
#else
15-
var host = new Uno.UI.Runtime.Skia.AppleUIKit.PlatformHost(() => new App());
15+
var host = new Uno.UI.Runtime.Skia.AppleUIKit.AppleUIKitHost(() => new App());
1616
host.Run();
1717
#endif
1818
}

Uno.Gallery/Platforms/WebAssembly/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ static int Main(string[] args)
2323
#endif
2424

2525
#if IS_WASM_SKIA
26-
var host = new Uno.UI.Runtime.Skia.WebAssembly.Browser.PlatformHost(() => _app = new App());
26+
var host = new Uno.UI.Runtime.Skia.WebAssembly.Browser.WebAssemblyBrowserHost(() => _app = new App());
2727
await host.Run();
2828
#else
2929
Microsoft.UI.Xaml.Application.Start(_ => _app = new App());

Uno.Gallery/Platforms/iOS/Main.iOS.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ static void Main(string[] args)
1212
// you can specify it here.
1313
UIApplication.Main(args, null, typeof(App));
1414
#else
15-
var host = new Uno.UI.Runtime.Skia.AppleUIKit.PlatformHost(() => new App());
15+
var host = new Uno.UI.Runtime.Skia.AppleUIKit.AppleUIKitHost(() => new App());
1616
host.Run();
1717
#endif
1818
}

Uno.Gallery/Uno.Gallery.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@
114114
<PropertyGroup Condition="'$(Configuration)'=='Release' and '$(System_PullRequest_IsFork)'!='True' and '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'ios' ">
115115
<CodesignKey>iPhone Distribution</CodesignKey>
116116
<RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
117-
118-
<!-- BEGIN Workaround - AOT fails currently uno-private #648 -->
119-
<MtouchUseLlvm>false</MtouchUseLlvm>
120-
<!-- END Workaround -->
121117
</PropertyGroup>
122118

123119
<ItemGroup Condition=" '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'ios' ">

Uno.Gallery/Views/Styles/SamplePageLayout.xaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
</Grid>
8181

8282
<ScrollViewer x:Name="PART_ScrollViewer"
83+
IsTabStop="True"
8384
Grid.Row="1">
8485
<Grid Padding="0,0,0,24">
8586
<Grid.RowDefinitions>
@@ -112,7 +113,8 @@
112113
<ScrollViewer HorizontalScrollMode="Enabled"
113114
HorizontalScrollBarVisibility="Hidden"
114115
VerticalScrollBarVisibility="Hidden"
115-
VerticalScrollMode="Disabled">
116+
VerticalScrollMode="Disabled"
117+
IsTabStop="True">
116118
<StackPanel x:Name="PART_ScrollingTabs"
117119
HorizontalAlignment="Stretch"
118120
BorderBrush="{TemplateBinding BorderBrush}"
@@ -320,7 +322,8 @@
320322
<ScrollViewer HorizontalScrollMode="Enabled"
321323
HorizontalScrollBarVisibility="Hidden"
322324
VerticalScrollBarVisibility="Hidden"
323-
VerticalScrollMode="Disabled">
325+
VerticalScrollMode="Disabled"
326+
IsTabStop="True">
324327
<!-- This is the sticky tabs that appear when we scroll enough. -->
325328
<StackPanel x:Name="PART_StickyTabs"
326329
Margin="48,0"

build/stage-publish-android-canary.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
serviceConnection: 'Uno Platform Google Play'
2929
applicationId: 'uno.platform.gallery.canary'
3030
bundleFile: '$(Pipeline.Workspace)/drop/publish/com.nventive.uno.ui.demo-Signed.aab'
31+
track: 'alpha'
3132

3233
- deployment: 'Android_Publish_Skia'
3334
displayName: 'Publish Android Skia'
@@ -53,4 +54,5 @@
5354
serviceConnection: 'Uno Platform Google Play'
5455
applicationId: 'uno.platform.gallery.skia_canary'
5556
bundleFile: '$(Pipeline.Workspace)/drop/publish/uno.platform.gallery.skia_canary-Signed.aab'
57+
track: 'alpha'
5658

0 commit comments

Comments
 (0)