From d2a47eb9af71848e58f4a3e269fcb02d688d3b56 Mon Sep 17 00:00:00 2001
From: praveenaa <praveenaa2408@gmail.com>
Date: Tue, 31 Mar 2026 10:04:32 -0700
Subject: [PATCH 1/5] snap geometry edits toggle visibility

---
 .../Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml b/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml
index b78c73ee70..d533a697ab 100644
--- a/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml
+++ b/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml
@@ -158,7 +158,7 @@
                                     Text="Enable all"
                                     VerticalOptions="Center" />
                         </Grid>
-                        <VerticalStackLayout HeightRequest="130" WidthRequest="250">
+                        <VerticalStackLayout HeightRequest="130">
                             <Grid ColumnSpacing="3">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="auto" />

From 1be4852f98c855b92e010be198ad4c9c9032a85d Mon Sep 17 00:00:00 2001
From: praveenaa <pkulandhaivel@esri.com>
Date: Tue, 31 Mar 2026 10:17:11 -0700
Subject: [PATCH 2/5] fix create load report sample

---
 .../CreateLoadReport/CreateLoadReport.xaml          | 13 +++++++------
 .../CreateLoadReport/CreateLoadReport.xaml.cs       |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml
index 389b2006c2..e1d6ca07aa 100644
--- a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml
+++ b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml
@@ -13,6 +13,7 @@
             <HorizontalStackLayout Spacing="5">
                 <Picker x:Name="PhasesList"
                         x:DataType="esri:CodedValue"
+                        IsEnabled="False"
                         ItemDisplayBinding="{Binding Name}"
                         WidthRequest="150" />
                 <Button Clicked="OnAddPhase" Text="Add" />
@@ -30,25 +31,25 @@
                             HeightRequest="300"
                             VerticalScrollBarVisibility="Default">
                 <CollectionView.Header>
-                    <Grid ColumnDefinitions="Auto, Auto, Auto"
-                          ColumnSpacing="25"
-                          HorizontalOptions="Center">
+                    <Grid ColumnDefinitions="*, *, *"
+                          Padding="5,0">
                         <Label Grid.Column="0"
                                FontAttributes="Bold"
                                Text="Phase" />
                         <Label Grid.Column="1"
                                FontAttributes="Bold"
+                               HorizontalOptions="Center"
                                Text="Total Customers" />
                         <Label Grid.Column="2"
                                FontAttributes="Bold"
+                               HorizontalOptions="Center"
                                Text="Total Load" />
                     </Grid>
                 </CollectionView.Header>
                 <CollectionView.ItemTemplate>
                     <DataTemplate x:DataType="local:PhaseSummary">
-                        <Grid Margin="5"
-                              ColumnDefinitions="100, 50, 175"
-                              HorizontalOptions="Center">
+                        <Grid ColumnDefinitions="*, *, *"
+                              Padding="5,0">
                             <Label Text="{Binding Phase}" />
                             <Label Grid.Column="1"
                                    HorizontalOptions="Center"
diff --git a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs
index 73c3c67db1..1ef308d7a7 100644
--- a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs
@@ -120,6 +120,7 @@ private async Task Initialize()
                         if (_phasesNetworkAttribute.Domain is CodedValueDomain codedValueDomain)
                         {
                             PhasesList.ItemsSource = codedValueDomain.CodedValues.ToList();
+                            PhasesList.IsEnabled = true;
                         }
                     }
                 }

From d8c95abf1ba59778eb413ccd655a2ac2388c62e4 Mon Sep 17 00:00:00 2001
From: praveenaa <pkulandhaivel@esri.com>
Date: Tue, 31 Mar 2026 10:28:30 -0700
Subject: [PATCH 3/5] fix Filter Building Scene Layer panel

---
 .../FilterBuildingSceneLayer.xaml             | 178 ++++++++----------
 1 file changed, 83 insertions(+), 95 deletions(-)

