diff --git a/UI/MauiEmbedding/GrialKitApp/.editorconfig b/UI/MauiEmbedding/GrialKitApp/.editorconfig new file mode 100644 index 000000000..b947be645 --- /dev/null +++ b/UI/MauiEmbedding/GrialKitApp/.editorconfig @@ -0,0 +1,167 @@ +; This file is for unifying the coding style for different editors and IDEs. +; More information at http://editorconfig.org + +# This file is the top-most EditorConfig file +root = true + +########################################## +# Common Settings +########################################## + +[*] +indent_style = space +end_of_line = crlf +trim_trailing_whitespace = true +insert_final_newline = true +charset = utf-8 + +########################################## +# File Extension Settings +########################################## + +[*.{yml,yaml}] +indent_size = 2 + +[.vsconfig] +indent_size = 2 +end_of_line = lf + +[*.sln] +indent_style = tab +indent_size = 2 + +[*.{csproj,proj,projitems,shproj}] +indent_size = 2 + +[*.{json,slnf}] +indent_size = 2 +end_of_line = lf + +[*.{props,targets}] +indent_size = 2 + +[*.xaml] +indent_size = 2 +charset = utf-8-bom + +[*.xml] +indent_size = 2 +end_of_line = lf + +[*.plist] +indent_size = 2 +indent_style = tab +end_of_line = lf + +[*.manifest] +indent_size = 2 + +[*.appxmanifest] +indent_size = 2 + +[*.{json,css,webmanifest}] +indent_size = 2 +end_of_line = lf + +[web.config] +indent_size = 2 +end_of_line = lf + +[*.sh] +indent_size = 2 +end_of_line = lf + +[*.cs] +# EOL should be normalized by Git. See https://github.com/dotnet/format/issues/1099 +end_of_line = unset + +# See https://github.com/dotnet/roslyn/issues/20356#issuecomment-310143926 +trim_trailing_whitespace = false + +tab_width = 4 +indent_size = 4 + +# Sort using and Import directives with System.* appearing first +dotnet_sort_system_directives_first = true + +# Avoid "this." and "Me." if not necessary +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_property = false:suggestion +dotnet_style_qualification_for_method = false:suggestion +dotnet_style_qualification_for_event = false:suggestion + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion +dotnet_style_prefer_auto_properties = true:silent +dotnet_style_object_initializer = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_prefer_simplified_boolean_expressions = true:suggestion +dotnet_style_prefer_conditional_expression_over_assignment = true:silent +dotnet_style_prefer_conditional_expression_over_return = true:silent +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_prefer_inferred_tuple_names = true:suggestion + +csharp_indent_labels = one_less_than_current +csharp_using_directive_placement = outside_namespace:silent +csharp_prefer_simple_using_statement = true:suggestion +csharp_prefer_braces = true:silent +csharp_style_namespace_declarations = file_scoped:warning +csharp_style_prefer_method_group_conversion = true:silent +csharp_style_prefer_top_level_statements = true:silent +csharp_style_prefer_primary_constructors = true:suggestion +csharp_style_expression_bodied_methods = false:silent +csharp_style_expression_bodied_constructors = false:silent +csharp_style_expression_bodied_operators = false:silent +csharp_style_expression_bodied_properties = true:silent +csharp_style_expression_bodied_indexers = true:silent +csharp_style_expression_bodied_accessors = true:silent +csharp_style_expression_bodied_lambdas = true:silent +csharp_style_expression_bodied_local_functions = false:silent diff --git a/UI/MauiEmbedding/GrialKitApp/.gitignore b/UI/MauiEmbedding/GrialKitApp/.gitignore index bc55501a7..ef88c2053 100644 --- a/UI/MauiEmbedding/GrialKitApp/.gitignore +++ b/UI/MauiEmbedding/GrialKitApp/.gitignore @@ -399,5 +399,5 @@ FodyWeavers.xsd # Single Target Config solution-config.props -# Windows Publish Profiles -!**/*.Windows/Properties/PublishProfiles/*.pubxml \ No newline at end of file +# Publish Profiles +!**/Properties/PublishProfiles/*.pubxml \ No newline at end of file diff --git a/UI/MauiEmbedding/GrialKitApp/.vscode/tasks.json b/UI/MauiEmbedding/GrialKitApp/.vscode/tasks.json index 02ee36589..54d839243 100644 --- a/UI/MauiEmbedding/GrialKitApp/.vscode/tasks.json +++ b/UI/MauiEmbedding/GrialKitApp/.vscode/tasks.json @@ -1,6 +1,5 @@ { "version": "2.0.0", "tasks": [ - ] } diff --git a/UI/MauiEmbedding/GrialKitApp/.vsconfig b/UI/MauiEmbedding/GrialKitApp/.vsconfig index 1c9c22808..8bfddc4d6 100644 --- a/UI/MauiEmbedding/GrialKitApp/.vsconfig +++ b/UI/MauiEmbedding/GrialKitApp/.vsconfig @@ -5,34 +5,21 @@ "Microsoft.VisualStudio.Workload.CoreEditor", "Microsoft.NetCore.Component.SDK", "Microsoft.NetCore.Component.DevelopmentTools", - "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions", - "Microsoft.NetCore.Component.Web", "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites", "Microsoft.VisualStudio.Component.TextTemplating", - "Microsoft.VisualStudio.Component.IISExpress", - "Component.Microsoft.Web.LibraryManager", - "Microsoft.VisualStudio.ComponentGroup.Web", - "Microsoft.VisualStudio.Component.Web", - "Microsoft.VisualStudio.ComponentGroup.Web.Client", - "Microsoft.VisualStudio.Workload.NetWeb", - "Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites", - "Microsoft.VisualStudio.Workload.Azure", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites", "Microsoft.VisualStudio.Component.Debugger.JustInTime", - "Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.Component.NetFX.Native", "Microsoft.VisualStudio.Component.Graphics", - "Component.OpenJDK", - "Microsoft.VisualStudio.Component.MonoDebugger", "Microsoft.VisualStudio.Component.Merq", "Component.Xamarin.RemotedSimulator", - "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine", - "Component.Xamarin", - "Component.Android.SDK32", + "Microsoft.VisualStudio.Component.MonoDebugger", + "Microsoft.VisualStudio.ComponentGroup.Maui.All", + "Component.Android.SDK34", + "Component.Android.SDK33", + "Component.OpenJDK", "Microsoft.VisualStudio.Workload.NetCrossPlat", - "Microsoft.VisualStudio.Workload.NetCoreTools", - "Microsoft.VisualStudio.ComponentGroup.Maui.All" + "Microsoft.VisualStudio.Workload.NetCoreTools" ] } diff --git a/UI/MauiEmbedding/GrialKitApp/Directory.Build.props b/UI/MauiEmbedding/GrialKitApp/Directory.Build.props index 89caf9ab0..2641d132e 100644 --- a/UI/MauiEmbedding/GrialKitApp/Directory.Build.props +++ b/UI/MauiEmbedding/GrialKitApp/Directory.Build.props @@ -1,74 +1,24 @@ - - - - - - - enable - enable - - portable - True - - true - - $(NoWarn);CA1416;NU1507;NETSDK1023 - - en - - false - false - false - false - false - - 8.0.7 - 1.10.0.1 - 2.6.0.1 - 1.3.0.1 - - - - - - true - 21.0 - - - - - true - 14.2 - - - - - true - 10.14 - - - - - true - 14.0 - - - - - true - - 10.0.19041.0 - 10.0.19041.0 - win-x86;win-x64;win-arm64 - - - - - + + enable + enable + true + + + $(NoWarn);NU1507;NETSDK1201;NETSDK1023;PRI257 + + + + + 4.1.23 + 6.0.18 + 5.0.13 + 5.2.14 + diff --git a/UI/MauiEmbedding/GrialKitApp/Directory.Build.targets b/UI/MauiEmbedding/GrialKitApp/Directory.Build.targets index 30332cf7d..f75adf7e4 100644 --- a/UI/MauiEmbedding/GrialKitApp/Directory.Build.targets +++ b/UI/MauiEmbedding/GrialKitApp/Directory.Build.targets @@ -1,6 +1,2 @@ - - - - - + diff --git a/UI/MauiEmbedding/GrialKitApp/Directory.Packages.props b/UI/MauiEmbedding/GrialKitApp/Directory.Packages.props index d9ab35bb7..79c529cd0 100644 --- a/UI/MauiEmbedding/GrialKitApp/Directory.Packages.props +++ b/UI/MauiEmbedding/GrialKitApp/Directory.Packages.props @@ -1,34 +1,12 @@ - - - - - + - - - + See https://aka.platform.uno/using-uno-sdk for more information. + --> + + + + + + \ No newline at end of file diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.Base/AppHead.xaml b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.Base/AppHead.xaml deleted file mode 100644 index d4b086380..000000000 --- a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.Base/AppHead.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.Base/AppHead.xaml.cs b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.Base/AppHead.xaml.cs deleted file mode 100644 index 9ff0be290..000000000 --- a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.Base/AppHead.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Microsoft.UI.Xaml; -using Uno.Resizetizer; - -namespace GrialKitApp; - -public sealed partial class AppHead : App -{ - /// - /// 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(). - /// - public AppHead() - { - this.InitializeComponent(); - } - - /// - /// Invoked when the application is launched normally by the end user. Other entry points - /// will be used such as when the application is launched to open a specific file. - /// - /// Details about the launch request and process. - protected override void OnLaunched(LaunchActivatedEventArgs args) - { - base.OnLaunched(args); - - MainWindow.SetWindowIcon(); - } -} diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.Base/GrialKitApp.Base.csproj b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.Base/GrialKitApp.Base.csproj deleted file mode 100644 index 82a9732e3..000000000 --- a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.Base/GrialKitApp.Base.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - net8.0 - false - - - - - - - \ No newline at end of file diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.Base/base.props b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.Base/base.props deleted file mode 100644 index 9b39b5c0e..000000000 --- a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.Base/base.props +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/App.xaml b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/App.xaml index eec291413..4e8a7cd76 100644 --- a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/App.xaml +++ b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/App.xaml @@ -2,7 +2,7 @@ + x:Class="GrialKitApp.MauiControls.App"> diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/App.xaml.cs b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/App.xaml.cs index fa987b8dd..efd66949d 100644 --- a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/App.xaml.cs +++ b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/App.xaml.cs @@ -2,8 +2,8 @@ public partial class App : Application { - public App() - { - InitializeComponent(); - } + public App() + { + InitializeComponent(); + } } diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/AppBuilderExtensions.cs b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/AppBuilderExtensions.cs index cd14b633a..51e0d8c03 100644 --- a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/AppBuilderExtensions.cs +++ b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/AppBuilderExtensions.cs @@ -1,45 +1,27 @@ -using System.Diagnostics; -using System.Reflection; -using System.Runtime.CompilerServices; -// TODO: Uncomment -//using UXDivers.Grial; -using static System.Net.Mime.MediaTypeNames; - -#if ANDROID -using Android.App; -using Android.Content; -using Android.Content.PM; -#endif +using UXDivers.Grial; namespace GrialKitApp; public static class AppBuilderExtensions { - public static MauiAppBuilder UseMauiControls(this MauiAppBuilder builder) - { - // TODO: Uncomment - //#if __IOS__ - // var theme = new ThemeColorsBase(new Dictionary - // { - // { "AccentColor", Color.FromArgb("#FF3F75FF") } - // }); - - // GrialKit.Init(theme, "GrialKitApp.MauiControls.GrialLicense"); - //#else - // Context context = Android.App.Application.Context; + public static MauiAppBuilder UseMauiControls(this MauiAppBuilder builder) + { +#if __IOS__ + var theme = new ThemeColorsBase(new Dictionary + { + { "AccentColor", Color.FromArgb("#FF3F75FF") } + }); - // var lbl = ((PackageItemInfo)context.ApplicationInfo).LoadLabel(context.PackageManager); - // var lbl2 = ((PackageItemInfo)context.ApplicationInfo).NonLocalizedLabel; - - // GrialKit.Init("GrialKitApp.MauiControls.GrialLicense"); - //#endif + GrialKit.Init(theme, "GrialKitApp.MauiControls.GrialLicense"); +#else + GrialKit.Init("GrialKitApp.MauiControls.GrialLicense"); +#endif return builder - // TODO: Uncomment - // .UseGrial() - .ConfigureFonts(fonts => - { - fonts.AddFont("GrialKitApp/Assets/Fonts/OpenSansRegular.ttf", "OpenSansRegular"); - fonts.AddFont("GrialKitApp/Assets/Fonts/OpenSansSemibold.ttf", "OpenSansSemibold"); - }); - } -} \ No newline at end of file + .UseGrial() + .ConfigureFonts(fonts => + { + fonts.AddFont("Assets/Fonts/OpenSansRegular.ttf", "OpenSansRegular"); + fonts.AddFont("Assets/Fonts/OpenSansSemibold.ttf", "OpenSansSemibold"); + }); + } +} diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/AreaChartSample.xaml b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/AreaChartSample.xaml deleted file mode 100644 index 708365dc3..000000000 --- a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/AreaChartSample.xaml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/AreaChartSample.xaml.cs b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/AreaChartSample.xaml.cs deleted file mode 100644 index 3bdda448f..000000000 --- a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/AreaChartSample.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace GrialKitApp.MauiControls; - -public partial class AreaChartSample : ContentPage -{ - public AreaChartSample() - { - InitializeComponent(); - - // TODO: Uncomment - //chart.BindingContext = SampleData.MultiseriesWithLabels(); - } -} diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/BarChartSample.xaml b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/BarChartSample.xaml deleted file mode 100644 index 033f5d145..000000000 --- a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/BarChartSample.xaml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/BarChartSample.xaml.cs b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/BarChartSample.xaml.cs deleted file mode 100644 index 7200abf11..000000000 --- a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/BarChartSample.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace GrialKitApp.MauiControls; - -public partial class BarChartSample : ContentPage -{ - public BarChartSample() - { - InitializeComponent(); - - // TODO: Uncomment - //chart1.BindingContext = chart2.BindingContext = SampleData.Bar(); - } -} diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/BarMultiSeriesSample.xaml b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/BarMultiSeriesSample.xaml deleted file mode 100644 index 210d967cb..000000000 --- a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/BarMultiSeriesSample.xaml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/BarMultiSeriesSample.xaml.cs b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/BarMultiSeriesSample.xaml.cs deleted file mode 100644 index 42da24da8..000000000 --- a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/BarMultiSeriesSample.xaml.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace GrialKitApp.MauiControls; - -public partial class BarMultiSeriesSample : ContentPage -{ - public BarMultiSeriesSample() - { - InitializeComponent(); - - // TODO: Uncomment - //chart.BindingContext = SampleData.MultiSeriesBar(); - - } -} diff --git a/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/EmbeddedControl.xaml b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/EmbeddedControl.xaml new file mode 100644 index 000000000..3edb7f54b --- /dev/null +++ b/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/EmbeddedControl.xaml @@ -0,0 +1,40 @@ + + + + + + +