diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization.sln b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization.sln new file mode 100644 index 000000000..29f32d6e9 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization.sln @@ -0,0 +1,26 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.0.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Material3HandlerCustomization", "Material3HandlerCustomization\Material3HandlerCustomization.csproj", "{EA372BBF-C9CD-48B4-B86F-81C9E45D74E3}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {EA372BBF-C9CD-48B4-B86F-81C9E45D74E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EA372BBF-C9CD-48B4-B86F-81C9E45D74E3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EA372BBF-C9CD-48B4-B86F-81C9E45D74E3}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {EA372BBF-C9CD-48B4-B86F-81C9E45D74E3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EA372BBF-C9CD-48B4-B86F-81C9E45D74E3}.Release|Any CPU.Build.0 = Release|Any CPU + {EA372BBF-C9CD-48B4-B86F-81C9E45D74E3}.Release|Any CPU.Deploy.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {2E2E5E48-7898-438F-8886-C7773FD2DE51} + EndGlobalSection +EndGlobal diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/App.xaml b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/App.xaml new file mode 100644 index 000000000..ee90e935f --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/App.xaml @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/App.xaml.cs b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/App.xaml.cs new file mode 100644 index 000000000..da50f0dc1 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/App.xaml.cs @@ -0,0 +1,17 @@ +namespace Material3HandlerCustomization; + +public partial class App : Application +{ + public App() + { + InitializeComponent(); + } + + protected override Window CreateWindow(IActivationState? activationState) + { + return new Window(new MainPage()) + { + Title = "Material 3 Handler Customization - .NET MAUI 11" + }; + } +} diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/GlobalUsings.cs b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/GlobalUsings.cs new file mode 100644 index 000000000..e78d112ed --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/GlobalUsings.cs @@ -0,0 +1,3 @@ +global using Microsoft.Maui.Controls; +global using Microsoft.Maui.Controls.Xaml; +global using Microsoft.Maui.Controls.Shapes; diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/MainPage.xaml b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/MainPage.xaml new file mode 100644 index 000000000..b72d433ff --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/MainPage.xaml @@ -0,0 +1,43 @@ + + + + + + + + + + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/MainPage.xaml.cs b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/MainPage.xaml.cs new file mode 100644 index 000000000..02594a271 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/MainPage.xaml.cs @@ -0,0 +1,9 @@ +namespace Material3HandlerCustomization; + +public partial class MainPage : ContentPage +{ + public MainPage() + { + InitializeComponent(); + } +} diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Material3HandlerCustomization.csproj b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Material3HandlerCustomization.csproj new file mode 100644 index 000000000..a94d94bfc --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Material3HandlerCustomization.csproj @@ -0,0 +1,62 @@ + + + + net11.0-android;net11.0-ios;net11.0-maccatalyst + $(TargetFrameworks);net11.0-windows10.0.19041.0 + + Exe + Material3HandlerCustomization + true + true + enable + enable + + true + + + true + + + Material3HandlerCustomization + + + com.companyname.material3handlercustomization + + + 1.0 + 1 + + None + + 15.0 + 17.0 + 24.0 + 10.0.17763.0 + 10.0.17763.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/MauiProgram.cs b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/MauiProgram.cs new file mode 100644 index 000000000..2f40bdf82 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/MauiProgram.cs @@ -0,0 +1,29 @@ +using Microsoft.Extensions.Logging; + +namespace Material3HandlerCustomization; + +public static class MauiProgram +{ + public static MauiApp CreateMauiApp() + { + var builder = MauiApp.CreateBuilder(); + builder + .UseMauiApp() + .ConfigureFonts(fonts => + { + fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); + fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); + }); + +#if ANDROID + // Wire a custom MauiMaterialEditText subclass into EditorHandler2. + MaterialEditorSetup.RegisterCustomEditor(); +#endif + +#if DEBUG + builder.Logging.AddDebug(); +#endif + + return builder.Build(); + } +} diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/AndroidManifest.xml b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/AndroidManifest.xml new file mode 100644 index 000000000..e44369870 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/MainActivity.cs b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/MainActivity.cs new file mode 100644 index 000000000..53e5c2d8b --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/MainActivity.cs @@ -0,0 +1,11 @@ +using Android.App; +using Android.Content.PM; +using Android.OS; + +namespace Material3HandlerCustomization +{ + [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] + public class MainActivity : MauiAppCompatActivity + { + } +} diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/MainApplication.cs b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/MainApplication.cs new file mode 100644 index 000000000..909cecb45 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/MainApplication.cs @@ -0,0 +1,16 @@ +using Android.App; +using Android.Runtime; + +namespace Material3HandlerCustomization +{ + [Application] + public class MainApplication : MauiApplication + { + public MainApplication(IntPtr handle, JniHandleOwnership ownership) + : base(handle, ownership) + { + } + + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); + } +} diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/MaterialEditorSetup.cs b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/MaterialEditorSetup.cs new file mode 100644 index 000000000..53cf4b81d --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/MaterialEditorSetup.cs @@ -0,0 +1,30 @@ +#if ANDROID +using Android.Views; +using Android.Views.InputMethods; +using Microsoft.Maui.Handlers; +using Microsoft.Maui.Platform; + +namespace Material3HandlerCustomization; + +internal static class MaterialEditorSetup +{ + // + public static void RegisterCustomEditor() + { + EditorHandler2.PlatformViewFactory = handler => + { + var context = MauiMaterialContextThemeWrapper.Create(handler.Context!); + var editText = new MyMaterialEditText(context) + { + ImeOptions = ImeAction.Done, + Gravity = GravityFlags.Top, + TextAlignment = global::Android.Views.TextAlignment.ViewStart, + }; + editText.SetSingleLine(false); + editText.SetHorizontallyScrolling(false); + return editText; + }; + } + // +} +#endif diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/MyMaterialEditText.cs b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/MyMaterialEditText.cs new file mode 100644 index 000000000..9228ec692 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/MyMaterialEditText.cs @@ -0,0 +1,37 @@ +#if ANDROID +using Android.Content; +using Android.Text; +using Android.Util; +using Java.Lang; +using Microsoft.Maui.Platform; + +namespace Material3HandlerCustomization; + +// +public class MyMaterialEditText : MauiMaterialEditText +{ + public MyMaterialEditText(Context context) : base(context) + { + } + + public MyMaterialEditText(Context context, IAttributeSet? attrs) : base(context, attrs) + { + } + + protected override void OnTextChanged(ICharSequence? text, int start, int lengthBefore, int lengthAfter) + { + base.OnTextChanged(text, start, lengthBefore, lengthAfter); + + // Force the displayed text to upper case as the user types. + var current = text?.ToString() ?? string.Empty; + var upper = current.ToUpperInvariant(); + if (current != upper) + { + var cursor = SelectionStart; + SetText(upper, TextView.BufferType.Editable); + SetSelection(System.Math.Min(cursor, upper.Length)); + } + } +} +// +#endif diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/Resources/values/colors.xml b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/Resources/values/colors.xml new file mode 100644 index 000000000..fbaa64a5a --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Android/Resources/values/colors.xml @@ -0,0 +1,6 @@ + + + #512BD4 + #2B0B98 + #2B0B98 + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/MacCatalyst/AppDelegate.cs b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/MacCatalyst/AppDelegate.cs new file mode 100644 index 000000000..75916973d --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/MacCatalyst/AppDelegate.cs @@ -0,0 +1,10 @@ +using Foundation; + +namespace Material3HandlerCustomization +{ + [Register("AppDelegate")] + public class AppDelegate : MauiUIApplicationDelegate + { + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); + } +} diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/MacCatalyst/Entitlements.plist b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/MacCatalyst/Entitlements.plist new file mode 100644 index 000000000..49bfebf36 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/MacCatalyst/Entitlements.plist @@ -0,0 +1,10 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.network.client + + + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/MacCatalyst/Info.plist b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/MacCatalyst/Info.plist new file mode 100644 index 000000000..79a863bb8 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/MacCatalyst/Info.plist @@ -0,0 +1,29 @@ + + + + + UIDeviceFamily + + 2 + + UIRequiredDeviceCapabilities + + arm64 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + XSAppIconAssets + Assets.xcassets/appicon.appiconset + + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/MacCatalyst/Program.cs b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/MacCatalyst/Program.cs new file mode 100644 index 000000000..a1e6d9edf --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/MacCatalyst/Program.cs @@ -0,0 +1,13 @@ +using ObjCRuntime; +using UIKit; + +namespace Material3HandlerCustomization +{ + public class Program + { + static void Main(string[] args) + { + UIApplication.Main(args, null, typeof(AppDelegate)); + } + } +} diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Windows/App.xaml b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Windows/App.xaml new file mode 100644 index 000000000..13666512e --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Windows/App.xaml @@ -0,0 +1,8 @@ + + + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Windows/App.xaml.cs b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Windows/App.xaml.cs new file mode 100644 index 000000000..543d7cde5 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Windows/App.xaml.cs @@ -0,0 +1,24 @@ +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 Material3HandlerCustomization.WinUI; + +/// +/// Provides application-specific behavior to supplement the default Application class. +/// +public partial class App : MauiWinUIApplication +{ + /// + /// 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 App() + { + this.InitializeComponent(); + } + + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); +} + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Windows/Package.appxmanifest b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Windows/Package.appxmanifest new file mode 100644 index 000000000..2bcb11edf --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Windows/Package.appxmanifest @@ -0,0 +1,43 @@ + + + + + + + $placeholder$ + User Name + $placeholder$.png + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Windows/app.manifest b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Windows/app.manifest new file mode 100644 index 000000000..a9848fa26 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/Windows/app.manifest @@ -0,0 +1,15 @@ + + + + + + + + true/PM + PerMonitorV2, PerMonitor + + + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/iOS/AppDelegate.cs b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/iOS/AppDelegate.cs new file mode 100644 index 000000000..75916973d --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/iOS/AppDelegate.cs @@ -0,0 +1,10 @@ +using Foundation; + +namespace Material3HandlerCustomization +{ + [Register("AppDelegate")] + public class AppDelegate : MauiUIApplicationDelegate + { + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); + } +} diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/iOS/Info.plist b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/iOS/Info.plist new file mode 100644 index 000000000..0004a4fde --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/iOS/Info.plist @@ -0,0 +1,32 @@ + + + + + LSRequiresIPhoneOS + + UIDeviceFamily + + 1 + 2 + + UIRequiredDeviceCapabilities + + arm64 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + XSAppIconAssets + Assets.xcassets/appicon.appiconset + + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/iOS/Program.cs b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/iOS/Program.cs new file mode 100644 index 000000000..a1e6d9edf --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/iOS/Program.cs @@ -0,0 +1,13 @@ +using ObjCRuntime; +using UIKit; + +namespace Material3HandlerCustomization +{ + public class Program + { + static void Main(string[] args) + { + UIApplication.Main(args, null, typeof(AppDelegate)); + } + } +} diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/iOS/Resources/PrivacyInfo.xcprivacy b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/iOS/Resources/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..24ab3b433 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Platforms/iOS/Resources/PrivacyInfo.xcprivacy @@ -0,0 +1,51 @@ + + + + + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryFileTimestamp + NSPrivacyAccessedAPITypeReasons + + C617.1 + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategorySystemBootTime + NSPrivacyAccessedAPITypeReasons + + 35F9.1 + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryDiskSpace + NSPrivacyAccessedAPITypeReasons + + E174.1 + + + + + + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/AppIcon/appicon.svg b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/AppIcon/appicon.svg new file mode 100644 index 000000000..9d63b6513 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/AppIcon/appicon.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/AppIcon/appiconfg.svg b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/AppIcon/appiconfg.svg new file mode 100644 index 000000000..21dfb25f1 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/AppIcon/appiconfg.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Fonts/OpenSans-Regular.ttf b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Fonts/OpenSans-Regular.ttf new file mode 100644 index 000000000..33b3e0d97 Binary files /dev/null and b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Fonts/OpenSans-Regular.ttf differ diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Fonts/OpenSans-Semibold.ttf b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Fonts/OpenSans-Semibold.ttf new file mode 100644 index 000000000..a1f85711f Binary files /dev/null and b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Fonts/OpenSans-Semibold.ttf differ diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Images/dotnet_bot.png b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Images/dotnet_bot.png new file mode 100644 index 000000000..1d1b981ee Binary files /dev/null and b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Images/dotnet_bot.png differ diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Splash/splash.svg b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Splash/splash.svg new file mode 100644 index 000000000..21dfb25f1 --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Splash/splash.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Styles/Colors.xaml b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Styles/Colors.xaml new file mode 100644 index 000000000..30307a5dd --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Styles/Colors.xaml @@ -0,0 +1,45 @@ + + + + + + + #512BD4 + #ac99ea + #242424 + #DFD8F7 + #9880e5 + #2B0B98 + + White + Black + #D600AA + #190649 + #1f1f1f + + #E1E1E1 + #C8C8C8 + #ACACAC + #919191 + #6E6E6E + #404040 + #212121 + #141414 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Styles/Styles.xaml b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Styles/Styles.xaml new file mode 100644 index 000000000..86f574d8c --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/Material3HandlerCustomization/Resources/Styles/Styles.xaml @@ -0,0 +1,451 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/11.0/UserInterface/Material3/Material3HandlerCustomization/README.md b/11.0/UserInterface/Material3/Material3HandlerCustomization/README.md new file mode 100644 index 000000000..5060deccd --- /dev/null +++ b/11.0/UserInterface/Material3/Material3HandlerCustomization/README.md @@ -0,0 +1,66 @@ +--- +name: .NET MAUI - Material 3 handler customization +description: "Demonstrates how to customise the now-public Android Material 3 handler types in .NET MAUI 11 by subclassing MauiMaterialEditText and wiring it through EditorHandler2.PlatformViewFactory." +page_type: sample +languages: +- csharp +- xaml +products: +- dotnet-maui +urlFragment: material3-handler-customization +--- +# Material 3 handler customization + +This sample demonstrates the now-public Android Material 3 helper types and Handler2 classes added in .NET MAUI 11 ([dotnet/maui#35323](https://github.com/dotnet/maui/pull/35323), closes [#35124](https://github.com/dotnet/maui/issues/35124)). + +In prior previews, types like `MauiMaterialEditText`, `MauiMaterialContextThemeWrapper`, and the `Handler2` Editor / Picker / RadioButton / TimePicker / Label classes were `internal`, so apps couldn't subclass them or swap in their own platform view. .NET MAUI 11 makes the helper types and the Handler2 classes `public`, and adds a `PlatformViewFactory` hook so an app can construct its own subclass. + +This sample subclasses `MauiMaterialEditText` to force every keystroke to upper case, then wires it into `EditorHandler2` via `PlatformViewFactory`. + +## Features demonstrated + +- `true` to opt in to the Material 3 handler set on Android. +- `MyMaterialEditText : MauiMaterialEditText` subclass that overrides `OnTextChanged`. +- `EditorHandler2.PlatformViewFactory = handler => new MyMaterialEditText(...)` to swap the platform view while preserving the default Material 3 theming, `ImeOptions`, `Gravity`, `TextAlignment`, and single-line / horizontal-scrolling setup. + +## Material 3 Handler2 → platform view mapping + +| Helper type | Handler | +|------|---------| +| `MauiMaterialEditText` | `EditorHandler2` | +| `MauiMaterialTextInputLayout` | `EntryHandler2` | +| `MauiMaterialSearchBarTextInputLayout` | `SearchBarHandler2` | +| `MauiMaterialDatePicker` | `DatePickerHandler2` | +| `MauiMaterialPicker` | `PickerHandler2` | +| `MauiMaterialTimePicker` | `TimePickerHandler2` | +| `MauiMaterialContextThemeWrapper` | (helper for theming a `Context`) | +| `MauiMaterialButton` | (used by `ButtonHandler` / `RadioButtonHandler2`) | + +## Project structure + +| File | Purpose | +|------|---------| +| `Material3HandlerCustomization.csproj` | Sets `true` | +| `MauiProgram.cs` | Calls the Android setup in an `#if ANDROID` block | +| `Platforms/Android/MyMaterialEditText.cs` | `MauiMaterialEditText` subclass that uppercases text | +| `Platforms/Android/MaterialEditorSetup.cs` | Sets `EditorHandler2.PlatformViewFactory` | +| `MainPage.xaml` | An `Editor` to demonstrate the customisation | + +## Prerequisites + +- .NET 11 Preview 5 or later +- .NET MAUI workload (`dotnet workload install maui`) + +## Running the sample + +```bash +dotnet build -t:Run -f net11.0-android +``` + +The customisation is Android-only — on iOS, Mac Catalyst, and Windows the page uses the default `Editor` handler. + +## Try this + +1. Build and run on Android (`-f net11.0-android`). +2. Tap into the `Editor` and start typing in mixed case. +3. Watch each character snap to upper case as it lands — that's `MyMaterialEditText.OnTextChanged` running.