diff --git a/.gitignore b/.gitignore index 40c068d4..1819af22 100644 --- a/.gitignore +++ b/.gitignore @@ -399,4 +399,8 @@ FodyWeavers.xsd # DocFx _site/ -api/ \ No newline at end of file +api/ + +# Mac resource files +.DS_Store +**/.DS_Store \ No newline at end of file diff --git a/src/UraniumUI.Material/Controls/InputField.cs b/src/UraniumUI.Material/Controls/InputField.cs index d321c94c..e84185f2 100644 --- a/src/UraniumUI.Material/Controls/InputField.cs +++ b/src/UraniumUI.Material/Controls/InputField.cs @@ -197,6 +197,12 @@ protected override void OnHandlerChanged() #if ANDROID Loaded += OnLoaded; #endif +#if MACCATALYST + if (OperatingSystem.IsIOSVersionAtLeast(15) && Content.Handler.PlatformView is UIKit.UITextField textview) + { + textview.FocusEffect = null; + } +#endif Content.Focused += OnFocusChanged; Content.Unfocused += OnFocusChanged; diff --git a/src/UraniumUI/Handlers/AutoCompleteViewHandler.Apple.cs b/src/UraniumUI/Handlers/AutoCompleteViewHandler.Apple.cs index 55850c6f..dbc7b791 100644 --- a/src/UraniumUI/Handlers/AutoCompleteViewHandler.Apple.cs +++ b/src/UraniumUI/Handlers/AutoCompleteViewHandler.Apple.cs @@ -27,7 +27,10 @@ protected override UIAutoCompleteTextField CreatePlatformView() view.Text = VirtualView.Text; view.TextColor = VirtualView.TextColor.ToPlatform(); view.ReturnKeyType = UIReturnKeyType.Done; - + if (OperatingSystem.IsIOSVersionAtLeast(15)) + { + view.FocusEffect = null; + } view.AutoCompleteViewSource.Selected += AutoCompleteViewSourceOnSelected; diff --git a/src/UraniumUI/Handlers/DropdownHandler.Apple.cs b/src/UraniumUI/Handlers/DropdownHandler.Apple.cs index 265adfa9..9448cd63 100644 --- a/src/UraniumUI/Handlers/DropdownHandler.Apple.cs +++ b/src/UraniumUI/Handlers/DropdownHandler.Apple.cs @@ -24,6 +24,8 @@ protected override UIKit.UIButton CreatePlatformView() if (UIDevice.CurrentDevice.CheckSystemVersion(15, 0)) { button.ChangesSelectionAsPrimaryAction = true; + var configuration = UIButtonConfiguration.PlainButtonConfiguration; + button.Configuration = configuration; }