diff --git a/src/Essentials/samples/Samples/App.xaml.cs b/src/Essentials/samples/Samples/App.xaml.cs index 28e47a3ec259..23f82388d1ac 100644 --- a/src/Essentials/samples/Samples/App.xaml.cs +++ b/src/Essentials/samples/Samples/App.xaml.cs @@ -19,8 +19,9 @@ public App() VersionTracking.Track(); MainPage = new NavigationPage(new HomePage()); - +#if !TIZEN SetUpAppActions(); +#endif } async void SetUpAppActions() diff --git a/src/Essentials/samples/Samples/Essentials.Sample.csproj b/src/Essentials/samples/Samples/Essentials.Sample.csproj index 790f6db5feed..5a354855954b 100644 --- a/src/Essentials/samples/Samples/Essentials.Sample.csproj +++ b/src/Essentials/samples/Samples/Essentials.Sample.csproj @@ -23,6 +23,11 @@ + + + + + @@ -43,4 +48,4 @@ maccatalyst-x64 - \ No newline at end of file + diff --git a/src/Essentials/samples/Samples/Platforms/Tizen/CustomViewCellRenderer.cs b/src/Essentials/samples/Samples/Platforms/Tizen/CustomViewCellRenderer.cs deleted file mode 100644 index ddca32c29dbf..000000000000 --- a/src/Essentials/samples/Samples/Platforms/Tizen/CustomViewCellRenderer.cs +++ /dev/null @@ -1,20 +0,0 @@ -using ElmSharp; -using Microsoft.Maui; -using Microsoft.Maui.Controls; -using Samples.Tizen; -using Xamarin.Forms.Platform.Tizen; - -[assembly: ExportCell(typeof(ViewCell), typeof(CustomViewCellRenderer))] - -namespace Samples.Tizen -{ - public sealed class CustomViewCellRenderer : ViewCellRenderer - { - protected override EvasObject OnGetContent(Cell cell, string part) - { - var view = base.OnGetContent(cell, part); - view.PropagateEvents = true; - return view; - } - } -} diff --git a/src/Essentials/samples/Samples/Platforms/Tizen/Program.cs b/src/Essentials/samples/Samples/Platforms/Tizen/Program.cs index 888752757c9f..2d794b60471a 100644 --- a/src/Essentials/samples/Samples/Platforms/Tizen/Program.cs +++ b/src/Essentials/samples/Samples/Platforms/Tizen/Program.cs @@ -1,19 +1,10 @@ using Microsoft.Maui; -using Microsoft.Maui.Controls; -using Tizen.NET.MaterialComponents; -using Xamarin.Forms.Platform.Tizen; namespace Samples.Tizen { - class Program : MauiApplication + class Program : MauiApplication { - protected override void OnCreate() - { - base.OnCreate(); - - MaterialComponents.Init(DirectoryInfo.Resource); - Microsoft.Maui.Essentials.Platform.Init(CoreUIAppContext.GetInstance(this).MainWindow); - } + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); static void Main(string[] args) { @@ -21,4 +12,4 @@ static void Main(string[] args) app.Run(args); } } -} +} \ No newline at end of file diff --git a/src/Essentials/samples/Samples/Platforms/Tizen/tizen-manifest.xml b/src/Essentials/samples/Samples/Platforms/Tizen/tizen-manifest.xml index 7211c46f6225..476eaa61a937 100644 --- a/src/Essentials/samples/Samples/Platforms/Tizen/tizen-manifest.xml +++ b/src/Essentials/samples/Samples/Platforms/Tizen/tizen-manifest.xml @@ -1,7 +1,7 @@  - + Samples.Tizen.png diff --git a/src/Essentials/samples/Samples/Startup.cs b/src/Essentials/samples/Samples/Startup.cs index e103e797c844..5f460c906306 100644 --- a/src/Essentials/samples/Samples/Startup.cs +++ b/src/Essentials/samples/Samples/Startup.cs @@ -1,4 +1,6 @@ -using Microsoft.Maui; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Maui; +using Microsoft.Maui.Controls.Compatibility; using Microsoft.Maui.Controls.Hosting; using Microsoft.Maui.Hosting; using Microsoft.Maui.LifecycleEvents; @@ -15,8 +17,20 @@ public static MauiApp CreateMauiApp() Microsoft.Maui.Essentials.Platform.MapServiceToken = "RJHqIE53Onrqons5CNOx~FrDr3XhjDTyEXEjng-CRoA~Aj69MhNManYUKxo6QcwZ0wmXBtyva0zwuHB04rFYAPf7qqGJ5cHb03RCDw1jIW8l"; #endif - appBuilder + .ConfigureServices(services => + { +#if TIZEN + services.AddTransient((_) => + { + var option = new InitializationOptions + { + DisplayResolutionUnit = DisplayResolutionUnit.DP(true), + }; + return option; + }); +#endif + }) .ConfigureLifecycleEvents(lifecycle => { #if __IOS__ diff --git a/src/Essentials/samples/Samples/View/HomePage.xaml b/src/Essentials/samples/Samples/View/HomePage.xaml index 02b43d3ed3db..dc884d11c4d8 100644 --- a/src/Essentials/samples/Samples/View/HomePage.xaml +++ b/src/Essentials/samples/Samples/View/HomePage.xaml @@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/src/Essentials/samples/Samples/View/PermissionsPage.xaml b/src/Essentials/samples/Samples/View/PermissionsPage.xaml index 71c6ae84a9f0..86ebd7e3465c 100644 --- a/src/Essentials/samples/Samples/View/PermissionsPage.xaml +++ b/src/Essentials/samples/Samples/View/PermissionsPage.xaml @@ -15,7 +15,7 @@ - +