This repository has been archived by the owner on Dec 21, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix issue launching the sample on Windows
- Loading branch information
1 parent
3c447ff
commit 0866ce2
Showing
25 changed files
with
188 additions
and
158 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/GraphicsControls.Sample/Platforms/Android/AndroidManifest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" /> | ||
| <application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application> | ||
| <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> | ||
| <uses-permission android:name="android.permission.INTERNET" /> | ||
| </manifest> |
16 changes: 2 additions & 14 deletions
16
src/GraphicsControls.Sample/Platforms/Android/MainActivity.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,11 @@ | ||
| using Android.App; | ||
| using Android.Content.PM; | ||
| using Android.OS; | ||
| using Microsoft.Maui; | ||
|
|
||
| namespace GraphicsControls.Sample | ||
| { | ||
| [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)] | ||
| [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] | ||
| public class MainActivity : MauiAppCompatActivity | ||
| { | ||
| protected override void OnCreate(Bundle savedInstanceState) | ||
| { | ||
| base.OnCreate(savedInstanceState); | ||
| Platform.Init(this, savedInstanceState); | ||
| } | ||
|
|
||
| public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults) | ||
| { | ||
| Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults); | ||
|
|
||
| base.OnRequestPermissionsResult(requestCode, permissions, grantResults); | ||
| } | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/GraphicsControls.Sample/Platforms/Android/MainApplication.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 9 additions & 6 deletions
15
src/GraphicsControls.Sample/Platforms/MacCatalyst/AppDelegate.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,12 @@ | ||
| using Foundation; | ||
| using Microsoft.Maui; | ||
| using Microsoft.Maui.Hosting; | ||
|
|
||
| namespace GraphicsControls.Sample; | ||
|
|
||
| [Register("AppDelegate")] | ||
| public class AppDelegate : MauiUIApplicationDelegate | ||
| namespace GraphicsControls.Sample | ||
| { | ||
| protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); | ||
| } | ||
| [Register("AppDelegate")] | ||
| public class AppDelegate : MauiUIApplicationDelegate | ||
| { | ||
| protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); | ||
| } | ||
| } |
23 changes: 12 additions & 11 deletions
23
src/GraphicsControls.Sample/Platforms/MacCatalyst/Program.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,16 @@ | ||
| using ObjCRuntime; | ||
| using UIKit; | ||
|
|
||
| namespace GraphicsControls.Sample; | ||
|
|
||
| public class Program | ||
| namespace GraphicsControls.Sample | ||
| { | ||
| // This is the main entry point of the application. | ||
| 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(AppDelegate)); | ||
| } | ||
| } | ||
| public class Program | ||
| { | ||
| // This is the main entry point of the application. | ||
| 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(AppDelegate)); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| using Microsoft.Maui; | ||
| using Microsoft.Maui.Hosting; | ||
| using System; | ||
|
|
||
| namespace GraphicsControls.Sample | ||
| { | ||
| internal class Program : MauiApplication | ||
| { | ||
| protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); | ||
|
|
||
| static void Main(string[] args) | ||
| { | ||
| var app = new Program(); | ||
| app.Run(args); | ||
| } | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
src/GraphicsControls.Sample/Platforms/Tizen/tizen-manifest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest package="com.companyname.GraphicsControls.Sample" version="1.0.0" api-version="7" xmlns="http://tizen.org/ns/packages"> | ||
| <profile name="common" /> | ||
| <ui-application appid="com.companyname.GraphicsControls.Sample" exec="GraphicsControls.Sample.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single"> | ||
| <label>GraphicsControls.Sample</label> | ||
| <icon>appicon.xhigh.png</icon> | ||
| <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" /> | ||
| </ui-application> | ||
| <shortcut-list /> | ||
| <privileges> | ||
| <privilege>http://tizen.org/privilege/internet</privilege> | ||
| </privileges> | ||
| <dependencies /> | ||
| <provides-appdefined-privileges /> | ||
| </manifest> |
37 changes: 16 additions & 21 deletions
37
src/GraphicsControls.Sample/Platforms/Windows/App.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,26 @@ | ||
| using Microsoft.UI.Xaml; | ||
| using Microsoft.Maui; | ||
| using Microsoft.Maui.Hosting; | ||
| using Microsoft.UI.Xaml; | ||
|
|
||
| // To learn more about WinUI, the WinUI project structure, | ||
| // and more about our project templates, see: http://aka.ms/winui-project-info. | ||
|
|
||
| namespace GraphicsControls.Sample.WinUI; | ||
|
|
||
| /// <summary> | ||
| /// Provides application-specific behavior to supplement the default Application class. | ||
| /// </summary> | ||
| public partial class App : MauiWinUIApplication | ||
| namespace GraphicsControls.Sample.WinUI | ||
| { | ||
| /// <summary> | ||
| /// Initializes the singleton application object. This is the first line of authored code | ||
| /// executed, and as such is the logical equivalent of main() or WinMain(). | ||
| /// Provides application-specific behavior to supplement the default Application class. | ||
| /// </summary> | ||
| public App() | ||
| { | ||
| this.InitializeComponent(); | ||
| } | ||
|
|
||
| protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); | ||
|
|
||
| protected override void OnLaunched(LaunchActivatedEventArgs args) | ||
| public partial class App : MauiWinUIApplication | ||
| { | ||
| base.OnLaunched(args); | ||
| /// <summary> | ||
| /// Initializes the singleton application object. This is the first line of authored code | ||
| /// executed, and as such is the logical equivalent of main() or WinMain(). | ||
| /// </summary> | ||
| public App() | ||
| { | ||
| this.InitializeComponent(); | ||
| } | ||
|
|
||
| Platform.OnLaunched(args); | ||
| protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.