diff --git a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/CustomRenderers/QueryEditorHandler.cs b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/CustomRenderers/QueryEditorHandler.cs index cf6e6b3..b57587c 100644 --- a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/CustomRenderers/QueryEditorHandler.cs +++ b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/CustomRenderers/QueryEditorHandler.cs @@ -114,35 +114,11 @@ namespace Xamarin.Neo4j.iOS.CustomRenderers scrollView.BottomAnchor.ConstraintEqualTo(pillContainer.BottomAnchor), }); - // Execute button — blue pill - var executeBtn = new UIButton(UIButtonType.System); - executeBtn.TranslatesAutoresizingMaskIntoConstraints = false; - executeBtn.SetTitle("Execute", UIControlState.Normal); - executeBtn.SetTitleColor(UIColor.White, UIControlState.Normal); - executeBtn.BackgroundColor = UIColor.SystemBlue; - executeBtn.Layer.CornerRadius = pillHeight / 2f; - executeBtn.Layer.MasksToBounds = true; - executeBtn.TouchUpInside += (s, e) => - { - if (VirtualView is QueryEditor queryEditor) - { - queryEditor.RaiseExecuteClicked(); - platformView.ResignFirstResponder(); - } - }; - accessoryView.AddSubview(pillContainer); - accessoryView.AddSubview(executeBtn); NSLayoutConstraint.ActivateConstraints(new[] { - executeBtn.TrailingAnchor.ConstraintEqualTo(accessoryView.TrailingAnchor, -padding), - executeBtn.CenterYAnchor.ConstraintEqualTo(accessoryView.CenterYAnchor), - executeBtn.HeightAnchor.ConstraintEqualTo(pillHeight), - executeBtn.WidthAnchor.ConstraintEqualTo(executeButtonWidth), - pillContainer.LeadingAnchor.ConstraintEqualTo(accessoryView.LeadingAnchor, padding), - pillContainer.TrailingAnchor.ConstraintEqualTo(executeBtn.LeadingAnchor, -padding), pillContainer.CenterYAnchor.ConstraintEqualTo(accessoryView.CenterYAnchor), pillContainer.HeightAnchor.ConstraintEqualTo(pillHeight), }); @@ -172,6 +148,9 @@ namespace Xamarin.Neo4j.iOS.CustomRenderers { var text = PreprocessText(platformView.Text ?? string.Empty); var attributedText = new NSMutableAttributedString(text); + attributedText.AddAttribute(UIStringAttributeKey.ForegroundColor, + UIColor.Label, + new NSRange(0, text.Length)); foreach (var word in wordsToHighlight) { diff --git a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/LaunchScreen.storyboard b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/LaunchScreen.storyboard index bc4ed80..caaa38f 100644 --- a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/LaunchScreen.storyboard +++ b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/LaunchScreen.storyboard @@ -24,7 +24,7 @@ - + diff --git a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j/Pages/AddConnectionPage.xaml b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j/Pages/AddConnectionPage.xaml index 342ca49..0cdce91 100644 --- a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j/Pages/AddConnectionPage.xaml +++ b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j/Pages/AddConnectionPage.xaml @@ -56,7 +56,7 @@ -