Skip to content

Commit 2f76861

Browse files
authored
Fix list kml contents (#1705)
1 parent 41468e4 commit 2f76861

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

src/MAUI/Maui.Samples/Samples/Layers/ListKmlContents/ListKmlContents.xaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@
1313
<Label Grid.Row="0"
1414
HorizontalTextAlignment="Center"
1515
Text="Tap to zoom to KML content." />
16-
<ListView x:Name="LayerTreeView"
16+
<CollectionView x:Name="LayerTreeView"
1717
Grid.Row="1"
18-
ItemSelected="LayerTreeView_OnSelectionChanged">
19-
<ListView.ItemTemplate>
18+
SelectionMode="Single"
19+
SelectionChanged="LayerTreeView_SelectionChanged">
20+
<CollectionView.ItemTemplate>
2021
<DataTemplate x:DataType="local:LayerDisplayVM">
21-
<TextCell Text="{Binding Name}" />
22+
<Label Text="{Binding Name}" />
2223
</DataTemplate>
23-
</ListView.ItemTemplate>
24-
</ListView>
24+
</CollectionView.ItemTemplate>
25+
</CollectionView>
2526
</Grid>
2627
</Border>
2728
</Grid>

src/MAUI/Maui.Samples/Samples/Layers/ListKmlContents/ListKmlContents.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ private async Task Initialize()
5858
{
5959
// LayerDisplayVM is a custom type made for this sample to serve as the ViewModel; it is not a part of ArcGIS Maps SDK for .NET.
6060
LayerDisplayVM nodeVm = new LayerDisplayVM(node, null);
61-
_viewModelList.Add(nodeVm);
6261
LayerDisplayVM.BuildLayerInfoList(nodeVm, _viewModelList);
6362
}
6463

@@ -71,10 +70,10 @@ private async Task Initialize()
7170
}
7271
}
7372

74-
private void LayerTreeView_OnSelectionChanged(object sender, SelectedItemChangedEventArgs e)
73+
private void LayerTreeView_SelectionChanged(object sender, SelectionChangedEventArgs e)
7574
{
7675
// Get the KML node.
77-
LayerDisplayVM selectedItem = (LayerDisplayVM)e.SelectedItem;
76+
LayerDisplayVM selectedItem = (LayerDisplayVM)e.CurrentSelection.First();
7877

7978
_ = NavigateToNode(selectedItem.Node);
8079
}
@@ -266,6 +265,7 @@ private async Task<Viewpoint> GetAltitudeAdjustedViewpointAsync(KmlNode node, Vi
266265
}
267266

268267
#endregion viewpoint_conversion
268+
269269
}
270270

271271
public class LayerDisplayVM

src/WPF/WPF.Viewer/Samples/Layers/ListKmlContents/ListKmlContents.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ private async Task Initialize()
6262
{
6363
// LayerDisplayVM is a custom type made for this sample to serve as the ViewModel; it is not a part of ArcGIS Maps SDK for .NET.
6464
LayerDisplayVM nodeVm = new LayerDisplayVM(node, null);
65+
LayerDisplayVM.BuildNodeTree(nodeVm);
6566
_viewModelList.Add(nodeVm);
66-
LayerDisplayVM.BuildLayerInfoList(nodeVm, _viewModelList);
6767
}
6868

6969
// Update the list of layers, using the root node from the list.
@@ -292,7 +292,7 @@ public override string ToString()
292292
return Node.GetType().Name + " - " + Node.Name;
293293
}
294294

295-
public static void BuildLayerInfoList(LayerDisplayVM root, IList<LayerDisplayVM> result)
295+
public static void BuildNodeTree(LayerDisplayVM root)
296296
{
297297
// Make the node visible.
298298
root.Node.IsVisible = true;
@@ -324,7 +324,7 @@ public static void BuildLayerInfoList(LayerDisplayVM root, IList<LayerDisplayVM>
324324
root.Children.Add(layerVm);
325325

326326
// Recursively add children.
327-
BuildLayerInfoList(layerVm, result);
327+
BuildNodeTree(layerVm);
328328
}
329329
}
330330
}

src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/ListKmlContents/ListKmlContents.xaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ private async Task Initialize()
6262
{
6363
// LayerDisplayVM is a custom type made for this sample to serve as the ViewModel; it is not a part of ArcGIS Maps SDK for .NET.
6464
LayerDisplayVM nodeVm = new LayerDisplayVM(node, null);
65-
_viewModelList.Add(nodeVm);
6665
LayerDisplayVM.BuildLayerInfoList(nodeVm, _viewModelList);
6766
}
6867

0 commit comments

Comments
 (0)