From 59e03714a78fb2aebc8becbc9a75d1d3c4dd2680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agn=C3=A8s=20ZITTE?= <16295702+agneszitte@users.noreply.github.com> Date: Fri, 21 Jul 2023 09:53:23 -0400 Subject: [PATCH] fix: Add Mobile Samples Heads (post update to Uno 5.X and net7.0 bump) (#1046) * fix: Add Mobile Samples Heads (post update to Uno 5.X and net7.0 bump) * chore: wip * chore: test * chore: update packages --------- Co-authored-by: Steve Bilogan --- .gitignore | 1 + Uno.Themes.sln | 62 +++++++++++ azure-pipelines.yml | 1 + build/templates/canary-updater.yml | 2 +- crosstargeting_override.props.sample | 2 +- src/library/Uno.Material/xamlmerge.targets | 2 +- .../Android/AndroidManifest.xml | 5 + .../Android/Assets/AboutAssets.txt | 22 ++++ .../Android/Main.Android.cs | 42 ++++++++ .../Android/MainActivity.Android.cs | 17 +++ .../Android/Resources/AboutResources.txt | 47 ++++++++ .../Android/Resources/values/Strings.xml | 5 + .../Android/Resources/values/Styles.xml | 18 ++++ .../Android/environment.conf | 2 + .../MacCatalyst/Entitlements.plist | 6 ++ .../MacCatalyst/Info.plist | 26 +++++ .../MacCatalyst/Main.maccatalyst.cs | 15 +++ .../LaunchImages.launchimage/Contents.json | 58 ++++++++++ .../Uno.Themes.Samples.Mobile.csproj | 101 ++++++++++++++++++ .../iOS/Entitlements.plist | 6 ++ .../Uno.Themes.Samples.Mobile/iOS/Info.plist | 43 ++++++++ .../Uno.Themes.Samples.Mobile/iOS/Main.iOS.cs | 15 +++ .../LaunchImages.launchimage/Contents.json | 58 ++++++++++ .../Uno.Themes.Samples.Skia.Gtk.csproj | 6 +- 24 files changed, 556 insertions(+), 6 deletions(-) create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/Android/AndroidManifest.xml create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/Android/Assets/AboutAssets.txt create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/Android/Main.Android.cs create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/Android/MainActivity.Android.cs create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/Android/Resources/AboutResources.txt create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/Android/Resources/values/Strings.xml create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/Android/Resources/values/Styles.xml create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/Android/environment.conf create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Entitlements.plist create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Info.plist create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Main.maccatalyst.cs create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Entitlements.plist create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Info.plist create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Main.iOS.cs create mode 100644 src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json diff --git a/.gitignore b/.gitignore index 2542034aa..50fb780db 100644 --- a/.gitignore +++ b/.gitignore @@ -340,3 +340,4 @@ src/library/Uno.Material/Generated/mergedpages.v2.xaml crosstargeting_override.props +.vscode/ diff --git a/Uno.Themes.sln b/Uno.Themes.sln index e0df56a69..ef18fc5a2 100644 --- a/Uno.Themes.sln +++ b/Uno.Themes.sln @@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Uno.Themes.Samples.UWP", "s EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Themes.Samples.Wasm", "src\samples\UWP\Uno.Themes.Samples.Wasm\Uno.Themes.Samples.Wasm.csproj", "{5D0F3763-F3BF-4478-B2D3-B47AB74205C9}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Themes.Samples.Mobile", "src\samples\UWP\Uno.Themes.Samples.Mobile\Uno.Themes.Samples.Mobile.csproj", "{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F42C65EA-6E6A-43B9-9D9F-D8C6063AD309}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "library", "library", "{EB41D6CC-AEBE-40A8-B42C-D3F7FBA7001E}" @@ -191,6 +193,64 @@ Global {5D0F3763-F3BF-4478-B2D3-B47AB74205C9}.Release|WASM.Build.0 = Release|Any CPU {5D0F3763-F3BF-4478-B2D3-B47AB74205C9}.Release|x64.ActiveCfg = Release|Any CPU {5D0F3763-F3BF-4478-B2D3-B47AB74205C9}.Release|x64.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Android.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Android.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Android.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhone.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhone.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|macOS.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|macOS.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|macOS.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Packages_UWP.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Packages_WinUI.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Tests.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Tests.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Tests.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|UWP_x64.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|UWP_x64.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|UWP_x64.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|WASM.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|WASM.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|WASM.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|x64.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|x64.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|x64.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Android.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Android.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Android.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Any CPU.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Any CPU.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhone.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhone.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhone.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|macOS.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|macOS.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|macOS.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Packages_UWP.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Packages_WinUI.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Tests.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Tests.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Tests.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|UWP_x64.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|UWP_x64.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|UWP_x64.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|WASM.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|WASM.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|WASM.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|x64.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|x64.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|x64.Deploy.0 = Release|Any CPU {290980EF-0A64-43A5-AEB4-E022D82BBF8B}.Debug|Android.ActiveCfg = Debug|Any CPU {290980EF-0A64-43A5-AEB4-E022D82BBF8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {290980EF-0A64-43A5-AEB4-E022D82BBF8B}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -340,6 +400,7 @@ Global {6279C845-92F8-4333-AB99-3D213163593C} = {F42C65EA-6E6A-43B9-9D9F-D8C6063AD309} {265517E4-AB14-453D-92DA-F32AA1D4007D} = {B402BF43-62D6-463C-A71F-941B8EFF463F} {5D0F3763-F3BF-4478-B2D3-B47AB74205C9} = {B402BF43-62D6-463C-A71F-941B8EFF463F} + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E} = {B402BF43-62D6-463C-A71F-941B8EFF463F} {1EB1EA7F-DD48-49C2-97B3-ADB8E86EF28D} = {464D0819-2E75-4DED-9F70-039580314AFA} {290980EF-0A64-43A5-AEB4-E022D82BBF8B} = {B402BF43-62D6-463C-A71F-941B8EFF463F} {98C1FDAC-C692-4C65-99E7-70FDD53B8F2E} = {EB41D6CC-AEBE-40A8-B42C-D3F7FBA7001E} @@ -356,5 +417,6 @@ Global src\samples\UWP\Uno.Themes.Samples.Shared\Uno.Themes.Samples.Shared.projitems*{290980ef-0a64-43a5-aeb4-e022d82bbf8b}*SharedItemsImports = 5 src\samples\UWP\Uno.Themes.Samples.Shared\Uno.Themes.Samples.Shared.projitems*{5d0f3763-f3bf-4478-b2d3-b47ab74205c9}*SharedItemsImports = 5 src\samples\UWP\Uno.Themes.Samples.Shared\Uno.Themes.Samples.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 + src\samples\UWP\Uno.Themes.Samples.Shared\Uno.Themes.Samples.Shared.projitems*{d45d0327-b421-48f5-98bc-7c9b1d6abd9e}*SharedItemsImports = 5 EndGlobalSection EndGlobal diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 79b070fdb..73da5ff92 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -79,6 +79,7 @@ jobs: # This SDK version is needed as long as `uap10.0` will be supported in Uno.Core - powershell: ./build/Install-WindowsSdkISO.ps1 19041 displayName: Install Windows SDK 19041 + condition: eq(variables['UseWinUI'], false) - template: build/stage-build.yml diff --git a/build/templates/canary-updater.yml b/build/templates/canary-updater.yml index 3342606a1..a3fb25d48 100644 --- a/build/templates/canary-updater.yml +++ b/build/templates/canary-updater.yml @@ -26,6 +26,6 @@ mergeBranch: true branchToMerge: master nugetUpdaterVersion: 2.3.0-alpha.46 - packageAuthor: 'nventive,unoplatform,uno platform' + packageAuthor: 'nventive,Uno Platform' summaryFile: '$(Build.ArtifactStagingDirectory)/Canary.md' resultFile: '$(Build.ArtifactStagingDirectory)/Results.json' \ No newline at end of file diff --git a/crosstargeting_override.props.sample b/crosstargeting_override.props.sample index 71d6d8dfb..56adfd349 100644 --- a/crosstargeting_override.props.sample +++ b/crosstargeting_override.props.sample @@ -25,7 +25,7 @@ - net7.0;$(TargetFrameworkOverride) + net7.0;$(TargetFrameworkOverride) + false + false + true + true + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/Android/environment.conf b/src/samples/UWP/Uno.Themes.Samples.Mobile/Android/environment.conf new file mode 100644 index 000000000..fa6c2e32b --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/Android/environment.conf @@ -0,0 +1,2 @@ +# See this for more details: http://developer.xamarin.com/guides/android/advanced_topics/garbage_collection/ +MONO_GC_PARAMS=bridge-implementation=tarjan,nursery-size=32m,soft-heap-limit=256m \ No newline at end of file diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Entitlements.plist b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Entitlements.plist new file mode 100644 index 000000000..24c310368 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Entitlements.plist @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Info.plist b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Info.plist new file mode 100644 index 000000000..5a4053db4 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Info.plist @@ -0,0 +1,26 @@ + + + + + UIDeviceFamily + + 2 + + LSApplicationCategoryType + public.app-category.utilities + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + XSAppIconAssets + Assets.xcassets/iconapp.appiconset + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Main.maccatalyst.cs b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Main.maccatalyst.cs new file mode 100644 index 000000000..da19896b5 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Main.maccatalyst.cs @@ -0,0 +1,15 @@ +using UIKit; + +namespace Uno.Themes.Samples.MacCatalyst +{ + public class EntryPoint + { + // This is the main entry point of the application. + public static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(App)); + } + } +} diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json new file mode 100644 index 000000000..69555e440 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json @@ -0,0 +1,58 @@ +{ + "images": [ + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "640x960", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "subtype": "retina4", + "scale": "2x", + "size": "640x1136", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "768x1024", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "1024x768", + "idiom": "ipad" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "1536x2048", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "2048x1536", + "idiom": "ipad" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj b/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj new file mode 100644 index 000000000..816617b62 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj @@ -0,0 +1,101 @@ + + + net7.0-ios;net7.0-maccatalyst;net7.0-android33.0 + true + Exe + + Uno.Themes.Samples + + uno.platform.themes + 11F3A2B0-B218-4AA5-BE7A-6E86E2A72297 + + 1.0 + 1 + + Android\AndroidManifest.xml + + + + + True + true + false + + + + + 0.1.0-alpha.58 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 0.1.0-alpha.58 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 0.1.0-alpha.58 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 1.0.59 + + + 1.0.59 + + + + + + + + + + + + + + + + + + + + + + + $(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep + + $(MtouchExtraArgs) --registrar:static + iossimulator-x64 + + + + $(MtouchExtraArgs) --marshal-objectivec-exceptions:disable + + + + + + $(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep + + $(MtouchExtraArgs) --registrar:static + + false + maccatalyst-x64 + + + + $(MtouchExtraArgs) --marshal-objectivec-exceptions:disable + + + + + + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Entitlements.plist b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Entitlements.plist new file mode 100644 index 000000000..24c310368 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Entitlements.plist @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Info.plist b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Info.plist new file mode 100644 index 000000000..981d8e728 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Info.plist @@ -0,0 +1,43 @@ + + + + + LSRequiresIPhoneOS + + UIDeviceFamily + + 1 + 2 + + UIRequiredDeviceCapabilities + + armv7 + arm64 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + XSAppIconAssets + Assets.xcassets/iconapp.appiconset + UIApplicationSupportsIndirectInputEvents + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Main.iOS.cs b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Main.iOS.cs new file mode 100644 index 000000000..a4cbfb670 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Main.iOS.cs @@ -0,0 +1,15 @@ +using UIKit; + +namespace Uno.Themes.Samples.iOS +{ + public class EntryPoint + { + // This is the main entry point of the application. + public static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(App)); + } + } +} diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json new file mode 100644 index 000000000..69555e440 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json @@ -0,0 +1,58 @@ +{ + "images": [ + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "640x960", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "subtype": "retina4", + "scale": "2x", + "size": "640x1136", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "768x1024", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "1024x768", + "idiom": "ipad" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "1536x2048", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "2048x1536", + "idiom": "ipad" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj b/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj index 1320ac969..236cf62c7 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj +++ b/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj @@ -20,15 +20,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive