Fixing obsolete old constructor for FeatureForm in samples (#696)

prathameshnarkhede · web-flow · commit 5ec1ef232467 · 2025-09-10T14:16:26.000-07:00
* Fixing obsolete old constructor for FeatureForm in samples

* Addressing code review comments

* restoring unnecessary commit
diff --git a/src/Samples/Toolkit.SampleApp.Maui/Samples/FeatureFormViewSample.xaml.cs b/src/Samples/Toolkit.SampleApp.Maui/Samples/FeatureFormViewSample.xaml.cs
@@ -24,10 +24,10 @@ private async void mapView_GeoViewTapped(object sender, Esri.ArcGISRuntime.Maui.
                 var result = await mapView.IdentifyLayersAsync(e.Position, 3, false);
 
                 // Retrieves feature from IdentifyLayerResult with a form definition
-                var feature = GetFeature(result, out var def);
+                var feature = GetFeature(result);
                 if (feature != null)
                 {
-                    formViewer.FeatureForm = new FeatureForm(feature, def);
+                    formViewer.FeatureForm = new FeatureForm(feature);
                     SidePanel.IsVisible = true;
                 }
             }
@@ -37,19 +37,13 @@ private async void mapView_GeoViewTapped(object sender, Esri.ArcGISRuntime.Maui.
             }
         }
 
-        private ArcGISFeature? GetFeature(IEnumerable<IdentifyLayerResult> results, out FeatureFormDefinition? def)
+        private ArcGISFeature? GetFeature(IEnumerable<IdentifyLayerResult> results)
         {
-            def = null;
             if (results == null)
                 return null;
             foreach (var result in results.Where(r => r.LayerContent is FeatureLayer layer && (layer.FeatureFormDefinition is not null || (layer.FeatureTable as ArcGISFeatureTable)?.FeatureFormDefinition is not null)))
             {
-                var feature = result.GeoElements?.OfType<ArcGISFeature>()?.FirstOrDefault();
-                def = (result.LayerContent as FeatureLayer)?.FeatureFormDefinition ?? ((result.LayerContent as FeatureLayer)?.FeatureTable as ArcGISFeatureTable)?.FeatureFormDefinition;
-                if (feature != null && def != null)
-                {
-                    return feature;
-                }
+                return result.GeoElements?.OfType<ArcGISFeature>()?.FirstOrDefault();
             }
 
             return null;
diff --git a/src/Samples/Toolkit.SampleApp.UWP/Samples/Forms/FeatureFormViewSample.xaml.cs b/src/Samples/Toolkit.SampleApp.UWP/Samples/Forms/FeatureFormViewSample.xaml.cs
@@ -27,7 +27,7 @@ private async void mapView_GeoViewTapped(object sender, GeoViewInputEventArgs e)
                 var result = await mapView.IdentifyLayersAsync(e.Position, 3, false);
 
                 // Retrieves feature from IdentifyLayerResult with a form definition
-                var feature = GetFeature(result, out var def);
+                var feature = GetFeature(result);
                 if (feature != null)
                 {
                     formViewer.FeatureForm = new FeatureForm(feature);
@@ -40,19 +40,13 @@ private async void mapView_GeoViewTapped(object sender, GeoViewInputEventArgs e)
             }
         }
 
-        private ArcGISFeature GetFeature(IEnumerable<IdentifyLayerResult> results, out FeatureFormDefinition def)
+        private ArcGISFeature GetFeature(IEnumerable<IdentifyLayerResult> results)
         {
-            def = null;
             if (results == null)
                 return null;
             foreach (var result in results.Where(r => r.LayerContent is FeatureLayer layer && (layer.FeatureFormDefinition is not null || (layer.FeatureTable as ArcGISFeatureTable)?.FeatureFormDefinition is not null)))
             {
-                var feature = result.GeoElements?.OfType<ArcGISFeature>()?.FirstOrDefault();
-                def = (result.LayerContent as FeatureLayer)?.FeatureFormDefinition ?? ((result.LayerContent as FeatureLayer)?.FeatureTable as ArcGISFeatureTable)?.FeatureFormDefinition;
-                if (feature != null && def != null)
-                {
-                    return feature;
-                }
+                return result.GeoElements?.OfType<ArcGISFeature>()?.FirstOrDefault();
             }
 
             return null;
diff --git a/src/Samples/Toolkit.SampleApp.WPF/Samples/Forms/FeatureFormViewSample.xaml.cs b/src/Samples/Toolkit.SampleApp.WPF/Samples/Forms/FeatureFormViewSample.xaml.cs
@@ -24,10 +24,10 @@ private async void mapView_GeoViewTapped(object sender, GeoViewInputEventArgs e)
                 var result = await mapView.IdentifyLayersAsync(e.Position, 3, false);
 
                 // Retrieves feature from IdentifyLayerResult with a form definition
-                var feature = GetFeature(result, out var def);
+                var feature = GetFeature(result);
                 if (feature != null)
                 {
-                    formViewer.FeatureForm = new FeatureForm(feature, def);
+                    formViewer.FeatureForm = new FeatureForm(feature);
                     SidePanel.Visibility = Visibility.Visible;
                 }
             }
@@ -37,19 +37,13 @@ private async void mapView_GeoViewTapped(object sender, GeoViewInputEventArgs e)
             }
         }
 
