From f37efe3ce34606a95790e819c66a2821ca8a8f44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 13 Jun 2018 16:01:28 -0400 Subject: [PATCH 001/149] Initial uno support --- CrossTargeting.props | 128 ++ CrossTargeting.targets | 37 + .../Microsoft.Toolkit.Services.csproj | 4 +- .../Microsoft.Toolkit.Uwp.Connectivity.csproj | 10 +- .../AlignmentGrid/AlignmentGrid.cs | 2 +- .../FocusTracker/FocusTracker.cs | 2 +- ...icrosoft.Toolkit.Uwp.DeveloperTools.csproj | 4 +- .../AppDelegate.cs | 66 + .../Entitlements.plist | 6 + .../GettingStarted.Xamarin | 4 + .../Info.plist | 42 + Microsoft.Toolkit.Uwp.SampleApp.iOS/Main.cs | 22 + ...Microsoft.Toolkit.Uwp.SampleApp.iOS.csproj | 1118 +++++++++++++++++ .../Properties/AssemblyInfo.cs | 23 + .../Resources/LaunchScreen.xib | 43 + Microsoft.Toolkit.Uwp.SampleApp/App.xaml | 9 +- Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs | 25 +- .../Common/Tools.cs | 12 +- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 2 +- .../Models/Sample.cs | 21 +- .../Pages/About.xaml | 17 +- .../Pages/About.xaml.cs | 35 +- .../Analytics/AnalyticsPage.xaml.cs | 4 +- .../TestBackgroundTask.cs | 4 +- .../SamplePages/Bing Service/BingPage.xaml.cs | 2 + .../SamplePages/Blur/BlurBehaviorPage.xaml | 5 +- .../SamplePages/Blur/BlurBehaviorPage.xaml.cs | 6 +- .../SamplePages/Fade/FadeBehaviorPage.xaml | 2 +- .../SamplePages/Light/LightBehaviorPage.xaml | 2 +- .../Light/LightBehaviorPage.xaml.cs | 1 + .../SamplePages/LiveTile/LiveTilePage.xaml | 10 +- .../SamplePages/Loading/LoadingPage.xaml.cs | 7 +- .../MasterDetailsViewPage.xaml.cs | 9 +- .../Offset/OffsetBehaviorPage.xaml | 2 +- .../ParallaxService/ParallaxPage.xaml | 4 +- .../Rotate/RotateBehaviorPage.xaml | 2 +- .../Saturation/SaturationBehaviorPage.xaml | 2 +- .../Saturation/SaturationBehaviorPage.xaml.cs | 6 +- .../SamplePages/Scale/ScaleBehaviorPage.xaml | 4 +- .../TextBoxRegex/TextBoxRegexPage.xaml | 2 +- .../TextToolbar/TextToolbarPage.xaml | 2 +- .../TextToolbar/TextToolbarPage.xaml.cs | 4 +- .../TileControl/TileControlPage.xaml | 4 +- .../SamplePages/Toast/ToastPage.xaml | 5 +- .../WeatherLiveTileAndToastPage.xaml | 5 +- .../WrapPanel/WrapPanelPage.xaml.cs | 2 +- Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml | 5 +- Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml.cs | 84 +- .../Microsoft.Toolkit.Uwp.Services.csproj | 7 +- .../Behaviors/Blur.cs | 2 + .../Behaviors/Fade.cs | 4 +- .../Behaviors/Light.cs | 2 + .../Behaviors/Offset.cs | 4 +- .../Behaviors/Rotate.cs | 4 +- .../Behaviors/Saturation.cs | 2 + .../Behaviors/Scale.cs | 4 +- .../Effects/Blur.cs | 4 +- .../Effects/Saturation.cs | 4 +- .../Expressions/CompositionExtensions.cs | 4 +- .../Extensions/AnimationExtensions.Blur.cs | 2 + .../Extensions/AnimationExtensions.Fade.cs | 2 + .../Extensions/AnimationExtensions.Light.cs | 2 + .../Extensions/AnimationExtensions.Offset.cs | 2 + .../Extensions/AnimationExtensions.Rotate.cs | 2 + .../AnimationExtensions.Saturation.cs | 4 +- .../Extensions/AnimationExtensions.Scale.cs | 2 + .../Extensions/AnimationExtensions.cs | 2 + .../Extensions/AnimationTools.cs | 2 +- ...Microsoft.Toolkit.Uwp.UI.Animations.csproj | 16 +- .../ReorderGridAnimation.cs | 4 +- .../SurfaceLoader.cs | 4 +- .../Carousel/Carousel.cs | 2 +- .../Carousel/CarouselPanel.cs | 194 +-- .../DropShadowPanel/DropShadowPanel.cs | 23 +- .../DropShadowPanel/DropShadowPanel.xaml | 3 +- .../GridSplitter/GridSplitter.Events.cs | 24 +- .../MenuItems/HamburgerMenuItem.cs | 2 +- .../LayoutTransformControl.cs | 8 +- .../PropertyChangeEventSource.cs | 2 +- .../MarkdownTextBlock/Render/MarkdownTable.cs | 2 +- .../Menu/Menu.Events.cs | 34 +- .../Menu/Menu.Logic.cs | 23 +- .../Menu/MenuItem.cs | 46 +- .../Microsoft.Toolkit.Uwp.UI.Controls.csproj | 11 +- .../OrbitView/OrbitView.cs | 6 +- .../OrbitView/OrbitViewDataItem.cs | 2 +- .../OrbitView/OrbitViewItem.cs | 2 +- .../OrbitView/OrbitViewPanel.cs | 100 +- .../PullToRefreshListView.cs | 21 +- .../RadialGauge/RadialGauge.cs | 5 +- .../RadialProgressBar/RadialProgressBar.cs | 2 +- .../RotatorTile/RotatorTile.cs | 2 +- .../ScrollHeader/ScrollHeader.cs | 2 +- .../SlidableListItem/SlidableListItem.cs | 28 +- .../Formats/MarkDown/MarkDownFormatter.cs | 4 +- .../TextToolbar/Symbols/List.cs | 2 +- .../TextToolbar/Symbols/NumberedList.cs | 2 +- .../TextToolbar/Symbols/Symbol.cs | 2 +- .../TextToolbar/TextToolbar.Events.cs | 12 +- .../Common/CommonButtons.Events.cs | 8 +- .../TextToolbar/ToolbarItems/DefaultButton.cs | 2 +- .../TextToolbar/ToolbarItems/ToolbarButton.cs | 2 +- .../ToolbarItems/ToolbarSeparator.cs | 2 +- .../TileControl/TileControl.cs | 4 +- .../WrapPanel/WrapPanel.cs | 82 +- .../AdvancedCollectionView.cs | 17 +- .../Converters/BoolToObjectConverter.cs | 2 +- .../EmptyObjectToObjectConverter.cs | 2 +- .../StatusBar/StatusBarExtensions.cs | 4 +- .../Extensions/TitleBar/TitleBarExtensions.cs | 46 +- .../Extensions/Tree/VisualTree.cs | 30 +- .../Helpers/BindableValueHolder.cs | 2 +- .../Helpers/DependencyPropertyWatcher.cs | 20 +- .../Microsoft.Toolkit.Uwp.UI.csproj | 12 +- Microsoft.Toolkit.Uwp/Helpers/StreamHelper.cs | 91 ++ .../Microsoft.Toolkit.Uwp.csproj | 18 +- Microsoft.Toolkit/Microsoft.Toolkit.csproj | 5 +- gitversion.yml | 15 + 118 files changed, 2361 insertions(+), 471 deletions(-) create mode 100644 CrossTargeting.props create mode 100644 CrossTargeting.targets create mode 100644 Microsoft.Toolkit.Uwp.SampleApp.iOS/AppDelegate.cs create mode 100644 Microsoft.Toolkit.Uwp.SampleApp.iOS/Entitlements.plist create mode 100644 Microsoft.Toolkit.Uwp.SampleApp.iOS/GettingStarted.Xamarin create mode 100644 Microsoft.Toolkit.Uwp.SampleApp.iOS/Info.plist create mode 100644 Microsoft.Toolkit.Uwp.SampleApp.iOS/Main.cs create mode 100644 Microsoft.Toolkit.Uwp.SampleApp.iOS/Microsoft.Toolkit.Uwp.SampleApp.iOS.csproj create mode 100644 Microsoft.Toolkit.Uwp.SampleApp.iOS/Properties/AssemblyInfo.cs create mode 100644 Microsoft.Toolkit.Uwp.SampleApp.iOS/Resources/LaunchScreen.xib create mode 100644 gitversion.yml diff --git a/CrossTargeting.props b/CrossTargeting.props new file mode 100644 index 00000000000..8f7fdec0c9d --- /dev/null +++ b/CrossTargeting.props @@ -0,0 +1,128 @@ + + + + full + True + + + + true + false + UAP,Version=v10.0 + UAP + 10.0.14393.0 + 10.0.14393.0 + .NETCore + v5.0 + $(DefineConstants);NETFX_CORE + $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets + + + + + true + true + + xamarinios10 + Xamarin.iOS + v1.0 + Resources + $(DefineConstants);IOS1_0;XAMARIN + full + $(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets + + + + MonoAndroid + v6.0 + False + True + full + $(DefineConstants);XAMARIN;XAMARIN_ANDROID + $(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets + + + + MonoAndroid + v7.0 + False + True + full + $(DefineConstants);XAMARIN;XAMARIN_ANDROID + $(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets + + + + MonoAndroid + v7.1 + False + full + True + $(DefineConstants);XAMARIN;XAMARIN_ANDROID + $(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets + + + + MonoAndroid + v8.0 + False + full + True + $(DefineConstants);XAMARIN;XAMARIN_ANDROID + $(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CrossTargeting.targets b/CrossTargeting.targets new file mode 100644 index 00000000000..fd181c35612 --- /dev/null +++ b/CrossTargeting.targets @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + <_OverrideTargetFramework>$(TargetFramework) + <_OverrideTargetFramework Condition="'$(TargetFramework)' == 'xamarinios10'">xamarinios10 + <_TargetNugetFolder>$(USERPROFILE)\.nuget\packages\$(AssemblyName)\$(NugetOverrideCacheVersion)\lib\$(_OverrideTargetFramework) + + + <_OutputFiles Include="@(BuiltProjectOutputGroupOutput)" /> + <_OutputFilesPDB Include="@(_OutputFiles->'%(RootDir)\%(Directory)\%(RecursiveDir)%(Filename).pdb')" Condition="Exists('@(BuiltProjectOutputGroupOutput->'%(RootDir)\%(Directory)\%(RecursiveDir)%(Filename).pdb')')" /> + + + + + + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj index 8d72f55d1d9..d18effd5dc5 100644 --- a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj +++ b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj @@ -1,7 +1,7 @@ - + - uap10.0;netstandard1.4;net461 + uap10.0;netstandard1.4;net461;xamarinios10;MonoAndroid71 This .NET standard library enables access to different data sources such as Bing, Microsoft Graph, and OneDrive. It is part of the Windows Community Toolkit. UWP Toolkit Windows Bing Microsoft Graph OneDrive Windows Community Toolkit .NET Standard Services diff --git a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj index 939876be949..89ab56ff334 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj +++ b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj @@ -1,4 +1,4 @@ - + uap10.0 @@ -7,10 +7,16 @@ UWP Toolkit Windows Devices Bluetooth BTLE Networking - + + + + + + + diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/AlignmentGrid/AlignmentGrid.cs b/Microsoft.Toolkit.Uwp.DeveloperTools/AlignmentGrid/AlignmentGrid.cs index 00b904e33fe..71340e172b1 100644 --- a/Microsoft.Toolkit.Uwp.DeveloperTools/AlignmentGrid/AlignmentGrid.cs +++ b/Microsoft.Toolkit.Uwp.DeveloperTools/AlignmentGrid/AlignmentGrid.cs @@ -12,7 +12,7 @@ namespace Microsoft.Toolkit.Uwp.DeveloperTools /// /// AlignmentGrid is used to display a grid to help aligning controls /// - public class AlignmentGrid : ContentControl + public partial class AlignmentGrid : ContentControl { /// /// Identifies the dependency property. diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.cs b/Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.cs index 7aef4dc2fed..c4f72650a6b 100644 --- a/Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.cs +++ b/Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.cs @@ -24,7 +24,7 @@ namespace Microsoft.Toolkit.Uwp.DeveloperTools [TemplatePart(Name = "ControlType", Type = typeof(TextBlock))] [TemplatePart(Name = "ControlAutomationName", Type = typeof(TextBlock))] [TemplatePart(Name = "ControlFirstParentWithName", Type = typeof(TextBlock))] - public class FocusTracker : Control + public partial class FocusTracker : Control { /// /// Defines the dependency property. diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj index b1f63c39e89..308bb3803fb 100644 --- a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj +++ b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj @@ -1,7 +1,7 @@ - + - uap10.0 + xamarinios10;uap10.0;MonoAndroid71 Windows Community Toolkit Developer Tools This library provides XAML user controls and services to help developer building their app. It is part of the Windows Community Toolkit. UWP Toolkit Windows Controls XAML Developer Tools Accessibility diff --git a/Microsoft.Toolkit.Uwp.SampleApp.iOS/AppDelegate.cs b/Microsoft.Toolkit.Uwp.SampleApp.iOS/AppDelegate.cs new file mode 100644 index 00000000000..d17355bc67f --- /dev/null +++ b/Microsoft.Toolkit.Uwp.SampleApp.iOS/AppDelegate.cs @@ -0,0 +1,66 @@ +using Foundation; +using UIKit; + +namespace Microsoft.Toolkit.Uwp.SampleApp.iOS +{ + // The UIApplicationDelegate for the application. This class is responsible for launching the + // User Interface of the application, as well as listening (and optionally responding) to application events from iOS. + [Register("AppDelegate")] + public class AppDelegate : UIApplicationDelegate + { + // class-level declarations + + public override UIWindow Window + { + get; + set; + } + + public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions) + { + // create a new window instance based on the screen size + Window = new UIWindow(UIScreen.MainScreen.Bounds); + + // If you have defined a root view controller, set it here: + // Window.RootViewController = myViewController; + + // make the window visible + Window.MakeKeyAndVisible(); + + return true; + } + + public override void OnResignActivation(UIApplication application) + { + // Invoked when the application is about to move from active to inactive state. + // This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) + // or when the user quits the application and it begins the transition to the background state. + // Games should use this method to pause the game. + } + + public override void DidEnterBackground(UIApplication application) + { + // Use this method to release shared resources, save user data, invalidate timers and store the application state. + // If your application supports background exection this method is called instead of WillTerminate when the user quits. + } + + public override void WillEnterForeground(UIApplication application) + { + // Called as part of the transiton from background to active state. + // Here you can undo many of the changes made on entering the background. + } + + public override void OnActivated(UIApplication application) + { + // Restart any tasks that were paused (or not yet started) while the application was inactive. + // If the application was previously in the background, optionally refresh the user interface. + } + + public override void WillTerminate(UIApplication application) + { + // Called when the application is about to terminate. Save data, if needed. See also DidEnterBackground. + } + } +} + + diff --git a/Microsoft.Toolkit.Uwp.SampleApp.iOS/Entitlements.plist b/Microsoft.Toolkit.Uwp.SampleApp.iOS/Entitlements.plist new file mode 100644 index 00000000000..24c3103683f --- /dev/null +++ b/Microsoft.Toolkit.Uwp.SampleApp.iOS/Entitlements.plist @@ -0,0 +1,6 @@ + + + + + + diff --git a/Microsoft.Toolkit.Uwp.SampleApp.iOS/GettingStarted.Xamarin b/Microsoft.Toolkit.Uwp.SampleApp.iOS/GettingStarted.Xamarin new file mode 100644 index 00000000000..810f7166857 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.SampleApp.iOS/GettingStarted.Xamarin @@ -0,0 +1,4 @@ + + GS\iOS\CS\iOSApp\GettingStarted.html + false + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp.iOS/Info.plist b/Microsoft.Toolkit.Uwp.SampleApp.iOS/Info.plist new file mode 100644 index 00000000000..914384969f1 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.SampleApp.iOS/Info.plist @@ -0,0 +1,42 @@ + + + + + CFBundleDisplayName + Microsoft.Toolkit.Uwp.SampleApp.iOS + CFBundleIdentifier + com.companyname.Microsoft.Toolkit.Uwp.SampleApp.iOS + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1.0 + LSRequiresIPhoneOS + + MinimumOSVersion + 10.3 + UIDeviceFamily + + 1 + 2 + + UILaunchStoryboardName + LaunchScreen + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp.iOS/Main.cs b/Microsoft.Toolkit.Uwp.SampleApp.iOS/Main.cs new file mode 100644 index 00000000000..3efb46bfcac --- /dev/null +++ b/Microsoft.Toolkit.Uwp.SampleApp.iOS/Main.cs @@ -0,0 +1,22 @@ +using Microsoft.Extensions.Logging; +using UIKit; + +namespace Microsoft.Toolkit.Uwp.SampleApp.iOS +{ + public class Application + { + // This is the main entry point of the application. + static void Main(string[] args) + { + Uno.Extensions.LogExtensionPoint + .AmbientLoggerFactory + .AddConsole(LogLevel.Warning) + .AddDebug(LogLevel.Warning); + + + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(App)); + } + } +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp.iOS/Microsoft.Toolkit.Uwp.SampleApp.iOS.csproj b/Microsoft.Toolkit.Uwp.SampleApp.iOS/Microsoft.Toolkit.Uwp.SampleApp.iOS.csproj new file mode 100644 index 00000000000..e83bb7bef68 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.SampleApp.iOS/Microsoft.Toolkit.Uwp.SampleApp.iOS.csproj @@ -0,0 +1,1118 @@ + + + + Debug + iPhoneSimulator + {484385EA-7766-49DC-BD09-F9B5DD035847} + {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Exe + Microsoft.Toolkit.Uwp.SampleApp.iOS + Resources + Microsoft.Toolkit.Uwp.SampleApp.iOS + + + true + full + false + bin\iPhoneSimulator\Debug + DEBUG + prompt + 4 + false + x86_64 + None + true + + + none + true + bin\iPhoneSimulator\Release + prompt + 4 + None + x86_64 + false + + + true + full + false + bin\iPhone\Debug + DEBUG + prompt + 4 + false + ARMv7, ARM64 + Entitlements.plist + iPhone Developer + true + + + none + true + bin\iPhone\Release + prompt + 4 + Entitlements.plist + ARMv7, ARM64 + false + iPhone Developer + + + none + True + bin\iPhone\Ad-Hoc + prompt + 4 + False + ARMv7, ARM64 + Entitlements.plist + True + Automatic:AdHoc + iPhone Distribution + + + none + True + bin\iPhone\AppStore + prompt + 4 + False + ARMv7, ARM64 + Entitlements.plist + Automatic:AppStore + iPhone Distribution + + + + App.xaml.cs + App.xaml + + + Common\AnalyticsVersionInfoExtensions.cs + + + Common\AnimationHelper.cs + + + Common\BindableBase.cs + + + Common\BoolStringConverter.cs + + + Common\Constants.cs + + + Common\DelegateCommand.cs + + + Common\DelegateCommand{T}.cs + + + Common\EnumConverter.cs + + + Common\IXamlRenderListener.cs + + + Common\ListViewHoverScroll.cs + + + Common\SampleCommand.cs + + + Common\SolidColorBrushConverter.cs + + + Common\Tools.cs + + + Controls\CodeRenderer\CodeRenderer.cs + + + Controls\CodeRenderer\CodeRenderer.Properties.cs + + + Controls\PropertyControl.xaml.cs + PropertyControl.xaml + + + Controls\XamlExceptionRange.cs + + + Controls\XamlRenderService.cs + + + Data\GitHub.cs + + + Data\PhotoDataItem.cs + + + Data\PhotoDataItemWithDimension.cs + + + Data\PhotosDataSource.cs + + + Models\Email.cs + + + Models\GitHubRelease.cs + + + Models\Item.cs + + + Models\LandingPageLink.cs + + + Models\LandingPageLinks.cs + + + Models\LandingPageResource.cs + + + Models\Option.cs + + + Models\PropertyDescriptor\PropertyDescriptor.cs + + + Models\PropertyDescriptor\PropertyKind.cs + + + Models\PropertyDescriptor\PropertyOptions.cs + + + Models\PropertyDescriptor\SliderPropertyOptions.cs + + + Models\PropertyDescriptor\ValueHolder.cs + + + Models\Sample.cs + + + Models\SampleCategory.cs + + + Models\Samples.cs + + + Pages\About.xaml.cs + About.xaml + + + Pages\SamplePicker.xaml.cs + SamplePicker.xaml + + + SamplePages\AdaptiveGridView\AdaptiveGridViewPage.xaml.cs + AdaptiveGridViewPage.xaml + + + SamplePages\AdvancedCollectionView\AdvancedCollectionViewPage.xaml.cs + AdvancedCollectionViewPage.xaml + + + SamplePages\AlignmentGrid\AlignmentGridPage.xaml.cs + AlignmentGridPage.xaml + + + SamplePages\Analytics\AnalyticsPage.xaml.cs + AnalyticsPage.xaml + + + SamplePages\BladeView\BladePage.xaml.cs + BladePage.xaml + + + SamplePages\Blur\BlurBehaviorPage.xaml.cs + BlurBehaviorPage.xaml + + + SamplePages\Carousel\CarouselPage.xaml.cs + CarouselPage.xaml + + + SamplePages\DispatcherHelper\DispatcherHelperPage.xaml.cs + DispatcherHelperPage.xaml + + + SamplePages\DropShadowPanel\DropShadowPanelPage.xaml.cs + DropShadowPanelPage.xaml + + + SamplePages\Expander\ExpanderPage.xaml.cs + ExpanderPage.xaml + + + SamplePages\FadeHeader\FadeHeaderBehaviorPage.xaml.cs + FadeHeaderBehaviorPage.xaml + + + SamplePages\Fade\FadeBehaviorPage.xaml.cs + FadeBehaviorPage.xaml + + + SamplePages\FocusTracker\FocusTrackerPage.xaml.cs + FocusTrackerPage.xaml + + + SamplePages\GridSplitter\GridSplitterPage.xaml.cs + GridSplitterPage.xaml + + + SamplePages\HamburgerMenu\HamburgerMenuPage.xaml.cs + HamburgerMenuPage.xaml + + + SamplePages\HeaderedTextBlock\HeaderedTextBlockPage.xaml.cs + HeaderedTextBlockPage.xaml + + + SamplePages\ImageCache\ImageCachePage.xaml.cs + ImageCachePage.xaml + + + SamplePages\ImageEx\ImageExPage.xaml.cs + ImageExPage.xaml + + + SamplePages\InAppNotification\InAppNotificationPage.xaml.cs + InAppNotificationPage.xaml + + + SamplePages\Incremental Loading Collection\IncrementalLoadingCollectionPage.xaml.cs + IncrementalLoadingCollectionPage.xaml + + + SamplePages\Incremental Loading Collection\PeopleSource.cs + + + SamplePages\Incremental Loading Collection\Person.cs + + + SamplePages\Light\LightBehaviorPage.xaml.cs + LightBehaviorPage.xaml + + + SamplePages\ListViewBase\ListViewBasePage.xaml.cs + ListViewBasePage.xaml + + + SamplePages\Loading\LoadingPage.xaml.cs + LoadingPage.xaml + + + SamplePages\MarkdownTextBlock\MarkdownTextBlockPage.xaml.cs + MarkdownTextBlockPage.xaml + + + SamplePages\MasterDetailsView\MasterDetailsViewPage.xaml.cs + MasterDetailsViewPage.xaml + + + SamplePages\Menu\Commands\VsCommands.cs + + + SamplePages\Menu\MenuPage.xaml.cs + MenuPage.xaml + + + SamplePages\Object Storage\ObjectStoragePage.xaml.cs + ObjectStoragePage.xaml + + + SamplePages\Offset\OffsetBehaviorPage.xaml.cs + OffsetBehaviorPage.xaml + + + SamplePages\OrbitView\OrbitViewPage.xaml.cs + OrbitViewPage.xaml + + + SamplePages\ParallaxService\ParallaxPage.xaml.cs + ParallaxPage.xaml + + + SamplePages\PrintHelper\PrintHelperPage.xaml.cs + PrintHelperPage.xaml + + + SamplePages\PullToRefreshListView\PullToRefreshListViewPage.xaml.cs + PullToRefreshListViewPage.xaml + + + SamplePages\RadialGauge\RadialGaugePage.xaml.cs + RadialGaugePage.xaml + + + SamplePages\RadialProgressBar\RadialProgressBarPage.xaml.cs + RadialProgressBarPage.xaml + + + SamplePages\RangeSelector\RangeSelectorPage.xaml.cs + RangeSelectorPage.xaml + + + SamplePages\ReorderGridAnimation\ReorderGridPage.xaml.cs + ReorderGridPage.xaml + + + SamplePages\Rotate\RotateBehaviorPage.xaml.cs + RotateBehaviorPage.xaml + + + SamplePages\RotatorTile\RotatorTilePage.xaml.cs + RotatorTilePage.xaml + + + SamplePages\Saturation\SaturationBehaviorPage.xaml.cs + SaturationBehaviorPage.xaml + + + SamplePages\Scale\ScaleBehaviorPage.xaml.cs + ScaleBehaviorPage.xaml + + + SamplePages\ScrollHeader\ScrollHeaderPage.xaml.cs + ScrollHeaderPage.xaml + + + SamplePages\SlidableListItem\SlidableListItemPage.xaml.cs + SlidableListItemPage.xaml + + + SamplePages\SurfaceDialTextbox\SurfaceDialTextboxPage.xaml.cs + SurfaceDialTextboxPage.xaml + + + SamplePages\SystemInformation\SystemInformationPage.xaml.cs + SystemInformationPage.xaml + + + SamplePages\TextBoxMask\TextBoxMaskPage.xaml.cs + TextBoxMaskPage.xaml + + + SamplePages\TextBoxRegex\TextBoxRegexPage.xaml.cs + TextBoxRegexPage.xaml + + + SamplePages\TextToolbar\SampleFormatter.cs + + + SamplePages\TextToolbar\TextToolbarPage.xaml.cs + TextToolbarPage.xaml + + + SamplePages\TileControl\TileControlPage.xaml.cs + TileControlPage.xaml + + + SamplePages\ViewExtensions\ViewExtensionsPage.xaml.cs + ViewExtensionsPage.xaml + + + SamplePages\WrapPanel\WrapPanelPage.xaml.cs + WrapPanelPage.xaml + + + Shell.xaml.cs + Shell.xaml + + + + + SamplePages\AdaptiveGridView\AdaptiveGridViewCode.bind + + + SamplePages\AdvancedCollectionView\AdvancedCollectionView.bind + + + SamplePages\AlignmentGrid\AlignmentGridXaml.bind + + + SamplePages\Analytics\AnalyticsCode.bind + + + SamplePages\BladeView\BladeCode.bind + + + SamplePages\Blur\BlurBehaviorCode.bind + + + SamplePages\Blur\BlurBehaviorXaml.bind + + + SamplePages\Carousel\CarouselCode.bind + + + SamplePages\DispatcherHelper\DispatcherHelperCode.bind + + + SamplePages\DropShadowPanel\DropShadowPanelXaml.bind + + + SamplePages\Expander\ExpanderXaml.bind + + + SamplePages\FadeHeader\FadeHeaderBehavior.png + + + SamplePages\Fade\FadeBehaviorCode.bind + + + SamplePages\Fade\FadeBehaviorXaml.bind + + + SamplePages\FadeHeader\FadeHeaderBehaviorCode.bind + + + SamplePages\FadeHeader\FadeHeaderBehaviorXaml.bind + + + SamplePages\FocusTracker\FocusTrackerXaml.bind + + + SamplePages\GridSplitter\GridSplitter.bind + + + SamplePages\HamburgerMenu\HamburgerMenuCode.bind + + + SamplePages\HeaderedTextBlock\HeaderedTextBlockCode.bind + + + SamplePages\ImageCache\ImageCacheCode.bind + + + SamplePages\ImageCache\ImageCacheXaml.bind + + + SamplePages\ImageEx\ImageExCode.bind + + + SamplePages\InAppNotification\InAppNotificationCode.bind + + + SamplePages\InAppNotification\InAppNotificationXaml.bind + + + SamplePages\Incremental Loading Collection\IncrementalLoadingCollectionCode.bind + + + SamplePages\Light\LightBehaviorCode.bind + + + SamplePages\Light\LightBehaviorXaml.bind + + + SamplePages\ListViewBase\ListViewBaseCode.bind + + + SamplePages\Loading\LoadingCode.bind + + + SamplePages\MarkdownTextBlock\InitialContent.md + + + SamplePages\MarkdownTextBlock\MarkdownTextBlock.bind + + + SamplePages\MarkdownTextBlock\MarkdownTextBlockCode.bind + + + SamplePages\MasterDetailsView\MasterDetailsView.bind + + + SamplePages\MasterDetailsView\MasterDetailsViewCode.bind + + + SamplePages\Menu\Menu.bind + + + SamplePages\Object Storage\ObjectStorageCode.bind + + + SamplePages\Offset\OffsetBehaviorCode.bind + + + SamplePages\Offset\OffsetBehaviorXaml.bind + + + SamplePages\OrbitView\OrbitViewXaml.bind + + + SamplePages\ParallaxService\ParallaxPage.bind + + + SamplePages\PrintHelper\PrintHelperCode.bind + + + SamplePages\PullToRefreshListView\PullToRefreshListViewCode.bind + + + SamplePages\PullToRefreshListView\PullToRefreshListViewXaml.bind + + + SamplePages\RadialGauge\RadialGaugeCode.bind + + + SamplePages\RadialProgressBar\RadialProgressBarCode.bind + + + SamplePages\RangeSelector\RangeSelectorCode.bind + + + SamplePages\ReorderGridAnimation\ReorderGrid.bind + + + SamplePages\Rotate\RotateBehaviorCode.bind + + + SamplePages\Rotate\RotateBehaviorXaml.bind + + + SamplePages\RotatorTile\RotatorTileCode.bind + + + SamplePages\Saturation\SaturationBehaviorCode.bind + + + SamplePages\Saturation\SaturationBehaviorXaml.bind + + + SamplePages\Scale\ScaleBehaviorCode.bind + + + SamplePages\Scale\ScaleBehaviorXaml.bind + + + SamplePages\ScrollHeader\ScrollHeaderCode.bind + + + SamplePages\SlidableListItem\SlidableListItemCode.bind + + + SamplePages\SurfaceDialTextbox\SurfaceDialTextboxCode.bind + Designer + + + SamplePages\SystemInformation\SystemInformationCode.bind + + + SamplePages\TextBoxMask\TextBoxMask.bind + + + SamplePages\TextBoxRegex\TextBoxRegex.bind + + + SamplePages\TextToolbar\TextToolbar.bind + + + SamplePages\TextToolbar\TextToolbarCode.bind + + + SamplePages\TileControl\TileControl.bind + Designer + + + SamplePages\ViewExtensions\ViewExtensionsCode.bind + Designer + + + SamplePages\WrapPanel\WrapPanel.bind + + + SamplePages\samples.json + PreserveNewest + + + landingPageLinks.json + + + + + + SamplePages\AdaptiveGridView\AdaptiveGridView.png + + + SamplePages\AdvancedCollectionView\AdvancedCollectionView.png + + + SamplePages\AlignmentGrid\AlignmentGrid.png + + + SamplePages\Analytics\Analytics.png + + + SamplePages\BladeView\BladeView.png + + + SamplePages\Blur\BlurBehavior.png + + + SamplePages\Carousel\Carousel.png + + + SamplePages\DropShadowPanel\DropShadowPanel.png + + + SamplePages\DropShadowPanel\Trex.png + + + SamplePages\DropShadowPanel\Unicorn.png + + + SamplePages\Expander\Expander.png + + + SamplePages\Fade\FadeBehavior.png + + + SamplePages\FocusTracker\FocusTracker.png + + + SamplePages\GridSplitter\GridSplitter.png + + + SamplePages\HamburgerMenu\HamburgerMenu.png + + + SamplePages\HeaderedTextBlock\HeaderedTextBlock.png + + + SamplePages\ImageCache\ImageEx.png + + + SamplePages\ImageEx\ImageEx.png + + + SamplePages\InAppNotification\InAppNotification.png + + + SamplePages\Incremental Loading Collection\icon.png + + + SamplePages\Light\LightBehavior.png + + + SamplePages\Loading\Loading.png + + + SamplePages\MarkdownTextBlock\MarkdownTextBlock.png + + + SamplePages\MasterDetailsView\MasterDetailsView.png + + + SamplePages\MasterDetailsView\OneDriveLogo.png + + + SamplePages\Menu\Menu.png + + + SamplePages\Object Storage\ObjectStorage.png + + + SamplePages\Offset\OffsetBehavior.png + + + SamplePages\OrbitView\OrbitView.png + + + SamplePages\ParallaxService\Parallax.png + + + SamplePages\PrintHelper\PrintHelper.png + + + SamplePages\PullToRefreshListView\PullToRefreshListView.png + + + SamplePages\RadialGauge\RadialGauge.png + + + SamplePages\RadialProgressBar\RadialProgressBar.png + + + SamplePages\RangeSelector\RangeSelector.png + + + SamplePages\ReorderGridAnimation\ReorderGrid.png + + + SamplePages\Rotate\RotateBehavior.png + + + SamplePages\RotatorTile\RotatorTile.png + + + SamplePages\Saturation\SaturationBehavior.png + + + SamplePages\Scale\ScaleBehavior.png + + + SamplePages\ScrollHeader\ScrollHeader.png + + + SamplePages\SlidableListItem\SlidableListItem.png + + + SamplePages\SurfaceDialTextbox\SurfaceDialTextbox.png + + + SamplePages\TextBoxMask\TextBoxMask.png + + + SamplePages\TextBoxRegex\TextBoxRegex.png + + + SamplePages\TextToolbar\TextToolbar.png + + + SamplePages\TileControl\Animations.png + + + SamplePages\TileControl\TileControl.png + + + SamplePages\WrapPanel\WrapPanel.png + + + + + + + + + + + + + + + + + C:\Users\jayly\.nuget\packages\uno.ui\1.21.1-dev.1226\lib\xamarinios10\Uno.Xaml.dll + + + + + + + + 2.0.0-uno0214 + + + + + + App.xaml + MSBuild:Compile + Designer + + + Controls\PropertyControl.xaml + MSBuild:Compile + Designer + + + Pages\About.xaml + MSBuild:Compile + Designer + + + Pages\SamplePicker.xaml + MSBuild:Compile + Designer + + + SamplePages\AdaptiveGridView\AdaptiveGridViewPage.xaml + MSBuild:Compile + Designer + + + SamplePages\AdvancedCollectionView\AdvancedCollectionViewPage.xaml + MSBuild:Compile + Designer + + + SamplePages\AlignmentGrid\AlignmentGridPage.xaml + MSBuild:Compile + Designer + + + SamplePages\Analytics\AnalyticsPage.xaml + MSBuild:Compile + Designer + + + SamplePages\BladeView\BladePage.xaml + MSBuild:Compile + Designer + + + SamplePages\Blur\BlurBehaviorPage.xaml + MSBuild:Compile + Designer + + + SamplePages\Carousel\CarouselPage.xaml + MSBuild:Compile + Designer + + + SamplePages\DispatcherHelper\DispatcherHelperPage.xaml + MSBuild:Compile + Designer + + + SamplePages\DropShadowPanel\DropShadowPanelPage.xaml + MSBuild:Compile + Designer + + + SamplePages\Expander\ExpanderPage.xaml + MSBuild:Compile + Designer + + + SamplePages\FadeHeader\FadeHeaderBehaviorPage.xaml + MSBuild:Compile + Designer + + + SamplePages\Fade\FadeBehaviorPage.xaml + MSBuild:Compile + Designer + + + SamplePages\FocusTracker\FocusTrackerPage.xaml + MSBuild:Compile + Designer + + + SamplePages\GridSplitter\GridSplitterPage.xaml + MSBuild:Compile + Designer + + + SamplePages\HamburgerMenu\HamburgerMenuPage.xaml + MSBuild:Compile + Designer + + + SamplePages\HeaderedTextBlock\HeaderedTextBlockPage.xaml + MSBuild:Compile + Designer + + + SamplePages\ImageCache\ImageCachePage.xaml + MSBuild:Compile + Designer + + + SamplePages\ImageEx\ImageExPage.xaml + MSBuild:Compile + Designer + + + SamplePages\InAppNotification\InAppNotificationPage.xaml + MSBuild:Compile + Designer + + + SamplePages\Incremental Loading Collection\IncrementalLoadingCollectionPage.xaml + MSBuild:Compile + Designer + + + SamplePages\Light\LightBehaviorPage.xaml + MSBuild:Compile + Designer + + + SamplePages\ListViewBase\ListViewBasePage.xaml + MSBuild:Compile + Designer + + + SamplePages\Loading\LoadingPage.xaml + MSBuild:Compile + Designer + + + SamplePages\MarkdownTextBlock\MarkdownTextBlockPage.xaml + MSBuild:Compile + Designer + + + SamplePages\MasterDetailsView\MasterDetailsViewPage.xaml + MSBuild:Compile + Designer + + + SamplePages\Menu\MenuPage.xaml + MSBuild:Compile + Designer + + + SamplePages\Object Storage\ObjectStoragePage.xaml + MSBuild:Compile + Designer + + + SamplePages\Offset\OffsetBehaviorPage.xaml + MSBuild:Compile + Designer + + + SamplePages\OrbitView\OrbitViewPage.xaml + MSBuild:Compile + Designer + + + SamplePages\ParallaxService\ParallaxPage.xaml + MSBuild:Compile + Designer + + + SamplePages\PrintHelper\PrintHelperPage.xaml + MSBuild:Compile + Designer + + + SamplePages\PullToRefreshListView\PullToRefreshListViewPage.xaml + MSBuild:Compile + Designer + + + SamplePages\RadialGauge\RadialGaugePage.xaml + MSBuild:Compile + Designer + + + SamplePages\RadialProgressBar\RadialProgressBarPage.xaml + MSBuild:Compile + Designer + + + SamplePages\RangeSelector\RangeSelectorPage.xaml + MSBuild:Compile + Designer + + + SamplePages\ReorderGridAnimation\ReorderGridPage.xaml + MSBuild:Compile + Designer + + + SamplePages\Rotate\RotateBehaviorPage.xaml + MSBuild:Compile + Designer + + + SamplePages\RotatorTile\RotatorTilePage.xaml + MSBuild:Compile + Designer + + + SamplePages\Saturation\SaturationBehaviorPage.xaml + MSBuild:Compile + Designer + + + SamplePages\Scale\ScaleBehaviorPage.xaml + MSBuild:Compile + Designer + + + SamplePages\ScrollHeader\ScrollHeaderPage.xaml + MSBuild:Compile + Designer + + + SamplePages\SlidableListItem\SlidableListItemPage.xaml + MSBuild:Compile + Designer + + + SamplePages\SurfaceDialTextbox\SurfaceDialTextboxPage.xaml + MSBuild:Compile + Designer + + + SamplePages\SystemInformation\SystemInformationPage.xaml + MSBuild:Compile + Designer + + + SamplePages\TextBoxMask\TextBoxMaskPage.xaml + MSBuild:Compile + Designer + + + SamplePages\TextBoxRegex\TextBoxRegexPage.xaml + MSBuild:Compile + Designer + + + SamplePages\TextToolbar\TextToolbarPage.xaml + MSBuild:Compile + Designer + + + SamplePages\TileControl\TileControlPage.xaml + MSBuild:Compile + Designer + + + SamplePages\ViewExtensions\ViewExtensionsPage.xaml + MSBuild:Compile + Designer + + + SamplePages\WrapPanel\WrapPanelPage.xaml + MSBuild:Compile + Designer + + + Shell.xaml + MSBuild:Compile + Designer + + + + + {e7697922-9555-4cfb-aee0-c5f4d657e559} + Microsoft.Toolkit.Uwp.DeveloperTools + + + {b24a296c-b3eb-4e06-a64e-74ac2d1acc91} + Microsoft.Toolkit.Uwp.UI.Animations + + + {e9faabfb-d726-42c1-83c1-cb46a29fea81} + Microsoft.Toolkit.Uwp.UI.Controls + + + {3dd8aa7c-3569-4e51-992f-0c2257e8878e} + Microsoft.Toolkit.Uwp.UI + + + {805f80df-75c6-4c2f-8fd9-b47f6d0df5a3} + Microsoft.Toolkit.Uwp + + + {6fe128a8-cefa-4a61-a987-ec92de6b538e} + Microsoft.Toolkit + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp.iOS/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.SampleApp.iOS/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..c439092dafe --- /dev/null +++ b/Microsoft.Toolkit.Uwp.SampleApp.iOS/Properties/AssemblyInfo.cs @@ -0,0 +1,23 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Microsoft.Toolkit.Uwp.SampleApp.iOS")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Microsoft.Toolkit.Uwp.SampleApp.iOS")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("484385ea-7766-49dc-bd09-f9b5dd035847")] diff --git a/Microsoft.Toolkit.Uwp.SampleApp.iOS/Resources/LaunchScreen.xib b/Microsoft.Toolkit.Uwp.SampleApp.iOS/Resources/LaunchScreen.xib new file mode 100644 index 00000000000..f9930db3f16 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.SampleApp.iOS/Resources/LaunchScreen.xib @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/App.xaml b/Microsoft.Toolkit.Uwp.SampleApp/App.xaml index 3d8f3de563e..0930a4d1488 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/App.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/App.xaml @@ -1,17 +1,21 @@  + RequiresPointerMode="Auto" + mc:Ignorable="d"> @@ -59,7 +63,8 @@ - - + --> - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs index 56ca0d82636..6f0464903b3 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs @@ -65,12 +65,15 @@ protected override void OnNavigatedTo(NavigationEventArgs e) { if (loadingContentControl != null) { + +#if NETFX_CORE // UNO TODO loadingContentControl.ContentTemplate = resources["LogoTemplate"] as DataTemplate; await loadingContentControl.Blur(2, 100).StartAsync(); await ShowLoadingDialogAsync(); await loadingContentControl.Blur(0, 0).StartAsync(); - } - }); +#endif + } + }); } private async Task ShowLoadingDialogAsync() diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs index 3db903e6046..e0f74e5ee6c 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs @@ -17,7 +17,8 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages /// public sealed partial class MasterDetailsViewPage : Page, IXamlRenderListener { - private double _previousWidth = Window.Current.Bounds.Width; + // UNO TODO + private double _previousWidth = Windows.UI.Xaml.Window.Current.Bounds.Width; public MasterDetailsViewPage() { @@ -58,12 +59,14 @@ public MasterDetailsViewPage() protected override void OnNavigatedTo(NavigationEventArgs e) { - Window.Current.SizeChanged += Current_SizeChanged; + // UNO TODO + Windows.UI.Xaml.Window.Current.SizeChanged += Current_SizeChanged; } protected override void OnNavigatedFrom(NavigationEventArgs e) { - Window.Current.SizeChanged -= Current_SizeChanged; + // UNO TODO + Windows.UI.Xaml.Window.Current.SizeChanged -= Current_SizeChanged; } // workaround for loaded unloaded getting called in wrong order when shell template gets swapped diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Offset/OffsetBehaviorPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Offset/OffsetBehaviorPage.xaml index 25f1c57dc3c..549c1e913e3 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Offset/OffsetBehaviorPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Offset/OffsetBehaviorPage.xaml @@ -12,7 +12,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ParallaxService/ParallaxPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ParallaxService/ParallaxPage.xaml index 2be3232d395..90d09371217 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ParallaxService/ParallaxPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ParallaxService/ParallaxPage.xaml @@ -11,8 +11,8 @@ - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Rotate/RotateBehaviorPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Rotate/RotateBehaviorPage.xaml index 7dc91aac97d..dbbcadb4fb3 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Rotate/RotateBehaviorPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Rotate/RotateBehaviorPage.xaml @@ -12,7 +12,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Saturation/SaturationBehaviorPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Saturation/SaturationBehaviorPage.xaml index f48d384bc8a..344c8f10433 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Saturation/SaturationBehaviorPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Saturation/SaturationBehaviorPage.xaml @@ -24,7 +24,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Saturation/SaturationBehaviorPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Saturation/SaturationBehaviorPage.xaml.cs index 985ecf7d66f..8b179471f88 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Saturation/SaturationBehaviorPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Saturation/SaturationBehaviorPage.xaml.cs @@ -29,10 +29,12 @@ protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); +#if NETFX_CORE // UNO TODO if (!AnimationExtensions.SaturationEffect.IsSupported) { WarningText.Visibility = Visibility.Visible; } - } - } +#endif + } + } } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Scale/ScaleBehaviorPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Scale/ScaleBehaviorPage.xaml index 74c1d43d6d6..0eb3cc827b5 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Scale/ScaleBehaviorPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Scale/ScaleBehaviorPage.xaml @@ -10,14 +10,14 @@ - +