diff --git a/src/MAUI/Maui.Samples/Samples/Layers/FilterBuildingSceneLayer/FilterBuildingSceneLayer.xaml b/src/MAUI/Maui.Samples/Samples/Layers/FilterBuildingSceneLayer/FilterBuildingSceneLayer.xaml
index 90ebb5c3c9..dc6d4acbe0 100644
--- a/src/MAUI/Maui.Samples/Samples/Layers/FilterBuildingSceneLayer/FilterBuildingSceneLayer.xaml
+++ b/src/MAUI/Maui.Samples/Samples/Layers/FilterBuildingSceneLayer/FilterBuildingSceneLayer.xaml
@@ -1,113 +1,101 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <ContentPage
     x:Class="ArcGIS.Samples.FilterBuildingSceneLayer.FilterBuildingSceneLayer"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:ArcGIS.Samples.FilterBuildingSceneLayer"
     xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
-    <Grid>
+    <Grid Style="{DynamicResource EsriSampleContainer}">
         <!--  LocalSceneView displays the 3D building scene.  -->
-        <esriUI:LocalSceneView x:Name="MySceneView" />
+        <esriUI:LocalSceneView x:Name="MySceneView" Style="{DynamicResource EsriSampleGeoView}" />
 
-        <!--  Settings panel for floor filtering and category visibility controls.  -->
-        <Border
-            x:Name="SettingsPanel"
-            Margin="10"
-            Padding="16"
-            HeightRequest="300"
-            HorizontalOptions="End"
-            Style="{DynamicResource EsriSampleControlPanel}"
-            VerticalOptions="Start"
-            WidthRequest="250">
-            <ScrollView>
-                <VerticalStackLayout Spacing="12">
-                    <!--  Floor selection dropdown.  -->
-                    <Grid ColumnDefinitions="Auto,*">
+        <!--  Control panel: toggles between settings and feature attributes.  -->
+        <Border Style="{DynamicResource EsriSampleControlPanel}">
+            <Grid>
+                <!--  Settings panel for floor filtering and category visibility controls.  -->
+                <ScrollView x:Name="SettingsPanel">
+                    <VerticalStackLayout Spacing="12">
+                        <!--  Floor selection dropdown.  -->
+                        <Grid ColumnDefinitions="Auto,*">
+                            <Label
+                                Grid.Column="0"
+                                FontAttributes="Bold"
+                                FontSize="14"
+                                Text="Floor:"
+                                VerticalOptions="Center" />
+                            <Picker
+                                x:Name="FloorPicker"
+                                Grid.Column="1"
+                                Margin="10,0,0,0"
+                                SelectedIndexChanged="FloorPicker_SelectedIndexChanged" />
+                        </Grid>
+
+                        <!--  Category controls for toggling sublayer visibility.  -->
                         <Label
-                            Grid.Column="0"
                             FontAttributes="Bold"
                             FontSize="14"
-                            Text="Floor:"
-                            VerticalOptions="Center" />
-                        <Picker
-                            x:Name="FloorPicker"
-                            Grid.Column="1"
-                            Margin="10,0,0,0"
-                            SelectedIndexChanged="FloorPicker_SelectedIndexChanged" />
-                    </Grid>
-
-                    <!--  Category controls for toggling sublayer visibility.  -->
-                    <Label
-                        FontAttributes="Bold"
-                        FontSize="14"
-                        Text="Categories:" />
-                    <VerticalStackLayout x:Name="CategoriesStackLayout" Spacing="4" />
+                            Text="Categories:" />
+                        <VerticalStackLayout x:Name="CategoriesStackLayout" Spacing="4" />
 
-                    <!--  Instruction text.  -->
-                    <BoxView HeightRequest="1" Color="Gray" />
-                    <Label
-                        FontSize="12"
-                        Text="Tap on a building feature to view its attributes."
-                        TextColor="Gray" />
-                </VerticalStackLayout>
-            </ScrollView>
-        </Border>
+                        <!--  Instruction text.  -->
+                        <BoxView HeightRequest="1" Color="Gray" />
+                        <Label
+                            FontSize="12"
+                            Text="Tap on a building feature to view its attributes."
+                            TextColor="Gray" />
+                    </VerticalStackLayout>
+                </ScrollView>
 
