From 7f63d7f4061b045df27e03715327dd3e669f237c Mon Sep 17 00:00:00 2001 From: Prathamesh Narkhede Date: Fri, 21 Mar 2025 15:31:07 -0700 Subject: [PATCH 1/4] Updated MAUI bindings to use new Compiled Bindings introduced in .Net 9 --- .../Samples/BookmarksViewSample.xaml.cs | 8 ++----- .../FloorFilter.DefaultTemplates.cs | 8 +++---- .../Toolkit.Maui/FloorFilter/FloorFilter.cs | 4 ++-- src/Toolkit/Toolkit.Maui/Legend/Legend.cs | 8 +++---- .../Toolkit.Maui/OverviewMap/OverviewMap.cs | 6 ++--- .../SearchView/SearchView.Appearance.cs | 18 +++++++------- .../AttachmentsFormElementView.Maui.cs | 20 ++++++++-------- .../FeatureForm/ComboboxFormInputView.Maui.cs | 4 ++-- .../FeatureFormElementTemplateSelector.cs | 2 +- .../FeatureForm/FeatureFormView.Maui.cs | 10 ++++---- .../Controls/FeatureForm/FeatureFormView.cs | 2 +- .../FeatureForm/FieldFormElementView.Maui.cs | 14 +++++------ .../FeatureForm/FormAttachmentView.Maui.cs | 6 ++--- .../FeatureForm/GroupFormElementView.Maui.cs | 21 ++++++++-------- .../RadioButtonsFormInputView.Maui.cs | 2 +- .../FeatureForm/SwitchFormInputView.Maui.cs | 10 ++++---- .../FeatureForm/TextFormInputView.Maui.cs | 8 +++---- .../AttachmentsPopupElementView.Maui.cs | 22 ++++++++--------- .../PopupViewer/CarouselView.Windows.cs | 13 ++-------- .../PopupViewer/MediaPopupElementView.Maui.cs | 24 +++++++++---------- .../Controls/PopupViewer/PopupViewer.Maui.cs | 8 +++---- .../UI/Controls/PopupViewer/PopupViewer.cs | 2 +- 22 files changed, 104 insertions(+), 116 deletions(-) diff --git a/src/Samples/Toolkit.SampleApp.Maui/Samples/BookmarksViewSample.xaml.cs b/src/Samples/Toolkit.SampleApp.Maui/Samples/BookmarksViewSample.xaml.cs index dd3ad8872..c441e87fe 100644 --- a/src/Samples/Toolkit.SampleApp.Maui/Samples/BookmarksViewSample.xaml.cs +++ b/src/Samples/Toolkit.SampleApp.Maui/Samples/BookmarksViewSample.xaml.cs @@ -42,9 +42,7 @@ private void SetMapViewBinding_Click(object? sender, EventArgs e) _viewContainer.Children.Add(MyMapView); if (_viewContainer.Children.Contains(MySceneView)) _viewContainer.Children.Remove(MySceneView); - Binding geoviewBinding = new Binding(); - geoviewBinding.Source = MyMapView; - BookmarksView.SetBinding(Esri.ArcGISRuntime.Toolkit.Maui.BookmarksView.GeoViewProperty, geoviewBinding); + BookmarksView.SetBinding(Esri.ArcGISRuntime.Toolkit.Maui.BookmarksView.GeoViewProperty, static (MapView mapView) => mapView, source: MyMapView); } // Note that the Web Scene Specification does not use bookmarks. @@ -55,9 +53,7 @@ private void SetSceneViewBinding_Click(object? sender, EventArgs e) _viewContainer.Children.Add(MySceneView); if (_viewContainer.Children.Contains(MyMapView)) _viewContainer.Children.Remove(MyMapView); - Binding geoviewBinding = new Binding(); - geoviewBinding.Source = MySceneView; - BookmarksView.SetBinding(Esri.ArcGISRuntime.Toolkit.Maui.BookmarksView.GeoViewProperty, geoviewBinding); + BookmarksView.SetBinding(Esri.ArcGISRuntime.Toolkit.Maui.BookmarksView.GeoViewProperty, static (SceneView sceneView) => sceneView, source: MySceneView); } private void SetDocumentOne_Click(object? sender, EventArgs e) diff --git a/src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.DefaultTemplates.cs b/src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.DefaultTemplates.cs index 1338a4c60..399fcb9dc 100644 --- a/src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.DefaultTemplates.cs +++ b/src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.DefaultTemplates.cs @@ -56,7 +56,7 @@ static FloorFilter() VerticalOptions = LayoutOptions.Fill, InputTransparent = false, }; - textLabel.SetBinding(Label.TextProperty, "ShortName"); + textLabel.SetBinding(Label.TextProperty, static (FloorLevel level) => level.ShortName); containingGrid.Children.Add(textLabel); return containingGrid; }); @@ -73,7 +73,7 @@ static FloorFilter() Margin = new Thickness(8), HorizontalOptions = LayoutOptions.Fill }; - textLabel.SetBinding(Label.TextProperty, "Name"); + textLabel.SetBinding(Label.TextProperty, static (FloorFacility facility) => facility.Name); textLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb("#6e6e6e"), Color.FromArgb("#fff")); containingGrid.Children.Add(textLabel); @@ -111,7 +111,7 @@ static FloorFilter() FontSize = 14, }; titleLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb("#6e6e6e"), Color.FromArgb("#fff")); - titleLabel.SetBinding(Label.TextProperty, "Name"); + titleLabel.SetBinding(Label.TextProperty, static (FloorFacility facility) => facility.Name); Label subtitleLabel = new Label { @@ -120,7 +120,7 @@ static FloorFilter() VerticalOptions = LayoutOptions.Start, }; subtitleLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb("#2e2e2e"), Color.FromArgb("#aaa")); - subtitleLabel.SetBinding(Label.TextProperty, "Site.Name"); + subtitleLabel.SetBinding(Label.TextProperty, static (FloorFacility facility) => facility.Site?.Name); textStack.Children.Add(titleLabel); textStack.Children.Add(subtitleLabel); Grid.SetRow(titleLabel, 0); diff --git a/src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.cs b/src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.cs index a1362c1b8..b574eaf86 100644 --- a/src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.cs +++ b/src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.cs @@ -125,8 +125,8 @@ protected override void OnApplyTemplate() { PART_LevelListView.ItemTemplate = LevelDataTemplate; PART_LevelListView.BindingContext = this; - PART_LevelListView.SetBinding(CollectionView.ItemsSourceProperty, new Binding(nameof(DisplayLevels), BindingMode.OneWay)); - PART_LevelListView.SetBinding(CollectionView.SelectedItemProperty, new Binding(nameof(SelectedLevel), BindingMode.TwoWay)); + PART_LevelListView.SetBinding(CollectionView.ItemsSourceProperty, nameof(DisplayLevels), BindingMode.OneWay); + PART_LevelListView.SetBinding(CollectionView.SelectedItemProperty, static (FloorFilter filter) => filter.SelectedLevel, BindingMode.TwoWay); } } diff --git a/src/Toolkit/Toolkit.Maui/Legend/Legend.cs b/src/Toolkit/Toolkit.Maui/Legend/Legend.cs index 0942e2afc..6db7a7072 100644 --- a/src/Toolkit/Toolkit.Maui/Legend/Legend.cs +++ b/src/Toolkit/Toolkit.Maui/Legend/Legend.cs @@ -40,14 +40,14 @@ static Legend() s_DefaultLayerItemTemplate = new DataTemplate(() => { var nameLabel = new Label { FontSize = 18, VerticalOptions = LayoutOptions.Center }; - nameLabel.SetBinding(Label.TextProperty, $"{nameof(LegendEntry.Content)}.{nameof(Layer.Name)}"); + nameLabel.SetBinding(Label.TextProperty, static (Layer layer) => layer.Name); return nameLabel; }); s_DefaultSublayerItemTemplate = new DataTemplate(() => { var nameLabel = new Label { FontSize = 14, VerticalOptions = LayoutOptions.Center }; - nameLabel.SetBinding(Label.TextProperty, $"{nameof(LegendEntry.Content)}.{nameof(ILayerContent.Name)}"); + nameLabel.SetBinding(Label.TextProperty, static (ILayerContent content) => content.Name); return nameLabel; }); @@ -55,10 +55,10 @@ static Legend() { StackLayout sl = new StackLayout() { Orientation = StackOrientation.Horizontal }; var symbol = new SymbolDisplay { WidthRequest = 40, HeightRequest = 40, VerticalOptions = LayoutOptions.Center, Margin = new Thickness(0, 0, 5, 0) }; - symbol.SetBinding(SymbolDisplay.SymbolProperty, $"{nameof(LegendEntry.Content)}.{nameof(LegendInfo.Symbol)}"); + symbol.SetBinding(SymbolDisplay.SymbolProperty, static (LegendInfo info) => info.Symbol); sl.Children.Add(symbol); var nameLabel = new Label { FontSize = 12, VerticalOptions = LayoutOptions.Center }; - nameLabel.SetBinding(Label.TextProperty, $"{nameof(LegendEntry.Content)}.{nameof(LegendInfo.Name)}"); + nameLabel.SetBinding(Label.TextProperty, static (LegendInfo info) => info.Name); sl.Children.Add(nameLabel); return sl; }); diff --git a/src/Toolkit/Toolkit.Maui/OverviewMap/OverviewMap.cs b/src/Toolkit/Toolkit.Maui/OverviewMap/OverviewMap.cs index e9f75b0dc..b2650eadc 100644 --- a/src/Toolkit/Toolkit.Maui/OverviewMap/OverviewMap.cs +++ b/src/Toolkit/Toolkit.Maui/OverviewMap/OverviewMap.cs @@ -50,15 +50,15 @@ static OverviewMap() IsAttributionTextVisible = false }; ActivityIndicator activity = new ActivityIndicator(); - activity.SetBinding(ActivityIndicator.IsRunningProperty, new Binding("Map.LoadStatus", converter: converter, converterParameter: "Loading", source : mapView)); + activity.SetBinding(ActivityIndicator.IsRunningProperty, static (Map map) => map.LoadStatus, converter: converter, converterParameter: "Loading", source: mapView); root.Add(activity); Label label = new Label() { TextColor = Colors.Black, Text = "Map failed to load. Did you forget an API key?" }; - label.SetBinding(VisualElement.IsVisibleProperty, new Binding("Map.LoadStatus", converter: converter, converterParameter: "FailedToLoad", source: mapView)); + label.SetBinding(VisualElement.IsVisibleProperty, static (Map map) => map.LoadStatus, converter: converter, converterParameter: "FailedToLoad", source: mapView); root.Add(label); - mapView.SetBinding(VisualElement.IsVisibleProperty, new Binding("Map.LoadStatus", converter: converter, converterParameter: "Loaded", source: mapView)); + mapView.SetBinding(VisualElement.IsVisibleProperty, static (Map map) => map.LoadStatus, converter: converter, converterParameter: "Loaded", source: mapView); root.Add(mapView); INameScope nameScope = new NameScope(); NameScope.SetNameScope(rootFrame, nameScope); diff --git a/src/Toolkit/Toolkit.Maui/SearchView/SearchView.Appearance.cs b/src/Toolkit/Toolkit.Maui/SearchView/SearchView.Appearance.cs index 43c0aea4f..b2ba6bc80 100644 --- a/src/Toolkit/Toolkit.Maui/SearchView/SearchView.Appearance.cs +++ b/src/Toolkit/Toolkit.Maui/SearchView/SearchView.Appearance.cs @@ -56,7 +56,7 @@ static SearchView() containingGrid.SetAppThemeColor(Grid.BackgroundColorProperty, Color.FromArgb("#4e4e4e"), Color.FromArgb("#151515")); Label textLabel = new Label(); - textLabel.SetBinding(Label.TextProperty, "Key.DisplayName"); + textLabel.SetBinding(Label.TextProperty, static (ISearchSource key) => key.DisplayName); textLabel.Margin = new Thickness(4); textLabel.TextColor = Colors.White; textLabel.FontSize = 14; @@ -79,21 +79,21 @@ static SearchView() textStack.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto }); Image imageView = new Image(); - imageView.SetBinding(Image.SourceProperty, nameof(SearchSuggestion.IsCollection), converter: CollectionIconConverter); + imageView.SetBinding(Image.SourceProperty, static (SearchSuggestion suggestion) => suggestion.IsCollection, converter: CollectionIconConverter); imageView.WidthRequest = 16; imageView.HeightRequest = 16; imageView.Margin = new Thickness(4); imageView.VerticalOptions = LayoutOptions.Center; Label titleLabel = new Label(); - titleLabel.SetBinding(Label.TextProperty, nameof(SearchSuggestion.DisplayTitle)); + titleLabel.SetBinding(Label.TextProperty, static (SearchSuggestion suggestion) => suggestion.DisplayTitle); titleLabel.VerticalOptions = LayoutOptions.End; titleLabel.VerticalTextAlignment = TextAlignment.End; titleLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb(FOREGROUND_LIGHT), Color.FromArgb(FOREGROUND_DARK)); Label subtitleLabel = new Label(); - subtitleLabel.SetBinding(Label.TextProperty, nameof(SearchSuggestion.DisplaySubtitle)); - subtitleLabel.SetBinding(Label.IsVisibleProperty, nameof(SearchSuggestion.DisplaySubtitle), converter: EmptyStringConverter); + subtitleLabel.SetBinding(Label.TextProperty, static (SearchSuggestion suggestion) => suggestion.DisplaySubtitle); + subtitleLabel.SetBinding(Label.IsVisibleProperty, static (SearchSuggestion suggestion) => suggestion.DisplaySubtitle, converter: EmptyStringConverter); subtitleLabel.VerticalOptions = LayoutOptions.Start; subtitleLabel.VerticalTextAlignment = TextAlignment.Start; subtitleLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb(FOREGROUND_LIGHT), Color.FromArgb(FOREGROUND_DARK)); @@ -128,22 +128,22 @@ static SearchView() textStack.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto }); Image imageView = new Image(); - imageView.SetBinding(Image.SourceProperty, nameof(SearchResult.MarkerImageData), converter: ImageSourceConverter); + imageView.SetBinding(Image.SourceProperty, static (SearchResult result) => result.MarkerImageData, converter: ImageSourceConverter); imageView.WidthRequest = 24; imageView.HeightRequest = 24; imageView.Margin = new Thickness(4); imageView.VerticalOptions = LayoutOptions.Center; Label titleLabel = new Label(); - titleLabel.SetBinding(Label.TextProperty, nameof(SearchResult.DisplayTitle)); + titleLabel.SetBinding(Label.TextProperty, static (SearchResult result) => result.DisplayTitle); titleLabel.FontAttributes = FontAttributes.Bold; titleLabel.VerticalOptions = LayoutOptions.End; titleLabel.VerticalTextAlignment = TextAlignment.End; titleLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb(FOREGROUND_LIGHT), Color.FromArgb(FOREGROUND_DARK)); Label subtitleLabel = new Label(); - subtitleLabel.SetBinding(Label.TextProperty, nameof(SearchResult.DisplaySubtitle)); - subtitleLabel.SetBinding(Label.IsVisibleProperty, nameof(SearchResult.DisplaySubtitle), converter: EmptyStringConverter); + subtitleLabel.SetBinding(Label.TextProperty, static (SearchResult result) => result.DisplaySubtitle); + subtitleLabel.SetBinding(Label.IsVisibleProperty, static (SearchResult result) => result.DisplaySubtitle, converter: EmptyStringConverter); subtitleLabel.VerticalOptions = LayoutOptions.Start; subtitleLabel.VerticalTextAlignment = TextAlignment.Start; subtitleLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb(FOREGROUND_LIGHT), Color.FromArgb(FOREGROUND_DARK)); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Maui.cs index feac760db..75a158554 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Maui.cs @@ -59,7 +59,7 @@ static AttachmentsFormElementView() private static object BuildDefaultTemplate() { var root = new VerticalStackLayout(); - root.SetBinding(VerticalStackLayout.IsVisibleProperty, nameof(FormElement.IsVisible)); + root.SetBinding(VerticalStackLayout.IsVisibleProperty, static (FormElement element) => element.IsVisible); Grid header = new Grid(); header.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Star)); @@ -68,13 +68,13 @@ private static object BuildDefaultTemplate() header.RowDefinitions.Add(new RowDefinition(GridLength.Auto)); var label = new Label(); - label.SetBinding(Label.TextProperty, new Binding("Element.Label", source: RelativeBindingSource.TemplatedParent)); - label.SetBinding(View.IsVisibleProperty, new Binding("Element.Label", source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter())); + label.SetBinding(Label.TextProperty, static (FormElement element) => element.Label, source: RelativeBindingSource.TemplatedParent); + label.SetBinding(View.IsVisibleProperty, static (FormElement element) => element.Label, source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter()); label.Style = FeatureFormView.GetFeatureFormTitleStyle(); header.Children.Add(label); label = new Label(); - label.SetBinding(Label.TextProperty, new Binding("Element.Description", source: RelativeBindingSource.TemplatedParent)); - label.SetBinding(Label.IsVisibleProperty, new Binding("Element.Description", source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter())); + label.SetBinding(Label.TextProperty, static (FormElement element) => element.Description, source: RelativeBindingSource.TemplatedParent); + label.SetBinding(Label.IsVisibleProperty, static (FormElement element) => element.Description, source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter()); label.Style = FeatureFormView.GetFeatureFormCaptionStyle(); Grid.SetRow(label, 1); header.Children.Add(label); @@ -95,7 +95,7 @@ private static object BuildDefaultTemplate() Grid.SetColumn(addButton, 1); Grid.SetRowSpan(addButton, 2); - addButton.SetBinding(VisualElement.IsVisibleProperty, new Binding("Element.IsEditable", source: RelativeBindingSource.TemplatedParent)); + addButton.SetBinding(VisualElement.IsVisibleProperty, static (AttachmentsFormElement element) => element.IsEditable, source: RelativeBindingSource.TemplatedParent); header.Children.Add(addButton); root.Children.Add(header); @@ -108,10 +108,10 @@ private static object BuildDefaultTemplate() ItemTemplate = new DataTemplate(() => { var view = new FormAttachmentView(); - view.SetBinding(FormAttachmentView.AttachmentProperty, new Binding()); - view.SetBinding(FormAttachmentView.ElementProperty, new Binding("Element", source: RelativeBindingSource.TemplatedParent)); + view.SetBinding(FormAttachmentView.AttachmentProperty, static (FormAttachmentView view) => view.Attachment); + view.SetBinding(FormAttachmentView.ElementProperty, static (FormAttachmentView view) => view.Element, source: RelativeBindingSource.TemplatedParent); view.SetAppThemeColor(FormAttachmentView.IconColorProperty, Colors.Black, Colors.White); - view.SetBinding(ToolTipProperties.TextProperty, new Binding("Attachment.Name")); + view.SetBinding(ToolTipProperties.TextProperty, static (FormAttachmentView view) => view.Attachment?.Name); return view; }), #if IOS @@ -121,7 +121,7 @@ private static object BuildDefaultTemplate() MinimumHeightRequest = 75, #endif }; - itemsView.SetBinding(CollectionView.ItemsSourceProperty, new Binding("Element.Attachments", source: RelativeBindingSource.TemplatedParent)); + itemsView.SetBinding(CollectionView.ItemsSourceProperty, static (FormAttachmentView view) => view.Element?.Attachments, source: RelativeBindingSource.TemplatedParent); root.Children.Add(itemsView); INameScope nameScope = new NameScope(); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/ComboboxFormInputView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/ComboboxFormInputView.Maui.cs index 1b1eed3a5..d87e2410e 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/ComboboxFormInputView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/ComboboxFormInputView.Maui.cs @@ -23,8 +23,8 @@ static ComboBoxFormInputView() private static object BuildDefaultTemplate() { Picker view = new Picker(); - view.SetBinding(Picker.IsEnabledProperty, "Element.IsEditable"); - view.ItemDisplayBinding = new Binding(nameof(CodedValue.Name)); + view.SetBinding(Picker.IsEnabledProperty, static (FieldFormElement element) => element.IsEditable); + view.ItemDisplayBinding = Binding.Create(static (CodedValue codedValue) => codedValue.Name); INameScope nameScope = new NameScope(); NameScope.SetNameScope(view, nameScope); nameScope.RegisterName("Picker", view); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormElementTemplateSelector.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormElementTemplateSelector.cs index 487f0e5ea..943e96052 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormElementTemplateSelector.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormElementTemplateSelector.cs @@ -38,7 +38,7 @@ static FeatureFormElementTemplateSelector() { var view = new FieldFormElementView() { Margin = new Thickness(0, 0, 0, 10) }; view.SetBinding(FieldFormElementView.ElementProperty, Binding.SelfPath); - view.SetBinding(FieldFormElementView.FeatureFormProperty, new Binding(nameof(FeatureFormView.FeatureForm), source: new RelativeBindingSource(RelativeBindingSourceMode.FindAncestor, typeof(FeatureFormView)))); + view.SetBinding(FieldFormElementView.FeatureFormProperty, static (FeatureFormView view) => view.FeatureForm, source: new RelativeBindingSource(RelativeBindingSourceMode.FindAncestor, typeof(FeatureFormView))); return view; }); DefaultGroupElementTemplate = new DataTemplate(() => diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Maui.cs index 7f0ee61d7..a225b0633 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Maui.cs @@ -96,25 +96,25 @@ private static object BuildDefaultTemplate() root.RowDefinitions.Add(new RowDefinition(GridLength.Star)); Label roottitle = new Label(); roottitle.Style = GetFeatureFormHeaderStyle(); - roottitle.SetBinding(Label.TextProperty, new Binding("FeatureForm.Title", source: RelativeBindingSource.TemplatedParent)); - roottitle.SetBinding(VisualElement.IsVisibleProperty, new Binding("FeatureForm.Title", source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance)); + roottitle.SetBinding(Label.TextProperty, static (FeatureForm form) => form.Title, source: RelativeBindingSource.TemplatedParent); + roottitle.SetBinding(VisualElement.IsVisibleProperty, static (FeatureForm form) => form.Title, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); root.Add(roottitle); ScrollView scrollView = new ScrollView() { HorizontalScrollBarVisibility = ScrollBarVisibility.Never, Margin = new Thickness(0, 5, 0, 0) }; #if WINDOWS scrollView.Padding = new Thickness(0, 0, 10, 0); #endif - scrollView.SetBinding(ScrollView.VerticalScrollBarVisibilityProperty, new Binding(nameof(VerticalScrollBarVisibility), source: RelativeBindingSource.TemplatedParent)); + scrollView.SetBinding(ScrollView.VerticalScrollBarVisibilityProperty, static (FeatureFormView view) => view.VerticalScrollBarVisibility, source: RelativeBindingSource.TemplatedParent); var scrollableContent = new VerticalStackLayout(); scrollView.Content = scrollableContent; Grid.SetRow(scrollView, 1); root.Add(scrollView); VerticalStackLayout itemsView = new VerticalStackLayout(); BindableLayout.SetItemTemplateSelector(itemsView, new FeatureFormElementTemplateSelector()); - itemsView.SetBinding(BindableLayout.ItemsSourceProperty, new Binding("FeatureForm.Elements", source: RelativeBindingSource.TemplatedParent)); + itemsView.SetBinding(BindableLayout.ItemsSourceProperty, static (FeatureForm form) => form.Elements, source: RelativeBindingSource.TemplatedParent); scrollableContent.Add(itemsView); AttachmentsFormElementView attachmentsView = new AttachmentsFormElementView(); - attachmentsView.SetBinding(AttachmentsFormElementView.ElementProperty, new Binding("FeatureForm.DefaultAttachmentsElement", source: RelativeBindingSource.TemplatedParent)); + attachmentsView.SetBinding(AttachmentsFormElementView.ElementProperty, static (FeatureForm form) => form.DefaultAttachmentsElement, source: RelativeBindingSource.TemplatedParent); scrollableContent.Add(attachmentsView); INameScope nameScope = new NameScope(); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.cs index 512ec8ca0..eb53285d1 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.cs @@ -91,7 +91,7 @@ private void InvalidateForm() var ctrl = GetTemplateChild(ItemsViewName) as IBindableLayout; if (ctrl != null && ctrl is BindableObject bo) { - bo.SetBinding(BindableLayout.ItemsSourceProperty, new Binding("FeatureForm.Elements", source: RelativeBindingSource.TemplatedParent)); // TODO: Should update binding instead + bo.SetBinding(BindableLayout.ItemsSourceProperty, static (FeatureForm form) => form.Elements, source: RelativeBindingSource.TemplatedParent); } #elif WPF var ctrl = GetTemplateChild(ItemsViewName) as ItemsControl; diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs index 6f3572d37..9d8aada47 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs @@ -101,23 +101,23 @@ private static object BuildDefaultBarcodeScannerFormInputTemplate() private static object BuildDefaultTemplate() { var root = new VerticalStackLayout(); - root.SetBinding(VerticalStackLayout.IsVisibleProperty, nameof(FormElement.IsVisible)); + root.SetBinding(VerticalStackLayout.IsVisibleProperty, static (FormElement element) => element.IsVisible); var label = new Label(); - label.SetBinding(Label.TextProperty, new Binding("Element.Label", source: RelativeBindingSource.TemplatedParent)); - label.SetBinding(View.IsVisibleProperty, new Binding("Text", source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter())); + label.SetBinding(Label.TextProperty, static (FormElement element) => element.Label, source: RelativeBindingSource.TemplatedParent); + label.SetBinding(View.IsVisibleProperty, static (Label lbl) => lbl.Text, source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter()); label.Style = FeatureFormView.GetFeatureFormTitleStyle(); root.Children.Add(label); label = new Label(); - label.SetBinding(Label.TextProperty, new Binding("Element.Description", source: RelativeBindingSource.TemplatedParent)); - label.SetBinding(Label.IsVisibleProperty, new Binding("Text", source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter())); + label.SetBinding(Label.TextProperty, static (FormElement element) => element.Description, source: RelativeBindingSource.TemplatedParent); + label.SetBinding(Label.IsVisibleProperty, static (Label lbl) => lbl.Text, source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter()); label.Style = FeatureFormView.GetFeatureFormCaptionStyle(); root.Children.Add(label); var content = new DataTemplatedContentPresenter(); - content.SetBinding(DataTemplatedContentPresenter.ContentDataProperty, new Binding(nameof(Element), source: RelativeBindingSource.TemplatedParent)); + content.SetBinding(DataTemplatedContentPresenter.ContentDataProperty, static (FormElement element) => element, source: RelativeBindingSource.TemplatedParent); root.Children.Add(content); var errorLabel = new Label() { Margin = new Thickness(0, 2), TextColor = Colors.Red }; root.Children.Add(errorLabel); - errorLabel.SetBinding(Label.IsVisibleProperty, new Binding("Text", source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter())); + errorLabel.SetBinding(Label.IsVisibleProperty, static (Label lbl) => lbl.Text, source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter()); INameScope nameScope = new NameScope(); NameScope.SetNameScope(root, nameScope); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Maui.cs index 133ed2da7..111462796 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Maui.cs @@ -45,14 +45,14 @@ private static object BuildDefaultTemplate() background.Content = root; Image image = new Image(); root.Children.Add(image); - root.SetBinding(VerticalStackLayout.IsVisibleProperty, nameof(FormElement.IsVisible)); + root.SetBinding(VerticalStackLayout.IsVisibleProperty, static (FormElement element) => element.IsVisible); Border nameBackground = new Border() { BackgroundColor = Colors.Transparent, Padding = new Thickness(2), VerticalOptions = LayoutOptions.End, StrokeThickness = 0 }; var nameLabel = new Label() { HorizontalOptions = LayoutOptions.Center, FontSize = 10, MaxLines = 1, LineBreakMode = LineBreakMode.TailTruncation }; nameBackground.Content = nameLabel; - nameLabel.SetBinding(Label.TextProperty, new Binding("Attachment.Name", source: RelativeBindingSource.TemplatedParent)); + nameLabel.SetBinding(Label.TextProperty, static (Attachment attachment) => attachment.Name, source: RelativeBindingSource.TemplatedParent); root.Children.Add(nameBackground); var sizeLabel = new Label() { VerticalOptions = LayoutOptions.Start, HorizontalOptions = LayoutOptions.Center, FontSize = 10, MaxLines = 1 }; - sizeLabel.SetBinding(Label.TextProperty, new Binding("Attachment.Size", source: RelativeBindingSource.TemplatedParent, converter: new FileSizeConverter())); + sizeLabel.SetBinding(Label.TextProperty, static (Attachment attachment) => attachment.Size, source: RelativeBindingSource.TemplatedParent, converter: new FileSizeConverter()); root.Children.Add(sizeLabel); var downloadIcon = new Label() { VerticalOptions = LayoutOptions.Start, HorizontalOptions = LayoutOptions.End, FontFamily = "calcite-ui-icons-24", Text = "\uE0CB", Margin = new Thickness(2) }; root.Children.Add(downloadIcon); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/GroupFormElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/GroupFormElementView.Maui.cs index b904a4f30..0436cab16 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/GroupFormElementView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/GroupFormElementView.Maui.cs @@ -57,22 +57,22 @@ public GroupFormElementView() private static object BuildDefaultTemplate() { Border root = new Border() { StrokeShape = new RoundRectangle() { CornerRadius = 2 } }; - root.SetBinding(Border.StrokeProperty, new Binding(nameof(BorderStroke), source: RelativeBindingSource.TemplatedParent)); - root.SetBinding(Border.StrokeThicknessProperty, new Binding(nameof(BorderStrokeThickness), source: RelativeBindingSource.TemplatedParent)); + root.SetBinding(Border.StrokeProperty, static (GroupFormElementView view) => view.BorderStroke, source: RelativeBindingSource.TemplatedParent); + root.SetBinding(Border.StrokeThicknessProperty, static (GroupFormElementView view) => view.BorderStrokeThickness, source: RelativeBindingSource.TemplatedParent); var layout = new VerticalStackLayout(); var clickAreaContent = new Grid() { VerticalOptions = new LayoutOptions(LayoutAlignment.Center, true) }; - clickAreaContent.SetBinding(Grid.BackgroundProperty, new Binding(nameof(HeaderBackground), source: RelativeBindingSource.TemplatedParent)); - clickAreaContent.SetBinding(Grid.PaddingProperty, new Binding(nameof(ContentPadding), source: RelativeBindingSource.TemplatedParent)); + clickAreaContent.SetBinding(Grid.BackgroundProperty, static (GroupFormElementView view) => view.HeaderBackground, source: RelativeBindingSource.TemplatedParent); + clickAreaContent.SetBinding(Grid.PaddingProperty, static (GroupFormElementView view) => view.ContentPadding, source: RelativeBindingSource.TemplatedParent); clickAreaContent.RowDefinitions.Add(new RowDefinition()); clickAreaContent.RowDefinitions.Add(new RowDefinition()); clickAreaContent.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Star)); clickAreaContent.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto)); var label = new Label() { Style = FeatureFormView.GetFeatureFormTitleStyle() }; - label.SetBinding(Label.TextProperty, new Binding("Element.Label", source: RelativeBindingSource.TemplatedParent)); + label.SetBinding(Label.TextProperty, static (GroupFormElement element) => element.Label, source: RelativeBindingSource.TemplatedParent); clickAreaContent.Children.Add(label); label = new Label() { Style = FeatureFormView.GetFeatureFormCaptionStyle() }; - label.SetBinding(Label.TextProperty, new Binding("Element.Description", source: RelativeBindingSource.TemplatedParent)); + label.SetBinding(Label.TextProperty, static (GroupFormElement element) => element.Description, source: RelativeBindingSource.TemplatedParent); Grid.SetRow(label, 1); clickAreaContent.Children.Add(label); @@ -82,22 +82,23 @@ private static object BuildDefaultTemplate() #else collapsedChevron.Text = "\uE076"; #endif - collapsedChevron.SetBinding(VisualElement.IsVisibleProperty, new Binding(nameof(IsExpanded), converter: Internal.InvertBoolConverter.Instance, source: RelativeBindingSource.TemplatedParent)); + collapsedChevron.SetBinding(VisualElement.IsVisibleProperty, static (GroupFormElementView view) => view.IsExpanded, converter: Internal.InvertBoolConverter.Instance, source: RelativeBindingSource.TemplatedParent); + Grid.SetRowSpan(collapsedChevron, 2); Grid.SetColumn(collapsedChevron, 1); clickAreaContent.Children.Add(collapsedChevron); Label expandedChevron = new Label() { Text = "\uE079", VerticalOptions = new LayoutOptions(LayoutAlignment.Center, true), FontFamily = "calcite-ui-icons-24" }; - expandedChevron.SetBinding(VisualElement.IsVisibleProperty, new Binding(nameof(IsExpanded), source: RelativeBindingSource.TemplatedParent)); + expandedChevron.SetBinding(VisualElement.IsVisibleProperty, static (GroupFormElementView view) => view.IsExpanded, source: RelativeBindingSource.TemplatedParent); Grid.SetRowSpan(expandedChevron, 2); Grid.SetColumn(expandedChevron, 1); clickAreaContent.Children.Add(expandedChevron); layout.Children.Add(clickAreaContent); VerticalStackLayout itemsView = new VerticalStackLayout(); - itemsView.SetBinding(VerticalStackLayout.MarginProperty, new Binding(nameof(ContentPadding), source: RelativeBindingSource.TemplatedParent)); + itemsView.SetBinding(VerticalStackLayout.MarginProperty, static (GroupFormElementView view) => view.ContentPadding, source: RelativeBindingSource.TemplatedParent); BindableLayout.SetItemTemplateSelector(itemsView, new FeatureFormElementTemplateSelector()); - itemsView.SetBinding(BindableLayout.ItemsSourceProperty, new Binding("Element.Elements", source: RelativeBindingSource.TemplatedParent)); + itemsView.SetBinding(BindableLayout.ItemsSourceProperty, static (GroupFormElement element) => element.Elements, source: RelativeBindingSource.TemplatedParent); layout.Children.Add(itemsView); root.Content = layout; INameScope nameScope = new NameScope(); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/RadioButtonsFormInputView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/RadioButtonsFormInputView.Maui.cs index b03af0bc2..88354b4d6 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/RadioButtonsFormInputView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/RadioButtonsFormInputView.Maui.cs @@ -48,7 +48,7 @@ private System.Collections.IEnumerable? ItemsSource foreach (var item in _itemsSource) { var button = new RadioButton(); - button.SetBinding(RadioButton.ContentProperty, "Name"); + button.SetBinding(RadioButton.ContentProperty, static (CodedValue item) => item.Name); button.BindingContext = item; button.IsChecked = item == SelectedItem; button.IsEnabled = Element?.IsEditable == true; diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/SwitchFormInputView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/SwitchFormInputView.Maui.cs index 0b9792e00..8fbe3c16d 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/SwitchFormInputView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/SwitchFormInputView.Maui.cs @@ -27,7 +27,7 @@ static SwitchFormInputView() private static object BuildDefaultTemplate() { Switch toggleSwitch = new Switch(); - toggleSwitch.SetBinding(Switch.IsToggledProperty, new Binding(nameof(IsChecked), source: RelativeBindingSource.TemplatedParent)); + toggleSwitch.SetBinding(Switch.IsToggledProperty, static (SwitchFormInputView view) => view.IsChecked, source: RelativeBindingSource.TemplatedParent); INameScope nameScope = new NameScope(); nameScope.RegisterName(SwitchViewName, toggleSwitch); #if WINDOWS @@ -40,13 +40,13 @@ private static object BuildDefaultTemplate() root.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Auto) }); Grid.SetColumn(toggleSwitch, 1); Label onText = new Label() { VerticalOptions = new LayoutOptions(LayoutAlignment.Center, false) }; - onText.SetBinding(Label.TextProperty, new Binding("Element.Input.OnValue.Name", source: RelativeBindingSource.TemplatedParent)); - onText.SetBinding(Label.IsVisibleProperty, new Binding(nameof(IsChecked), source: RelativeBindingSource.TemplatedParent)); + onText.SetBinding(Label.TextProperty, static (SwitchFormInput input) => input.OnValue.Name, source: RelativeBindingSource.TemplatedParent); + onText.SetBinding(Label.IsVisibleProperty, static (SwitchFormInputView view) => view.IsChecked, source: RelativeBindingSource.TemplatedParent); root.Children.Add(onText); Label offText = new Label() { VerticalOptions = new LayoutOptions(LayoutAlignment.Center, false) }; - offText.SetBinding(Label.TextProperty, new Binding("Element.Input.OffValue.Name", source: RelativeBindingSource.TemplatedParent)); - offText.SetBinding(Label.IsVisibleProperty, new Binding(nameof(IsChecked), source: RelativeBindingSource.TemplatedParent, converter: Internal.InvertBoolConverter.Instance)); + offText.SetBinding(Label.TextProperty, static (SwitchFormInput input) => input.OffValue.Name, source: RelativeBindingSource.TemplatedParent); + offText.SetBinding(Label.IsVisibleProperty, static (SwitchFormInputView view) => view.IsChecked, source: RelativeBindingSource.TemplatedParent, converter: Internal.InvertBoolConverter.Instance); root.Children.Add(offText); root.Children.Add(toggleSwitch); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Maui.cs index f55486d77..c45e42694 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Maui.cs @@ -43,7 +43,7 @@ private static object BuildDefaultTemplate() horizontalStackLayout.Margin = new Thickness(0, -17, 0, 0); horizontalStackLayout.SetBinding(View.IsVisibleProperty, new Binding(nameof(TextFormInputView.ShowCharacterCount), source: RelativeBindingSource.TemplatedParent)); Label characterCountLabel = new Label() { Style = FeatureFormView.GetFeatureFormCaptionStyle() }; - characterCountLabel.SetBinding(Label.TextProperty, new Binding("Element.Value", source: RelativeBindingSource.TemplatedParent, converter: StringLengthConverter.Instance)); + characterCountLabel.SetBinding(Label.TextProperty, static (FieldFormElement element) => element.Value, source: RelativeBindingSource.TemplatedParent, converter: StringLengthConverter.Instance); horizontalStackLayout.Children.Add(characterCountLabel); horizontalStackLayout.Children.Add(new Label() { Text = "/", Style = FeatureFormView.GetFeatureFormCaptionStyle() }); Label maxCountLabel = new Label() { Style = FeatureFormView.GetFeatureFormCaptionStyle() }; @@ -58,13 +58,13 @@ private static object BuildDefaultTemplate() Entry textInput = new Entry(); Grid.SetColumnSpan(textInput, 2); root.Add(textInput); - textInput.SetBinding(Entry.IsEnabledProperty, "Element.IsEditable"); + textInput.SetBinding(Entry.IsEnabledProperty, static (FieldFormElement element) => element.IsEditable); Editor textArea = new Editor() { IsVisible = false, HeightRequest = 100, AutoSize = EditorAutoSizeOption.Disabled }; Grid.SetColumnSpan(textArea, 2); - textArea.SetBinding(Editor.IsEnabledProperty, "Element.IsEditable"); + textArea.SetBinding(Editor.IsEnabledProperty, static (FieldFormElement element) => element.IsEditable); root.Add(textArea); Label readonlyText = new Label() { IsVisible = false, LineBreakMode = LineBreakMode.WordWrap }; - readonlyText.SetBinding(Label.TextProperty, new Binding("Element.Value",source:RelativeBindingSource.TemplatedParent)); + readonlyText.SetBinding(Label.TextProperty, static (FieldFormElement element) => element.Value, source: RelativeBindingSource.TemplatedParent); Grid.SetColumnSpan(readonlyText, 2); root.Add(readonlyText); Internal.CalciteImageButton barcodeButton = new Internal.CalciteImageButton("\uE22F") { IsVisible = false, BorderWidth = 0 }; diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/AttachmentsPopupElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/AttachmentsPopupElementView.Maui.cs index a99208694..4bd499496 100644 --- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/AttachmentsPopupElementView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/AttachmentsPopupElementView.Maui.cs @@ -52,18 +52,18 @@ private static object BuildDefaultTemplate() { StackLayout root = new StackLayout(); Label roottitle = new Label(); - roottitle.SetBinding(Label.TextProperty, new Binding("Element.Title", source: RelativeBindingSource.TemplatedParent)); - roottitle.SetBinding(VisualElement.IsVisibleProperty, new Binding("Element.Title", source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance)); + roottitle.SetBinding(Label.TextProperty, static (AttachmentsPopupElement element) => element.Title, source: RelativeBindingSource.TemplatedParent); + roottitle.SetBinding(VisualElement.IsVisibleProperty, static (AttachmentsPopupElement element) => element.Title, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); roottitle.Style = PopupViewer.GetPopupViewerTitleStyle(); root.Add(roottitle); Label rootcaption = new Label(); - rootcaption.SetBinding(Label.TextProperty, new Binding("Element.Description", source: RelativeBindingSource.TemplatedParent)); - rootcaption.SetBinding(VisualElement.IsVisibleProperty, new Binding("Element.Description", source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance)); + rootcaption.SetBinding(Label.TextProperty, static (AttachmentsPopupElement element) => element.Description, source: RelativeBindingSource.TemplatedParent); + rootcaption.SetBinding(VisualElement.IsVisibleProperty, static (AttachmentsPopupElement element) => element.Description, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); rootcaption.Style = PopupViewer.GetPopupViewerCaptionStyle(); root.Add(rootcaption); root.Add(new Border() { StrokeThickness = 0, HeightRequest = 1, BackgroundColor = Colors.Gray, Margin = new Thickness(0,5) }); CollectionView cv = new CollectionView() { SelectionMode = SelectionMode.None }; - cv.SetBinding(CollectionView.ItemsSourceProperty, new Binding("Element.Attachments", source: RelativeBindingSource.TemplatedParent)); + cv.SetBinding(CollectionView.ItemsSourceProperty, static (AttachmentsPopupElement element) => element.Attachments, source: RelativeBindingSource.TemplatedParent); cv.ItemTemplate = new DataTemplate(BuildDefaultItemTemplate); root.Add(cv); INameScope nameScope = new NameScope(); @@ -93,29 +93,29 @@ private static object BuildDefaultItemTemplate() layout.SetBinding(Grid.BindingContextProperty, Binding.SelfPath, converter: AttachmentViewModelConverter.Instance); Image image = new Image() { WidthRequest = 24, HeightRequest = 24, HorizontalOptions = LayoutOptions.Start, Aspect = Aspect.Fill }; layout.Add(image); - image.SetBinding(Image.SourceProperty, new Binding(nameof(AttachmentViewModel.Thumbnail))); + image.SetBinding(Image.SourceProperty, static (AttachmentViewModel vm) => vm.Thumbnail); Grid.SetRowSpan(image, 2); Label name = new Label() { VerticalOptions = LayoutOptions.End }; - name.SetBinding(Label.TextProperty, nameof(AttachmentViewModel.Name)); + name.SetBinding(Label.TextProperty, static (AttachmentViewModel vm) => vm.Name); Grid.SetColumn(name, 1); layout.Add(name); Label size = new Label() { VerticalOptions = LayoutOptions.Start, TextColor = Colors.Gray, FontSize = 12 }; - size.SetBinding(Label.TextProperty, nameof(AttachmentViewModel.Size)); + size.SetBinding(Label.TextProperty, static (AttachmentViewModel vm) => vm.Size); Grid.SetColumn(size, 1); Grid.SetRow(size, 1); layout.Add(size); Image image2 = new Image() { WidthRequest = 18, HeightRequest = 18 }; - image2.SetBinding(Image.IsVisibleProperty, new Binding(nameof(AttachmentViewModel.IsDownloadButtonVisible))); + image2.SetBinding(Image.IsVisibleProperty, static (AttachmentViewModel vm) => vm.IsDownloadButtonVisible); image2.Source = new FontImageSource() { Glyph = ((char)0xE16C).ToString(), Color = Colors.Gray, FontFamily = "calcite-ui-icons-24", Size = 18 }; Grid.SetColumn(image2, 2); Grid.SetRowSpan(image2, 2); layout.Add(image2); ActivityIndicator indicator = new ActivityIndicator() { WidthRequest = 24, HeightRequest = 24, IsRunning = true }; - indicator.SetBinding(ActivityIndicator.IsRunningProperty, new Binding(nameof(AttachmentViewModel.IsDownloading))); + indicator.SetBinding(ActivityIndicator.IsRunningProperty, static (AttachmentViewModel vm) => vm.IsDownloading); Grid.SetColumn(indicator, 2); Grid.SetRowSpan(indicator, 2); layout.Add(indicator); @@ -152,7 +152,7 @@ private static void Attachment_Tapped(object? sender, EventArgs e) return parent as PopupViewer; } - private class AttachmentViewModel : System.ComponentModel.INotifyPropertyChanged + internal class AttachmentViewModel : System.ComponentModel.INotifyPropertyChanged { public AttachmentViewModel(PopupAttachment attachment) { diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/CarouselView.Windows.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/CarouselView.Windows.cs index 314192d53..ec0d64b87 100644 --- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/CarouselView.Windows.cs +++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/CarouselView.Windows.cs @@ -102,17 +102,8 @@ private static void LinkToIndicatorView(CarouselView2 carouselView, IndicatorVie if (indicatorView == null) return; - indicatorView.SetBinding(IndicatorView.PositionProperty, new Binding - { - Path = nameof(CarouselView2.Position), - Source = carouselView - }); - - indicatorView.SetBinding(IndicatorView.ItemsSourceProperty, new Binding - { - Path = nameof(CarouselView2.ItemsSource), - Source = carouselView - }); + indicatorView.SetBinding(IndicatorView.PositionProperty, static (CarouselView2 cv) => cv.Position, source: carouselView); + indicatorView.SetBinding(IndicatorView.ItemsSourceProperty, static (CarouselView2 cv) => cv.ItemsSource, source: carouselView); } private void UpdateBindingContext() diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/MediaPopupElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/MediaPopupElementView.Maui.cs index a1364826e..16f960d0f 100644 --- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/MediaPopupElementView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/MediaPopupElementView.Maui.cs @@ -28,7 +28,7 @@ namespace Esri.ArcGISRuntime.Toolkit.Maui.Primitives public partial class MediaPopupElementView : TemplatedView { private static readonly ControlTemplate DefaultControlTemplate; - + /// /// Name of the carousel control in the template. /// @@ -46,21 +46,21 @@ private static object BuildDefaultTemplate() { StackLayout root = new StackLayout(); Label roottitle = new Label(); - roottitle.SetBinding(Label.TextProperty, new Binding("Element.Title", source: RelativeBindingSource.TemplatedParent)); - roottitle.SetBinding(VisualElement.IsVisibleProperty, new Binding("Element.Title", source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance)); + roottitle.SetBinding(Label.TextProperty, static (MediaPopupElement element) => element.Title, source: RelativeBindingSource.TemplatedParent); + roottitle.SetBinding(VisualElement.IsVisibleProperty, static (MediaPopupElement element) => element.Title, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); roottitle.Style = PopupViewer.GetPopupViewerTitleStyle(); root.Add(roottitle); Label rootcaption = new Label(); - rootcaption.SetBinding(Label.TextProperty, new Binding("Element.Description", source: RelativeBindingSource.TemplatedParent)); - rootcaption.SetBinding(VisualElement.IsVisibleProperty, new Binding("Element.Description", source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance)); + rootcaption.SetBinding(Label.TextProperty, static (MediaPopupElement element) => element.Description, source: RelativeBindingSource.TemplatedParent); + rootcaption.SetBinding(VisualElement.IsVisibleProperty, static (MediaPopupElement element) => element.Description, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); rootcaption.Style = PopupViewer.GetPopupViewerCaptionStyle(); root.Add(rootcaption); #if WINDOWS CarouselView2 cv = new CarouselView2(); - cv.SetBinding(CarouselView2.ItemsSourceProperty, new Binding("Element.Media", source: RelativeBindingSource.TemplatedParent)); + cv.SetBinding(CarouselView2.ItemsSourceProperty, static (MediaPopupElement element) => element.Media, source: RelativeBindingSource.TemplatedParent); #else CarouselView cv = new CarouselView(); - cv.SetBinding(CarouselView.ItemsSourceProperty, new Binding("Element.Media", source: RelativeBindingSource.TemplatedParent)); + cv.SetBinding(CarouselView.ItemsSourceProperty, static (MediaPopupElement element) => element.Media, source: RelativeBindingSource.TemplatedParent); #endif #if __IOS__ // Workaround for https://github.com/dotnet/maui/issues/12911 cv.HeightRequest = 300; @@ -88,17 +88,17 @@ private static object BuildDefaultItemTemplate() layout.RowDefinitions.Add(new RowDefinition(GridLength.Star)); layout.RowDefinitions.Add(new RowDefinition(GridLength.Auto)); layout.RowDefinitions.Add(new RowDefinition(GridLength.Auto)); - pm.SetBinding(PopupMediaView.PopupMediaProperty, "."); + pm.SetBinding(PopupMediaView.PopupMediaProperty, Binding.SelfPath); layout.Add(pm); Label title = new Label(); - title.SetBinding(Label.TextProperty, "Title"); - title.SetBinding(VisualElement.IsVisibleProperty, new Binding("Title", converter: Internal.EmptyToFalseConverter.Instance)); + title.SetBinding(Label.TextProperty, static (PopupMedia media) => media.Title); + title.SetBinding(VisualElement.IsVisibleProperty, static (PopupMedia media) => media.Title, converter: Internal.EmptyToFalseConverter.Instance); title.Style = PopupViewer.GetPopupViewerTitleStyle(); layout.Add(title); Grid.SetRow(title, 1); Label caption = new Label(); - caption.SetBinding(Label.TextProperty, "Caption"); - caption.SetBinding(VisualElement.IsVisibleProperty, new Binding("Caption", converter: Internal.EmptyToFalseConverter.Instance)); + caption.SetBinding(Label.TextProperty, static (PopupMedia media) => media.Caption); + caption.SetBinding(VisualElement.IsVisibleProperty, static (PopupMedia media) => media.Caption, converter: Internal.EmptyToFalseConverter.Instance); caption.Style = PopupViewer.GetPopupViewerCaptionStyle(); Grid.SetRow(caption, 2); layout.Add(caption); diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Maui.cs index f8b3a0005..32fa311af 100644 --- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Maui.cs @@ -69,14 +69,14 @@ private static object BuildDefaultTemplate() root.RowDefinitions.Add(new RowDefinition(GridLength.Star)); Label roottitle = new Label(); roottitle.Style = GetPopupViewerHeaderStyle(); - roottitle.SetBinding(Label.TextProperty, new Binding("Popup.Title", source: RelativeBindingSource.TemplatedParent)); - roottitle.SetBinding(VisualElement.IsVisibleProperty, new Binding("Popup.Title", source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance)); + roottitle.SetBinding(Label.TextProperty, static (Popup popup) => popup.Title, source: RelativeBindingSource.TemplatedParent); + roottitle.SetBinding(VisualElement.IsVisibleProperty, static (Popup popup) => popup.Title, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); root.Add(roottitle); ScrollView scrollView = new ScrollView() { HorizontalScrollBarVisibility = ScrollBarVisibility.Never }; #if WINDOWS scrollView.Padding = new Thickness(0, 0, 10, 0); #endif - scrollView.SetBinding(ScrollView.VerticalScrollBarVisibilityProperty, new Binding(nameof(VerticalScrollBarVisibility), source: RelativeBindingSource.TemplatedParent)); + scrollView.SetBinding(ScrollView.VerticalScrollBarVisibilityProperty, static (PopupViewer viewer) => viewer.VerticalScrollBarVisibility, source: RelativeBindingSource.TemplatedParent); Grid.SetRow(scrollView, 1); root.Add(scrollView); VerticalStackLayout itemsView = new VerticalStackLayout() @@ -84,7 +84,7 @@ private static object BuildDefaultTemplate() Margin = new Thickness(0, 10), }; BindableLayout.SetItemTemplateSelector(itemsView, new PopupElementTemplateSelector()); - itemsView.SetBinding(BindableLayout.ItemsSourceProperty, new Binding("Popup.EvaluatedElements", source: RelativeBindingSource.TemplatedParent)); + itemsView.SetBinding(BindableLayout.ItemsSourceProperty, static (Popup popup) => popup.EvaluatedElements, source: RelativeBindingSource.TemplatedParent); scrollView.Content = itemsView; INameScope nameScope = new NameScope(); NameScope.SetNameScope(root, nameScope); diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.cs index aed84d51d..8631e7133 100644 --- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.cs +++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.cs @@ -132,7 +132,7 @@ private void InvalidatePopup() var ctrl = GetTemplateChild(ItemsViewName) as IBindableLayout; if (ctrl != null && ctrl is BindableObject bo) { - bo.SetBinding(BindableLayout.ItemsSourceProperty, new Binding("Popup.EvaluatedElements", source: RelativeBindingSource.TemplatedParent)); // TODO: Should update binding instead + bo.SetBinding(BindableLayout.ItemsSourceProperty, static (Popup popup) => popup.EvaluatedElements, source: RelativeBindingSource.TemplatedParent); } #else var ctrl = GetTemplateChild(ItemsViewName) as ItemsControl; From b2ca881991ad9aba044a08323d5bc3c383871425 Mon Sep 17 00:00:00 2001 From: Prathamesh Narkhede Date: Mon, 24 Mar 2025 17:18:59 -0700 Subject: [PATCH 2/4] Correcting data bindings and tested the code. Removed CodeAnalysis Dynamic Dependencies --- src/Toolkit/Toolkit.Maui/Legend/Legend.cs | 16 +++++---------- .../Toolkit.Maui/OverviewMap/OverviewMap.cs | 9 +++------ .../SearchView/SearchView.Appearance.cs | 2 +- .../AttachmentsFormElementView.Maui.cs | 20 +++++++------------ .../FeatureForm/ComboboxFormInputView.Maui.cs | 6 ++---- .../FeatureForm/FeatureFormView.Maui.cs | 12 ++++------- .../Controls/FeatureForm/FeatureFormView.cs | 2 +- .../FeatureForm/FieldFormElementView.Maui.cs | 11 ++++------ .../FeatureForm/FormAttachmentView.Maui.cs | 7 ++----- .../FeatureForm/GroupFormElementView.Maui.cs | 10 +++------- .../FeatureForm/SwitchFormInputView.Maui.cs | 9 ++------- .../PopupViewer/MediaPopupElementView.Maui.cs | 18 ++++++----------- .../Controls/PopupViewer/PopupViewer.Maui.cs | 9 +++------ .../UI/Controls/PopupViewer/PopupViewer.cs | 2 +- 14 files changed, 44 insertions(+), 89 deletions(-) diff --git a/src/Toolkit/Toolkit.Maui/Legend/Legend.cs b/src/Toolkit/Toolkit.Maui/Legend/Legend.cs index 6db7a7072..ad678f78d 100644 --- a/src/Toolkit/Toolkit.Maui/Legend/Legend.cs +++ b/src/Toolkit/Toolkit.Maui/Legend/Legend.cs @@ -15,7 +15,6 @@ // ******************************************************************************/ using Esri.ArcGISRuntime.Mapping; -using System.Diagnostics.CodeAnalysis; namespace Esri.ArcGISRuntime.Toolkit.Maui; @@ -29,25 +28,20 @@ public class Legend : TemplatedView private static DataTemplate s_DefaultSublayerItemTemplate; private static DataTemplate s_DefaultLegendInfoItemTemplate; private static ControlTemplate s_DefaultControlTemplate; - - - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.Layer.Name), "Esri.ArcGISRuntime.Mapping.Layer", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.ILayerContent.Name), "Esri.ArcGISRuntime.Mapping.ILayerContent", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.LegendInfo.Name), "Esri.ArcGISRuntime.Mapping.LegendInfo", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.LegendInfo.Symbol), "Esri.ArcGISRuntime.Mapping.LegendInfo", "Esri.ArcGISRuntime")] + static Legend() { s_DefaultLayerItemTemplate = new DataTemplate(() => { var nameLabel = new Label { FontSize = 18, VerticalOptions = LayoutOptions.Center }; - nameLabel.SetBinding(Label.TextProperty, static (Layer layer) => layer.Name); + nameLabel.SetBinding(Label.TextProperty, static (LegendEntry entry) => ((Layer)entry.Content).Name); return nameLabel; }); s_DefaultSublayerItemTemplate = new DataTemplate(() => { var nameLabel = new Label { FontSize = 14, VerticalOptions = LayoutOptions.Center }; - nameLabel.SetBinding(Label.TextProperty, static (ILayerContent content) => content.Name); + nameLabel.SetBinding(Label.TextProperty, static (LegendEntry entry) => ((ILayerContent)entry.Content).Name); return nameLabel; }); @@ -55,10 +49,10 @@ static Legend() { StackLayout sl = new StackLayout() { Orientation = StackOrientation.Horizontal }; var symbol = new SymbolDisplay { WidthRequest = 40, HeightRequest = 40, VerticalOptions = LayoutOptions.Center, Margin = new Thickness(0, 0, 5, 0) }; - symbol.SetBinding(SymbolDisplay.SymbolProperty, static (LegendInfo info) => info.Symbol); + symbol.SetBinding(SymbolDisplay.SymbolProperty, static (LegendEntry entry) => ((LegendInfo)entry.Content).Symbol); sl.Children.Add(symbol); var nameLabel = new Label { FontSize = 12, VerticalOptions = LayoutOptions.Center }; - nameLabel.SetBinding(Label.TextProperty, static (LegendInfo info) => info.Name); + nameLabel.SetBinding(Label.TextProperty, static (LegendEntry entry) => ((LegendInfo)entry.Content).Name); sl.Children.Add(nameLabel); return sl; }); diff --git a/src/Toolkit/Toolkit.Maui/OverviewMap/OverviewMap.cs b/src/Toolkit/Toolkit.Maui/OverviewMap/OverviewMap.cs index b2650eadc..0bb7980e6 100644 --- a/src/Toolkit/Toolkit.Maui/OverviewMap/OverviewMap.cs +++ b/src/Toolkit/Toolkit.Maui/OverviewMap/OverviewMap.cs @@ -17,7 +17,6 @@ using Esri.ArcGISRuntime.Mapping; using Esri.ArcGISRuntime.Symbology; using Microsoft.Maui.Controls.Internals; -using System.Diagnostics.CodeAnalysis; using Map = Esri.ArcGISRuntime.Mapping.Map; namespace Esri.ArcGISRuntime.Toolkit.Maui; @@ -32,8 +31,6 @@ public class OverviewMap : TemplatedView private MapView? _overviewMapView; - - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.GeoModel.LoadStatus), "Esri.ArcGISRuntime.Mapping.GeoModel", "Esri.ArcGISRuntime")] static OverviewMap() { DefaultControlTemplate = new ControlTemplate(() => @@ -50,15 +47,15 @@ static OverviewMap() IsAttributionTextVisible = false }; ActivityIndicator activity = new ActivityIndicator(); - activity.SetBinding(ActivityIndicator.IsRunningProperty, static (Map map) => map.LoadStatus, converter: converter, converterParameter: "Loading", source: mapView); + activity.SetBinding(ActivityIndicator.IsRunningProperty, static (MapView mapView) => mapView.Map?.LoadStatus, converter: converter, converterParameter: "Loading", source: mapView); root.Add(activity); Label label = new Label() { TextColor = Colors.Black, Text = "Map failed to load. Did you forget an API key?" }; - label.SetBinding(VisualElement.IsVisibleProperty, static (Map map) => map.LoadStatus, converter: converter, converterParameter: "FailedToLoad", source: mapView); + label.SetBinding(VisualElement.IsVisibleProperty, static (MapView mapView) => mapView.Map?.LoadStatus, converter: converter, converterParameter: "FailedToLoad", source: mapView); root.Add(label); - mapView.SetBinding(VisualElement.IsVisibleProperty, static (Map map) => map.LoadStatus, converter: converter, converterParameter: "Loaded", source: mapView); + mapView.SetBinding(VisualElement.IsVisibleProperty, static (MapView mapView) => mapView.Map?.LoadStatus, converter: converter, converterParameter: "Loaded", source: mapView); root.Add(mapView); INameScope nameScope = new NameScope(); NameScope.SetNameScope(rootFrame, nameScope); diff --git a/src/Toolkit/Toolkit.Maui/SearchView/SearchView.Appearance.cs b/src/Toolkit/Toolkit.Maui/SearchView/SearchView.Appearance.cs index b2ba6bc80..3bc9d8057 100644 --- a/src/Toolkit/Toolkit.Maui/SearchView/SearchView.Appearance.cs +++ b/src/Toolkit/Toolkit.Maui/SearchView/SearchView.Appearance.cs @@ -56,7 +56,7 @@ static SearchView() containingGrid.SetAppThemeColor(Grid.BackgroundColorProperty, Color.FromArgb("#4e4e4e"), Color.FromArgb("#151515")); Label textLabel = new Label(); - textLabel.SetBinding(Label.TextProperty, static (ISearchSource key) => key.DisplayName); + textLabel.SetBinding(Label.TextProperty, static (IGrouping group) => group.Key.DisplayName); textLabel.Margin = new Thickness(4); textLabel.TextColor = Colors.White; textLabel.FontSize = 14; diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Maui.cs index 75a158554..31e5d298d 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Maui.cs @@ -21,7 +21,6 @@ using Esri.ArcGISRuntime.Mapping.FeatureForms; using Esri.ArcGISRuntime.Toolkit.Internal; using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using System.Diagnostics; using Microsoft.Maui.Handlers; using Microsoft.Maui.ApplicationModel; @@ -51,11 +50,6 @@ static AttachmentsFormElementView() return parent as T; } - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.AttachmentsFormElement.Attachments), "Esri.ArcGISRuntime.Mapping.FeatureForms.AttachmentsFormElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.AttachmentsFormElement.IsEditable), "Esri.ArcGISRuntime.Mapping.FeatureForms.AttachmentsFormElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement.IsVisible), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement.Label), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement.Description), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement", "Esri.ArcGISRuntime")] private static object BuildDefaultTemplate() { var root = new VerticalStackLayout(); @@ -68,13 +62,13 @@ private static object BuildDefaultTemplate() header.RowDefinitions.Add(new RowDefinition(GridLength.Auto)); var label = new Label(); - label.SetBinding(Label.TextProperty, static (FormElement element) => element.Label, source: RelativeBindingSource.TemplatedParent); - label.SetBinding(View.IsVisibleProperty, static (FormElement element) => element.Label, source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter()); + label.SetBinding(Label.TextProperty, static (AttachmentsFormElementView view) => view.Element?.Label, source: RelativeBindingSource.TemplatedParent); + label.SetBinding(View.IsVisibleProperty, static (Label label) => label.Text, source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter()); label.Style = FeatureFormView.GetFeatureFormTitleStyle(); header.Children.Add(label); label = new Label(); - label.SetBinding(Label.TextProperty, static (FormElement element) => element.Description, source: RelativeBindingSource.TemplatedParent); - label.SetBinding(Label.IsVisibleProperty, static (FormElement element) => element.Description, source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter()); + label.SetBinding(Label.TextProperty, static (AttachmentsFormElementView view) => view.Element?.Description, source: RelativeBindingSource.TemplatedParent); + label.SetBinding(Label.IsVisibleProperty, static (Label label) => label.Text, source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter()); label.Style = FeatureFormView.GetFeatureFormCaptionStyle(); Grid.SetRow(label, 1); header.Children.Add(label); @@ -95,7 +89,7 @@ private static object BuildDefaultTemplate() Grid.SetColumn(addButton, 1); Grid.SetRowSpan(addButton, 2); - addButton.SetBinding(VisualElement.IsVisibleProperty, static (AttachmentsFormElement element) => element.IsEditable, source: RelativeBindingSource.TemplatedParent); + addButton.SetBinding(VisualElement.IsVisibleProperty, static (AttachmentsFormElementView view) => view.Element?.IsEditable, source: RelativeBindingSource.TemplatedParent); header.Children.Add(addButton); root.Children.Add(header); @@ -109,7 +103,7 @@ private static object BuildDefaultTemplate() { var view = new FormAttachmentView(); view.SetBinding(FormAttachmentView.AttachmentProperty, static (FormAttachmentView view) => view.Attachment); - view.SetBinding(FormAttachmentView.ElementProperty, static (FormAttachmentView view) => view.Element, source: RelativeBindingSource.TemplatedParent); + view.SetBinding(FormAttachmentView.ElementProperty, static (AttachmentsFormElementView view) => view.Element, source: RelativeBindingSource.TemplatedParent); view.SetAppThemeColor(FormAttachmentView.IconColorProperty, Colors.Black, Colors.White); view.SetBinding(ToolTipProperties.TextProperty, static (FormAttachmentView view) => view.Attachment?.Name); return view; @@ -121,7 +115,7 @@ private static object BuildDefaultTemplate() MinimumHeightRequest = 75, #endif }; - itemsView.SetBinding(CollectionView.ItemsSourceProperty, static (FormAttachmentView view) => view.Element?.Attachments, source: RelativeBindingSource.TemplatedParent); + itemsView.SetBinding(CollectionView.ItemsSourceProperty, static (AttachmentsFormElementView view) => view.Element?.Attachments, source: RelativeBindingSource.TemplatedParent); root.Children.Add(itemsView); INameScope nameScope = new NameScope(); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/ComboboxFormInputView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/ComboboxFormInputView.Maui.cs index d87e2410e..e0e9a15fd 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/ComboboxFormInputView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/ComboboxFormInputView.Maui.cs @@ -4,7 +4,6 @@ using Esri.ArcGISRuntime.Mapping.FeatureForms; using Esri.ArcGISRuntime.Toolkit.Internal; using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; namespace Esri.ArcGISRuntime.Toolkit.Maui.Primitives { @@ -19,12 +18,11 @@ static ComboBoxFormInputView() DefaultControlTemplate = new ControlTemplate(BuildDefaultTemplate); } - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FieldFormElement.IsEditable), "Esri.ArcGISRuntime.Mapping.FeatureForms.FieldFormElement", "Esri.ArcGISRuntime")] private static object BuildDefaultTemplate() { Picker view = new Picker(); - view.SetBinding(Picker.IsEnabledProperty, static (FieldFormElement element) => element.IsEditable); - view.ItemDisplayBinding = Binding.Create(static (CodedValue codedValue) => codedValue.Name); + view.SetBinding(Picker.IsEnabledProperty, static (ComboBoxFormInputView view) => view.Element?.IsEditable); + view.ItemDisplayBinding = new Binding(nameof(CodedValue.Name)); INameScope nameScope = new NameScope(); NameScope.SetNameScope(view, nameScope); nameScope.RegisterName("Picker", view); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Maui.cs index a225b0633..87a001bf5 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Maui.cs @@ -18,7 +18,6 @@ using Microsoft.Maui.Controls.Internals; using Esri.ArcGISRuntime.Mapping.FeatureForms; using Esri.ArcGISRuntime.Toolkit.Maui.Primitives; -using System.Diagnostics.CodeAnalysis; namespace Esri.ArcGISRuntime.Toolkit.Maui { @@ -86,9 +85,6 @@ static FeatureFormView() DefaultFeatureFormCaptionStyle.Setters.Add(new Setter() { Property = Label.LineBreakModeProperty, Value = LineBreakMode.WordWrap }); } - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FeatureForm.Title), "Esri.ArcGISRuntime.Mapping.FeatureForms.FeatureForm", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FeatureForm.Elements), "Esri.ArcGISRuntime.Mapping.FeatureForms.FeatureForm", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FeatureForm.DefaultAttachmentsElement), "Esri.ArcGISRuntime.Mapping.FeatureForms.FeatureForm", "Esri.ArcGISRuntime")] private static object BuildDefaultTemplate() { Grid root = new Grid(); @@ -96,8 +92,8 @@ private static object BuildDefaultTemplate() root.RowDefinitions.Add(new RowDefinition(GridLength.Star)); Label roottitle = new Label(); roottitle.Style = GetFeatureFormHeaderStyle(); - roottitle.SetBinding(Label.TextProperty, static (FeatureForm form) => form.Title, source: RelativeBindingSource.TemplatedParent); - roottitle.SetBinding(VisualElement.IsVisibleProperty, static (FeatureForm form) => form.Title, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); + roottitle.SetBinding(Label.TextProperty, static (FeatureFormView view) => view.FeatureForm?.Title, source: RelativeBindingSource.TemplatedParent); + roottitle.SetBinding(VisualElement.IsVisibleProperty, static (FeatureFormView view) => view.FeatureForm?.Title, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); root.Add(roottitle); ScrollView scrollView = new ScrollView() { HorizontalScrollBarVisibility = ScrollBarVisibility.Never, Margin = new Thickness(0, 5, 0, 0) }; #if WINDOWS @@ -110,11 +106,11 @@ private static object BuildDefaultTemplate() root.Add(scrollView); VerticalStackLayout itemsView = new VerticalStackLayout(); BindableLayout.SetItemTemplateSelector(itemsView, new FeatureFormElementTemplateSelector()); - itemsView.SetBinding(BindableLayout.ItemsSourceProperty, static (FeatureForm form) => form.Elements, source: RelativeBindingSource.TemplatedParent); + itemsView.SetBinding(BindableLayout.ItemsSourceProperty, static (FeatureFormView view) => view.FeatureForm?.Elements, source: RelativeBindingSource.TemplatedParent); scrollableContent.Add(itemsView); AttachmentsFormElementView attachmentsView = new AttachmentsFormElementView(); - attachmentsView.SetBinding(AttachmentsFormElementView.ElementProperty, static (FeatureForm form) => form.DefaultAttachmentsElement, source: RelativeBindingSource.TemplatedParent); + attachmentsView.SetBinding(AttachmentsFormElementView.ElementProperty, static (FeatureFormView view) => view.FeatureForm?.DefaultAttachmentsElement, source: RelativeBindingSource.TemplatedParent); scrollableContent.Add(attachmentsView); INameScope nameScope = new NameScope(); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.cs index eb53285d1..37b63fb66 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.cs @@ -91,7 +91,7 @@ private void InvalidateForm() var ctrl = GetTemplateChild(ItemsViewName) as IBindableLayout; if (ctrl != null && ctrl is BindableObject bo) { - bo.SetBinding(BindableLayout.ItemsSourceProperty, static (FeatureForm form) => form.Elements, source: RelativeBindingSource.TemplatedParent); + bo.SetBinding(BindableLayout.ItemsSourceProperty, static (FeatureFormView view) => view.FeatureForm?.Elements, source: RelativeBindingSource.TemplatedParent); } #elif WPF var ctrl = GetTemplateChild(ItemsViewName) as ItemsControl; diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs index 9d8aada47..16e792613 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs @@ -17,7 +17,6 @@ #if MAUI using Microsoft.Maui.Controls.Internals; using Esri.ArcGISRuntime.Mapping.FeatureForms; -using System.Diagnostics.CodeAnalysis; namespace Esri.ArcGISRuntime.Toolkit.Maui.Primitives { @@ -95,25 +94,23 @@ private static object BuildDefaultBarcodeScannerFormInputTemplate() input.SetBinding(TextFormInputView.ElementProperty, Binding.SelfPath); return input; } - - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement.Label), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement.Description), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement", "Esri.ArcGISRuntime")] + private static object BuildDefaultTemplate() { var root = new VerticalStackLayout(); root.SetBinding(VerticalStackLayout.IsVisibleProperty, static (FormElement element) => element.IsVisible); var label = new Label(); - label.SetBinding(Label.TextProperty, static (FormElement element) => element.Label, source: RelativeBindingSource.TemplatedParent); + label.SetBinding(Label.TextProperty, static (FieldFormElementView view) => view.Element?.Label, source: RelativeBindingSource.TemplatedParent); label.SetBinding(View.IsVisibleProperty, static (Label lbl) => lbl.Text, source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter()); label.Style = FeatureFormView.GetFeatureFormTitleStyle(); root.Children.Add(label); label = new Label(); - label.SetBinding(Label.TextProperty, static (FormElement element) => element.Description, source: RelativeBindingSource.TemplatedParent); + label.SetBinding(Label.TextProperty, static (FieldFormElementView view) => view.Element?.Description, source: RelativeBindingSource.TemplatedParent); label.SetBinding(Label.IsVisibleProperty, static (Label lbl) => lbl.Text, source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter()); label.Style = FeatureFormView.GetFeatureFormCaptionStyle(); root.Children.Add(label); var content = new DataTemplatedContentPresenter(); - content.SetBinding(DataTemplatedContentPresenter.ContentDataProperty, static (FormElement element) => element, source: RelativeBindingSource.TemplatedParent); + content.SetBinding(DataTemplatedContentPresenter.ContentDataProperty, static (FieldFormElementView view) => view.Element, source: RelativeBindingSource.TemplatedParent); root.Children.Add(content); var errorLabel = new Label() { Margin = new Thickness(0, 2), TextColor = Colors.Red }; root.Children.Add(errorLabel); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Maui.cs index 111462796..0b101cc77 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Maui.cs @@ -21,7 +21,6 @@ using Esri.ArcGISRuntime.Mapping.FeatureForms; using Esri.ArcGISRuntime.Toolkit.Internal; using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using Microsoft.Maui.Controls.Shapes; using System.Runtime.Versioning; @@ -36,8 +35,6 @@ static FormAttachmentView() DefaultControlTemplate = new ControlTemplate(BuildDefaultTemplate); } - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormAttachment.Name), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormAttachment", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormAttachment.Size), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormAttachment", "Esri.ArcGISRuntime")] private static object BuildDefaultTemplate() { Border background = new Border() { BackgroundColor = Color.FromRgba(0, 0, 0, 0x30), StrokeShape = new RoundRectangle() { CornerRadius = 4 }, StrokeThickness = 0 }; @@ -49,10 +46,10 @@ private static object BuildDefaultTemplate() Border nameBackground = new Border() { BackgroundColor = Colors.Transparent, Padding = new Thickness(2), VerticalOptions = LayoutOptions.End, StrokeThickness = 0 }; var nameLabel = new Label() { HorizontalOptions = LayoutOptions.Center, FontSize = 10, MaxLines = 1, LineBreakMode = LineBreakMode.TailTruncation }; nameBackground.Content = nameLabel; - nameLabel.SetBinding(Label.TextProperty, static (Attachment attachment) => attachment.Name, source: RelativeBindingSource.TemplatedParent); + nameLabel.SetBinding(Label.TextProperty, static (FormAttachmentView view) => view.Attachment?.Name, source: RelativeBindingSource.TemplatedParent); root.Children.Add(nameBackground); var sizeLabel = new Label() { VerticalOptions = LayoutOptions.Start, HorizontalOptions = LayoutOptions.Center, FontSize = 10, MaxLines = 1 }; - sizeLabel.SetBinding(Label.TextProperty, static (Attachment attachment) => attachment.Size, source: RelativeBindingSource.TemplatedParent, converter: new FileSizeConverter()); + sizeLabel.SetBinding(Label.TextProperty, static (FormAttachmentView view) => view.Attachment?.Size, source: RelativeBindingSource.TemplatedParent, converter: new FileSizeConverter()); root.Children.Add(sizeLabel); var downloadIcon = new Label() { VerticalOptions = LayoutOptions.Start, HorizontalOptions = LayoutOptions.End, FontFamily = "calcite-ui-icons-24", Text = "\uE0CB", Margin = new Thickness(2) }; root.Children.Add(downloadIcon); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/GroupFormElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/GroupFormElementView.Maui.cs index 0436cab16..b923c7d73 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/GroupFormElementView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/GroupFormElementView.Maui.cs @@ -17,7 +17,6 @@ #if MAUI using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; using Microsoft.Maui.Controls.Internals; using Esri.ArcGISRuntime.Mapping.FeatureForms; using Esri.ArcGISRuntime.Toolkit.Internal; @@ -51,9 +50,6 @@ public GroupFormElementView() ControlTemplate = DefaultControlTemplate; } - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement.Label), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement.Description), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.GroupFormElement.Elements), "Esri.ArcGISRuntime.Mapping.FeatureForms.GroupFormElement", "Esri.ArcGISRuntime")] private static object BuildDefaultTemplate() { Border root = new Border() { StrokeShape = new RoundRectangle() { CornerRadius = 2 } }; @@ -69,10 +65,10 @@ private static object BuildDefaultTemplate() clickAreaContent.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Star)); clickAreaContent.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto)); var label = new Label() { Style = FeatureFormView.GetFeatureFormTitleStyle() }; - label.SetBinding(Label.TextProperty, static (GroupFormElement element) => element.Label, source: RelativeBindingSource.TemplatedParent); + label.SetBinding(Label.TextProperty, static (GroupFormElementView view) => view.Element?.Label, source: RelativeBindingSource.TemplatedParent); clickAreaContent.Children.Add(label); label = new Label() { Style = FeatureFormView.GetFeatureFormCaptionStyle() }; - label.SetBinding(Label.TextProperty, static (GroupFormElement element) => element.Description, source: RelativeBindingSource.TemplatedParent); + label.SetBinding(Label.TextProperty, static (GroupFormElementView view) => view.Element?.Description, source: RelativeBindingSource.TemplatedParent); Grid.SetRow(label, 1); clickAreaContent.Children.Add(label); @@ -98,7 +94,7 @@ private static object BuildDefaultTemplate() VerticalStackLayout itemsView = new VerticalStackLayout(); itemsView.SetBinding(VerticalStackLayout.MarginProperty, static (GroupFormElementView view) => view.ContentPadding, source: RelativeBindingSource.TemplatedParent); BindableLayout.SetItemTemplateSelector(itemsView, new FeatureFormElementTemplateSelector()); - itemsView.SetBinding(BindableLayout.ItemsSourceProperty, static (GroupFormElement element) => element.Elements, source: RelativeBindingSource.TemplatedParent); + itemsView.SetBinding(BindableLayout.ItemsSourceProperty, static (GroupFormElementView view) => view.Element?.Elements, source: RelativeBindingSource.TemplatedParent); layout.Children.Add(itemsView); root.Content = layout; INameScope nameScope = new NameScope(); diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/SwitchFormInputView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/SwitchFormInputView.Maui.cs index 8fbe3c16d..514d1dd6c 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/SwitchFormInputView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/SwitchFormInputView.Maui.cs @@ -2,7 +2,6 @@ using Microsoft.Maui.Controls.Internals; using Esri.ArcGISRuntime.Mapping.FeatureForms; using System.ComponentModel; -using System.Diagnostics.CodeAnalysis; namespace Esri.ArcGISRuntime.Toolkit.Maui.Primitives { @@ -20,10 +19,6 @@ static SwitchFormInputView() /// public const string SwitchViewName = "SwitchView"; - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FieldFormElement.Input), "Esri.ArcGISRuntime.Mapping.FeatureForms.FieldFormElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.SwitchFormInput.OnValue), "Esri.ArcGISRuntime.Mapping.FeatureForms.SwitchFormInput", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.SwitchFormInput.OffValue), "Esri.ArcGISRuntime.Mapping.FeatureForms.SwitchFormInput", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Data.CodedValue.Name), "Esri.ArcGISRuntime.Data.CodedValue", "Esri.ArcGISRuntime")] private static object BuildDefaultTemplate() { Switch toggleSwitch = new Switch(); @@ -40,12 +35,12 @@ private static object BuildDefaultTemplate() root.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Auto) }); Grid.SetColumn(toggleSwitch, 1); Label onText = new Label() { VerticalOptions = new LayoutOptions(LayoutAlignment.Center, false) }; - onText.SetBinding(Label.TextProperty, static (SwitchFormInput input) => input.OnValue.Name, source: RelativeBindingSource.TemplatedParent); + onText.SetBinding(Label.TextProperty, static (SwitchFormInputView view) => ((SwitchFormInput?)view.Element?.Input)?.OnValue?.Name, source: RelativeBindingSource.TemplatedParent); onText.SetBinding(Label.IsVisibleProperty, static (SwitchFormInputView view) => view.IsChecked, source: RelativeBindingSource.TemplatedParent); root.Children.Add(onText); Label offText = new Label() { VerticalOptions = new LayoutOptions(LayoutAlignment.Center, false) }; - offText.SetBinding(Label.TextProperty, static (SwitchFormInput input) => input.OffValue.Name, source: RelativeBindingSource.TemplatedParent); + offText.SetBinding(Label.TextProperty, static (SwitchFormInputView view) => ((SwitchFormInput?)view.Element?.Input)?.OffValue.Name, source: RelativeBindingSource.TemplatedParent); offText.SetBinding(Label.IsVisibleProperty, static (SwitchFormInputView view) => view.IsChecked, source: RelativeBindingSource.TemplatedParent, converter: Internal.InvertBoolConverter.Instance); root.Children.Add(offText); diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/MediaPopupElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/MediaPopupElementView.Maui.cs index 16f960d0f..def0d2b98 100644 --- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/MediaPopupElementView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/MediaPopupElementView.Maui.cs @@ -17,7 +17,6 @@ using Microsoft.Maui.Controls.Internals; using Esri.ArcGISRuntime.Mapping.Popups; -using System.Diagnostics.CodeAnalysis; namespace Esri.ArcGISRuntime.Toolkit.Maui.Primitives { @@ -39,28 +38,25 @@ static MediaPopupElementView() DefaultControlTemplate = new ControlTemplate(BuildDefaultTemplate); } - [DynamicDependency(nameof(MediaPopupElement.Title), "Esri.ArcGISRuntime.Mapping.Popups.MediaPopupElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(MediaPopupElement.Description), "Esri.ArcGISRuntime.Mapping.Popups.MediaPopupElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(MediaPopupElement.Media), "Esri.ArcGISRuntime.Mapping.Popups.MediaPopupElement","Esri.ArcGISRuntime")] private static object BuildDefaultTemplate() { StackLayout root = new StackLayout(); Label roottitle = new Label(); - roottitle.SetBinding(Label.TextProperty, static (MediaPopupElement element) => element.Title, source: RelativeBindingSource.TemplatedParent); - roottitle.SetBinding(VisualElement.IsVisibleProperty, static (MediaPopupElement element) => element.Title, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); + roottitle.SetBinding(Label.TextProperty, static (MediaPopupElementView view) => view.Element?.Title, source: RelativeBindingSource.TemplatedParent); + roottitle.SetBinding(VisualElement.IsVisibleProperty, static (MediaPopupElementView view) => view.Element?.Title, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); roottitle.Style = PopupViewer.GetPopupViewerTitleStyle(); root.Add(roottitle); Label rootcaption = new Label(); - rootcaption.SetBinding(Label.TextProperty, static (MediaPopupElement element) => element.Description, source: RelativeBindingSource.TemplatedParent); - rootcaption.SetBinding(VisualElement.IsVisibleProperty, static (MediaPopupElement element) => element.Description, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); + rootcaption.SetBinding(Label.TextProperty, static (MediaPopupElementView view) => view.Element?.Description, source: RelativeBindingSource.TemplatedParent); + rootcaption.SetBinding(VisualElement.IsVisibleProperty, static (MediaPopupElementView view) => view.Element?.Description, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); rootcaption.Style = PopupViewer.GetPopupViewerCaptionStyle(); root.Add(rootcaption); #if WINDOWS CarouselView2 cv = new CarouselView2(); - cv.SetBinding(CarouselView2.ItemsSourceProperty, static (MediaPopupElement element) => element.Media, source: RelativeBindingSource.TemplatedParent); + cv.SetBinding(CarouselView2.ItemsSourceProperty, static (MediaPopupElementView view) => view.Element?.Media, source: RelativeBindingSource.TemplatedParent); #else CarouselView cv = new CarouselView(); - cv.SetBinding(CarouselView.ItemsSourceProperty, static (MediaPopupElement element) => element.Media, source: RelativeBindingSource.TemplatedParent); + cv.SetBinding(CarouselView.ItemsSourceProperty, static (MediaPopupElementView view) => view.Element?.Media, source: RelativeBindingSource.TemplatedParent); #endif #if __IOS__ // Workaround for https://github.com/dotnet/maui/issues/12911 cv.HeightRequest = 300; @@ -76,8 +72,6 @@ private static object BuildDefaultTemplate() return root; } - [DynamicDependency(nameof(PopupMedia.Title), "Esri.ArcGISRuntime.Mapping.Popups.PopupMedia", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(PopupMedia.Caption), "Esri.ArcGISRuntime.Mapping.Popups.PopupMedia", "Esri.ArcGISRuntime")] private static object BuildDefaultItemTemplate() { var pm = new PopupMediaView(); diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Maui.cs index 32fa311af..7e937141d 100644 --- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Maui.cs @@ -18,7 +18,6 @@ using Microsoft.Maui.Controls.Internals; using Esri.ArcGISRuntime.Mapping.Popups; using Esri.ArcGISRuntime.Toolkit.Maui.Primitives; -using System.Diagnostics.CodeAnalysis; namespace Esri.ArcGISRuntime.Toolkit.Maui { @@ -60,8 +59,6 @@ static PopupViewer() DefaultPopupViewerCaptionStyle.Setters.Add(new Setter() { Property = Label.LineBreakModeProperty, Value = LineBreakMode.WordWrap }); } - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.Popups.Popup.Title), "Esri.ArcGISRuntime.Mapping.Popups.Popup", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.Popups.Popup.EvaluatedElements), "Esri.ArcGISRuntime.Mapping.Popups.Popup", "Esri.ArcGISRuntime")] private static object BuildDefaultTemplate() { Grid root = new Grid(); @@ -69,8 +66,8 @@ private static object BuildDefaultTemplate() root.RowDefinitions.Add(new RowDefinition(GridLength.Star)); Label roottitle = new Label(); roottitle.Style = GetPopupViewerHeaderStyle(); - roottitle.SetBinding(Label.TextProperty, static (Popup popup) => popup.Title, source: RelativeBindingSource.TemplatedParent); - roottitle.SetBinding(VisualElement.IsVisibleProperty, static (Popup popup) => popup.Title, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); + roottitle.SetBinding(Label.TextProperty, static (PopupViewer viewer) => viewer.Popup?.Title, source: RelativeBindingSource.TemplatedParent); + roottitle.SetBinding(VisualElement.IsVisibleProperty, static (PopupViewer viewer) => viewer.Popup?.Title, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); root.Add(roottitle); ScrollView scrollView = new ScrollView() { HorizontalScrollBarVisibility = ScrollBarVisibility.Never }; #if WINDOWS @@ -84,7 +81,7 @@ private static object BuildDefaultTemplate() Margin = new Thickness(0, 10), }; BindableLayout.SetItemTemplateSelector(itemsView, new PopupElementTemplateSelector()); - itemsView.SetBinding(BindableLayout.ItemsSourceProperty, static (Popup popup) => popup.EvaluatedElements, source: RelativeBindingSource.TemplatedParent); + itemsView.SetBinding(BindableLayout.ItemsSourceProperty, static (PopupViewer viewer) => viewer.Popup?.EvaluatedElements, source: RelativeBindingSource.TemplatedParent); scrollView.Content = itemsView; INameScope nameScope = new NameScope(); NameScope.SetNameScope(root, nameScope); diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.cs index 8631e7133..61405402a 100644 --- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.cs +++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.cs @@ -132,7 +132,7 @@ private void InvalidatePopup() var ctrl = GetTemplateChild(ItemsViewName) as IBindableLayout; if (ctrl != null && ctrl is BindableObject bo) { - bo.SetBinding(BindableLayout.ItemsSourceProperty, static (Popup popup) => popup.EvaluatedElements, source: RelativeBindingSource.TemplatedParent); + bo.SetBinding(BindableLayout.ItemsSourceProperty, static (PopupViewer viewer) => viewer.Popup?.EvaluatedElements, source: RelativeBindingSource.TemplatedParent); } #else var ctrl = GetTemplateChild(ItemsViewName) as ItemsControl; From 771357ee6d3ea3e74c4c6eef3dd2206214fa5986 Mon Sep 17 00:00:00 2001 From: Prathamesh Narkhede Date: Mon, 24 Mar 2025 18:05:05 -0700 Subject: [PATCH 3/4] Remove unused directives and dependencies in FloorFilter --- .../FloorFilter/FloorFilter.DefaultTemplates.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.DefaultTemplates.cs b/src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.DefaultTemplates.cs index 399fcb9dc..f33a1302b 100644 --- a/src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.DefaultTemplates.cs +++ b/src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.DefaultTemplates.cs @@ -15,7 +15,6 @@ // ******************************************************************************/ using Esri.ArcGISRuntime.Mapping.Floor; -using System.Diagnostics.CodeAnalysis; namespace Esri.ArcGISRuntime.Toolkit.Maui; @@ -27,11 +26,6 @@ public partial class FloorFilter private static readonly DataTemplate DefaultDifferentiatingFacilityDataTemplate; private static readonly ControlTemplate DefaultControlTemplate; - - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.Floor.FloorLevel.ShortName), "Esri.ArcGISRuntime.Mapping.Floor.FloorLevel", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.Floor.FloorFacility.Name), "Esri.ArcGISRuntime.Mapping.Floor.FloorFacility", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.Floor.FloorFacility.Site), "Esri.ArcGISRuntime.Mapping.Floor.FloorFacility", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.Floor.FloorSite.Name), "Esri.ArcGISRuntime.Mapping.Floor.FloorSite", "Esri.ArcGISRuntime")] static FloorFilter() { DefaultLevelDataTemplate = new DataTemplate(() => From fbbd2015e156aa17310566105b6257dcb6238d7d Mon Sep 17 00:00:00 2001 From: Prathamesh Narkhede Date: Tue, 25 Mar 2025 17:42:50 -0700 Subject: [PATCH 4/4] Remove DynamicDependency attributes and update to correct bindings --- .../FeatureForm/TextFormInputView.Maui.cs | 15 ++++---------- .../AttachmentsPopupElementView.Maui.cs | 20 +++++-------------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Maui.cs index c45e42694..dddf1e774 100644 --- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Maui.cs @@ -1,9 +1,7 @@ #if MAUI using Microsoft.Maui.Controls.Internals; using Esri.ArcGISRuntime.Mapping.FeatureForms; -using System.Diagnostics.CodeAnalysis; using System.Globalization; -using System.Runtime.CompilerServices; namespace Esri.ArcGISRuntime.Toolkit.Maui.Primitives { @@ -27,11 +25,6 @@ private class StringLengthConverter : IValueConverter object? IValueConverter.ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => throw new NotImplementedException(); } - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FieldFormElement.IsEditable), "Esri.ArcGISRuntime.Mapping.FeatureForms.FieldFormElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FieldFormElement.Value), "Esri.ArcGISRuntime.Mapping.FeatureForms.FieldFormElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.TextAreaFormInput.MaxLength), "Esri.ArcGISRuntime.Mapping.FeatureForms.TextAreaFormInput", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.TextBoxFormInput.MaxLength), "Esri.ArcGISRuntime.Mapping.FeatureForms.TextBoxFormInput", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.BarcodeScannerFormInput.MaxLength), "Esri.ArcGISRuntime.Mapping.FeatureForms.BarcodeScannerFormInput", "Esri.ArcGISRuntime")] private static object BuildDefaultTemplate() { @@ -43,7 +36,7 @@ private static object BuildDefaultTemplate() horizontalStackLayout.Margin = new Thickness(0, -17, 0, 0); horizontalStackLayout.SetBinding(View.IsVisibleProperty, new Binding(nameof(TextFormInputView.ShowCharacterCount), source: RelativeBindingSource.TemplatedParent)); Label characterCountLabel = new Label() { Style = FeatureFormView.GetFeatureFormCaptionStyle() }; - characterCountLabel.SetBinding(Label.TextProperty, static (FieldFormElement element) => element.Value, source: RelativeBindingSource.TemplatedParent, converter: StringLengthConverter.Instance); + characterCountLabel.SetBinding(Label.TextProperty, static (TextFormInputView view) => view.Element?.Value, source: RelativeBindingSource.TemplatedParent, converter: StringLengthConverter.Instance); horizontalStackLayout.Children.Add(characterCountLabel); horizontalStackLayout.Children.Add(new Label() { Text = "/", Style = FeatureFormView.GetFeatureFormCaptionStyle() }); Label maxCountLabel = new Label() { Style = FeatureFormView.GetFeatureFormCaptionStyle() }; @@ -58,13 +51,13 @@ private static object BuildDefaultTemplate() Entry textInput = new Entry(); Grid.SetColumnSpan(textInput, 2); root.Add(textInput); - textInput.SetBinding(Entry.IsEnabledProperty, static (FieldFormElement element) => element.IsEditable); + textInput.SetBinding(Entry.IsEnabledProperty, static (TextFormInputView view) => view.Element?.IsEditable, source: RelativeBindingSource.TemplatedParent); Editor textArea = new Editor() { IsVisible = false, HeightRequest = 100, AutoSize = EditorAutoSizeOption.Disabled }; Grid.SetColumnSpan(textArea, 2); - textArea.SetBinding(Editor.IsEnabledProperty, static (FieldFormElement element) => element.IsEditable); + textArea.SetBinding(Editor.IsEnabledProperty, static (TextFormInputView view) => view.Element?.IsEditable, source: RelativeBindingSource.TemplatedParent); root.Add(textArea); Label readonlyText = new Label() { IsVisible = false, LineBreakMode = LineBreakMode.WordWrap }; - readonlyText.SetBinding(Label.TextProperty, static (FieldFormElement element) => element.Value, source: RelativeBindingSource.TemplatedParent); + readonlyText.SetBinding(Label.TextProperty, static (TextFormInputView view) => view.Element?.Value, source: RelativeBindingSource.TemplatedParent); Grid.SetColumnSpan(readonlyText, 2); root.Add(readonlyText); Internal.CalciteImageButton barcodeButton = new Internal.CalciteImageButton("\uE22F") { IsVisible = false, BorderWidth = 0 }; diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/AttachmentsPopupElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/AttachmentsPopupElementView.Maui.cs index 4bd499496..ef5fe1a0d 100644 --- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/AttachmentsPopupElementView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/AttachmentsPopupElementView.Maui.cs @@ -20,7 +20,6 @@ using System.Globalization; using System.ComponentModel; using System.Runtime.InteropServices; -using System.Diagnostics.CodeAnalysis; #if WINDOWS using WinRT; #endif @@ -45,25 +44,22 @@ static AttachmentsPopupElementView() DefaultControlTemplate = new ControlTemplate(BuildDefaultTemplate); } - [DynamicDependency(nameof(AttachmentsPopupElement.Title), "Esri.ArcGISRuntime.Mapping.Popups.AttachmentsPopupElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(AttachmentsPopupElement.Description),"Esri.ArcGISRuntime.Mapping.Popups.AttachmentsPopupElement", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(AttachmentsPopupElement.Attachments), "Esri.ArcGISRuntime.Mapping.Popups.AttachmentsPopupElement", "Esri.ArcGISRuntime")] private static object BuildDefaultTemplate() { StackLayout root = new StackLayout(); Label roottitle = new Label(); - roottitle.SetBinding(Label.TextProperty, static (AttachmentsPopupElement element) => element.Title, source: RelativeBindingSource.TemplatedParent); - roottitle.SetBinding(VisualElement.IsVisibleProperty, static (AttachmentsPopupElement element) => element.Title, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); + roottitle.SetBinding(Label.TextProperty, static (AttachmentsPopupElementView view) => view.Element?.Title, source: RelativeBindingSource.TemplatedParent); + roottitle.SetBinding(VisualElement.IsVisibleProperty, static (AttachmentsPopupElementView view) => view.Element?.Title, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); roottitle.Style = PopupViewer.GetPopupViewerTitleStyle(); root.Add(roottitle); Label rootcaption = new Label(); - rootcaption.SetBinding(Label.TextProperty, static (AttachmentsPopupElement element) => element.Description, source: RelativeBindingSource.TemplatedParent); - rootcaption.SetBinding(VisualElement.IsVisibleProperty, static (AttachmentsPopupElement element) => element.Description, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); + rootcaption.SetBinding(Label.TextProperty, static (AttachmentsPopupElementView view) => view.Element?.Description, source: RelativeBindingSource.TemplatedParent); + rootcaption.SetBinding(VisualElement.IsVisibleProperty, static (AttachmentsPopupElementView view) => view.Element?.Description, source: RelativeBindingSource.TemplatedParent, converter: Internal.EmptyToFalseConverter.Instance); rootcaption.Style = PopupViewer.GetPopupViewerCaptionStyle(); root.Add(rootcaption); root.Add(new Border() { StrokeThickness = 0, HeightRequest = 1, BackgroundColor = Colors.Gray, Margin = new Thickness(0,5) }); CollectionView cv = new CollectionView() { SelectionMode = SelectionMode.None }; - cv.SetBinding(CollectionView.ItemsSourceProperty, static (AttachmentsPopupElement element) => element.Attachments, source: RelativeBindingSource.TemplatedParent); + cv.SetBinding(CollectionView.ItemsSourceProperty, static (AttachmentsPopupElementView view) => view.Element?.Attachments, source: RelativeBindingSource.TemplatedParent); cv.ItemTemplate = new DataTemplate(BuildDefaultItemTemplate); root.Add(cv); INameScope nameScope = new NameScope(); @@ -72,12 +68,6 @@ private static object BuildDefaultTemplate() return root; } - - [DynamicDependency(nameof(AttachmentViewModel.Thumbnail), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentsPopupElementView.AttachmentViewModel", "Esri.ArcGISRuntime.Toolkit.Maui")] - [DynamicDependency(nameof(AttachmentViewModel.Name), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentsPopupElementView.AttachmentViewModel", "Esri.ArcGISRuntime.Toolkit.Maui")] - [DynamicDependency(nameof(AttachmentViewModel.Size), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentsPopupElementView.AttachmentViewModel", "Esri.ArcGISRuntime.Toolkit.Maui")] - [DynamicDependency(nameof(AttachmentViewModel.IsDownloadButtonVisible), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentsPopupElementView.AttachmentViewModel", "Esri.ArcGISRuntime.Toolkit.Maui")] - [DynamicDependency(nameof(AttachmentViewModel.IsDownloading), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentsPopupElementView.AttachmentViewModel", "Esri.ArcGISRuntime.Toolkit.Maui")] private static object BuildDefaultItemTemplate() { Grid layout = new Grid();