-        private ArcGISFeature GetFeature(IEnumerable<IdentifyLayerResult> results, out FeatureFormDefinition def)
+        private ArcGISFeature GetFeature(IEnumerable<IdentifyLayerResult> results)
         {
-            def = null;
             if (results == null)
                 return null;
             foreach (var result in results.Where(r => r.LayerContent is FeatureLayer layer && (layer.FeatureFormDefinition is not null || (layer.FeatureTable as ArcGISFeatureTable)?.FeatureFormDefinition is not null)))
             {
-                var feature = result.GeoElements?.OfType<ArcGISFeature>()?.FirstOrDefault();
-                def = (result.LayerContent as FeatureLayer)?.FeatureFormDefinition ?? ((result.LayerContent as FeatureLayer)?.FeatureTable as ArcGISFeatureTable)?.FeatureFormDefinition;
-                if (feature != null && def != null)
-                {
-                    return feature;
-                }
+                return result.GeoElements?.OfType<ArcGISFeature>()?.FirstOrDefault();
             }
 
             return null;

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,10 @@ private async void mapView_GeoViewTapped(object sender, Esri.ArcGISRuntime.Maui.`
`24`	`24`	`var result = await mapView.IdentifyLayersAsync(e.Position, 3, false);`
`25`	`25`
`26`	`26`	`// Retrieves feature from IdentifyLayerResult with a form definition`
`27`		`- var feature = GetFeature(result, out var def);`
	`27`	`+ var feature = GetFeature(result);`
`28`	`28`	`if (feature != null)`
`29`	`29`	`{`
`30`		`- formViewer.FeatureForm = new FeatureForm(feature, def);`
	`30`	`+ formViewer.FeatureForm = new FeatureForm(feature);`
`31`	`31`	`SidePanel.IsVisible = true;`
`32`	`32`	`}`
`33`	`33`	`}`
`@@ -37,19 +37,13 @@ private async void mapView_GeoViewTapped(object sender, Esri.ArcGISRuntime.Maui.`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`- private ArcGISFeature? GetFeature(IEnumerable<IdentifyLayerResult> results, out FeatureFormDefinition? def)`
	`40`	`+ private ArcGISFeature? GetFeature(IEnumerable<IdentifyLayerResult> results)`
`41`	`41`	`{`
`42`		`- def = null;`
`43`	`42`	`if (results == null)`
`44`	`43`	`return null;`
`45`	`44`	`foreach (var result in results.Where(r => r.LayerContent is FeatureLayer layer && (layer.FeatureFormDefinition is not null \|\| (layer.FeatureTable as ArcGISFeatureTable)?.FeatureFormDefinition is not null)))`
`46`	`45`	`{`
`47`		`- var feature = result.GeoElements?.OfType<ArcGISFeature>()?.FirstOrDefault();`
`48`		`- def = (result.LayerContent as FeatureLayer)?.FeatureFormDefinition ?? ((result.LayerContent as FeatureLayer)?.FeatureTable as ArcGISFeatureTable)?.FeatureFormDefinition;`
`49`		`- if (feature != null && def != null)`
`50`		`- {`
`51`		`- return feature;`
`52`		`- }`
	`46`	`+ return result.GeoElements?.OfType<ArcGISFeature>()?.FirstOrDefault();`
`53`	`47`	`}`
`54`	`48`
`55`	`49`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ private async void mapView_GeoViewTapped(object sender, GeoViewInputEventArgs e)`
`27`	`27`	`var result = await mapView.IdentifyLayersAsync(e.Position, 3, false);`
`28`	`28`
`29`	`29`	`// Retrieves feature from IdentifyLayerResult with a form definition`
`30`		`- var feature = GetFeature(result, out var def);`
	`30`	`+ var feature = GetFeature(result);`
`31`	`31`	`if (feature != null)`
`32`	`32`	`{`
`33`	`33`	`formViewer.FeatureForm = new FeatureForm(feature);`
`@@ -40,19 +40,13 @@ private async void mapView_GeoViewTapped(object sender, GeoViewInputEventArgs e)`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- private ArcGISFeature GetFeature(IEnumerable<IdentifyLayerResult> results, out FeatureFormDefinition def)`
	`43`	`+ private ArcGISFeature GetFeature(IEnumerable<IdentifyLayerResult> results)`
`44`	`44`	`{`
`45`		`- def = null;`
`46`	`45`	`if (results == null)`
`47`	`46`	`return null;`
`48`	`47`	`foreach (var result in results.Where(r => r.LayerContent is FeatureLayer layer && (layer.FeatureFormDefinition is not null \|\| (layer.FeatureTable as ArcGISFeatureTable)?.FeatureFormDefinition is not null)))`
`49`	`48`	`{`
`50`		`- var feature = result.GeoElements?.OfType<ArcGISFeature>()?.FirstOrDefault();`
`51`		`- def = (result.LayerContent as FeatureLayer)?.FeatureFormDefinition ?? ((result.LayerContent as FeatureLayer)?.FeatureTable as ArcGISFeatureTable)?.FeatureFormDefinition;`
`52`		`- if (feature != null && def != null)`
`53`		`- {`
`54`		`- return feature;`
`55`		`- }`
	`49`	`+ return result.GeoElements?.OfType<ArcGISFeature>()?.FirstOrDefault();`
`56`	`50`	`}`
`57`	`51`
`58`	`52`	`return null;`