-        <!--  Feature attributes panel, shown when a feature is selected.  -->
-        <Border
-            x:Name="FeaturePanel"
-            Margin="10"
-            Padding="16"
-            HorizontalOptions="End"
-            IsVisible="False"
-            Style="{DynamicResource EsriSampleControlPanel}"
-            VerticalOptions="Start"
-            WidthRequest="250">
+                <!--  Feature attributes panel, shown when a feature is selected.  -->
+                <Grid
+                    x:Name="FeaturePanel"
+                    IsVisible="False"
+                    RowDefinitions="Auto,*"
+                    RowSpacing="8">
+                    <!--  Header with close button.  -->
+                    <Grid Grid.Row="0">
+                        <Label
+                            FontAttributes="Bold"
+                            FontSize="14"
+                            HorizontalOptions="Start"
+                            Text="Feature Attributes"
+                            VerticalOptions="Center" />
+                        <Button
+                            BackgroundColor="Gray"
+                            Clicked="CloseFeatureButton_Clicked"
+                            FontSize="16"
+                            HorizontalOptions="End"
+                            Text="✖"
+                            TextColor="{AppThemeBinding Light=Black,
+                                                        Dark=White}" />
+                    </Grid>
 
-            <Grid RowDefinitions="Auto,*" RowSpacing="8">
-                <!--  Header with close button.  -->
-                <Grid Grid.Row="0">
-                    <Label
-                        FontAttributes="Bold"
-                        FontSize="14"
-                        HorizontalOptions="Start"
-                        Text="Feature Attributes"
-                        VerticalOptions="Center" />
-                    <Button
-                        BackgroundColor="Gray"
-                        Clicked="CloseFeatureButton_Clicked"
-                        FontSize="16"
-                        HorizontalOptions="End"
-                        Text="✖"
-                        TextColor="{AppThemeBinding Light=Black,
-                                                    Dark=White}" />
+                    <!--  Scrollable list of feature attributes.  -->
+                    <ScrollView Grid.Row="1">
+                        <CollectionView x:Name="FeatureAttributesCollection" ItemsLayout="VerticalList">
+                            <CollectionView.ItemTemplate>
+                                <DataTemplate x:DataType="local:BuildingSceneFeatureAttribute">
+                                    <VerticalStackLayout Margin="0,4" Spacing="2">
+                                        <Label FontAttributes="Bold" FontSize="12">
+                                            <Label.FormattedText>
+                                                <FormattedString>
+                                                    <Span FontAttributes="Bold" Text="{Binding Key}" />
+                                                    <Span Text=":" />
+                                                </FormattedString>
+                                            </Label.FormattedText>
+                                        </Label>
+                                        <Label
+                                            Margin="10,0,0,0"
+                                            FontSize="12"
+                                            Text="{Binding Value}"
+                                            TextColor="Gray" />
+                                    </VerticalStackLayout>
+                                </DataTemplate>
+                            </CollectionView.ItemTemplate>
+                        </CollectionView>
+                    </ScrollView>
                 </Grid>
-
-                <!--  Scrollable list of feature attributes.  -->
-                <ScrollView Grid.Row="1" MaximumHeightRequest="200">
-                    <CollectionView x:Name="FeatureAttributesCollection" ItemsLayout="VerticalList">
-                        <CollectionView.ItemTemplate>
-                            <DataTemplate x:DataType="local:BuildingSceneFeatureAttribute">
-                                <VerticalStackLayout Margin="0,4" Spacing="2">
-                                    <Label FontAttributes="Bold" FontSize="12">
-                                        <Label.FormattedText>
-                                            <FormattedString>
-                                                <Span FontAttributes="Bold" Text="{Binding Key}" />
-                                                <Span Text=":" />
-                                            </FormattedString>
-                                        </Label.FormattedText>
-                                    </Label>
-                                    <Label
-                                        Margin="10,0,0,0"
-                                        FontSize="12"
-                                        Text="{Binding Value}"
-                                        TextColor="Gray" />
-                                </VerticalStackLayout>
-                            </DataTemplate>
-                        </CollectionView.ItemTemplate>
-                    </CollectionView>
-                </ScrollView>
             </Grid>
         </Border>
     </Grid>
-</ContentPage>
\ No newline at end of file
+</ContentPage>

From 47aaafc22c1e3da8058bb6700f47ecdb034c7f08 Mon Sep 17 00:00:00 2001
From: praveenaa <pkulandhaivel@esri.com>
Date: Tue, 31 Mar 2026 11:23:11 -0700
Subject: [PATCH 4/5] Fix SnapGeometryEditsWithUtilityNetworkRules Snap Sources
 panel

---
 .../SnapGeometryEditsWithUtilityNetworkRules.xaml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/SnapGeometryEditsWithUtilityNetworkRules/SnapGeometryEditsWithUtilityNetworkRules.xaml b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/SnapGeometryEditsWithUtilityNetworkRules/SnapGeometryEditsWithUtilityNetworkRules.xaml
index 96bfb9178d..e2a3673aaf 100644
--- a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/SnapGeometryEditsWithUtilityNetworkRules/SnapGeometryEditsWithUtilityNetworkRules.xaml
+++ b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/SnapGeometryEditsWithUtilityNetworkRules/SnapGeometryEditsWithUtilityNetworkRules.xaml
@@ -150,7 +150,7 @@
                                              Light=White}"
                 HorizontalOptions="Center"
                 IsVisible="False"
-                HeightRequest="250"
+                MaximumHeightRequest="250"
                 StrokeShape="RoundRectangle 10"
                 VerticalOptions="Center"
                 WidthRequest="300">

From b9c5ea7d43fdec1909adc74ddd0545c093db9319 Mon Sep 17 00:00:00 2001
From: praveenaa <praveenaa2408@gmail.com>
Date: Thu, 2 Apr 2026 08:41:50 -0700
Subject: [PATCH 5/5] fix feature attribute scroll list

---
 .../FilterBuildingSceneLayer.xaml             | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/MAUI/Maui.Samples/Samples/Layers/FilterBuildingSceneLayer/FilterBuildingSceneLayer.xaml b/src/MAUI/Maui.Samples/Samples/Layers/FilterBuildingSceneLayer/FilterBuildingSceneLayer.xaml
index dc6d4acbe0..1588eb34eb 100644
--- a/src/MAUI/Maui.Samples/Samples/Layers/FilterBuildingSceneLayer/FilterBuildingSceneLayer.xaml
+++ b/src/MAUI/Maui.Samples/Samples/Layers/FilterBuildingSceneLayer/FilterBuildingSceneLayer.xaml
@@ -71,29 +71,31 @@
                     </Grid>
 
                     <!--  Scrollable list of feature attributes.  -->
-                    <ScrollView Grid.Row="1">
-                        <CollectionView x:Name="FeatureAttributesCollection" ItemsLayout="VerticalList">
-                            <CollectionView.ItemTemplate>
-                                <DataTemplate x:DataType="local:BuildingSceneFeatureAttribute">
-                                    <VerticalStackLayout Margin="0,4" Spacing="2">
-                                        <Label FontAttributes="Bold" FontSize="12">
-                                            <Label.FormattedText>
-                                                <FormattedString>
-                                                    <Span FontAttributes="Bold" Text="{Binding Key}" />
-                                                    <Span Text=":" />
-                                                </FormattedString>
-                                            </Label.FormattedText>
-                                        </Label>
-                                        <Label
-                                            Margin="10,0,0,0"
-                                            FontSize="12"
-                                            Text="{Binding Value}"
-                                            TextColor="Gray" />
-                                    </VerticalStackLayout>
-                                </DataTemplate>
-                            </CollectionView.ItemTemplate>
-                        </CollectionView>
-                    </ScrollView>
+                    <CollectionView
+                        x:Name="FeatureAttributesCollection"
+                        Grid.Row="1"
+                        ItemsLayout="VerticalList"
+                        MaximumHeightRequest="400">
+                        <CollectionView.ItemTemplate>
+                            <DataTemplate x:DataType="local:BuildingSceneFeatureAttribute">
+                                <VerticalStackLayout Margin="0,4" Spacing="2">
+                                    <Label FontAttributes="Bold" FontSize="12">
+                                        <Label.FormattedText>
+                                            <FormattedString>
+                                                <Span FontAttributes="Bold" Text="{Binding Key}" />
+                                                <Span Text=":" />
+                                            </FormattedString>
+                                        </Label.FormattedText>
+                                    </Label>
+                                    <Label
+                                        Margin="10,0,0,0"
+                                        FontSize="12"
+                                        Text="{Binding Value}"
+                                        TextColor="Gray" />
+                                </VerticalStackLayout>
+                            </DataTemplate>
+                        </CollectionView.ItemTemplate>
+                    </CollectionView>
                 </Grid>
             </Grid>
         </Border>