Merge pull request #5 from Esri/v.next

V.next

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/ArcGISRuntimeSDKDotNet_DesktopSamples.csproj

@@ -223,7 +223,7 @@
     <Compile Include="Samples\GeoprocessingTasks\Viewshed.xaml.cs">
       <DependentUpon>Viewshed.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Samples\GraphicsLayers\MovePoints.xaml.cs">
+    <Compile Include="Samples\Editing\MovePoints.xaml.cs">
       <DependentUpon>MovePoints.xaml</DependentUpon>
     </Compile>
     <Compile Include="Samples\GraphicsLayers\AddInteractively.xaml.cs">
@@ -253,9 +253,6 @@
     <Compile Include="Samples\GraphicsLayers\GraphicsSourceSample.xaml.cs">
       <DependentUpon>GraphicsSourceSample.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Samples\GraphicsLayers\SmoothGraphicAnimation.xaml.cs">
-      <DependentUpon>SmoothGraphicAnimation.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Samples\ImageryTasks\ComputeClassStatistics.xaml.cs">
       <DependentUpon>ComputeClassStatistics.xaml</DependentUpon>
     </Compile>
@@ -651,7 +648,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Samples\GraphicsLayers\MovePoints.xaml">
+    <Page Include="Samples\Editing\MovePoints.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -691,10 +688,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Samples\GraphicsLayers\SmoothGraphicAnimation.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Samples\ImageryTasks\ComputeClassStatistics.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/DynamicServiceLayers/ArcGISDynamicMapServiceLayerLocalSample.xaml.cs

@@ -16,8 +16,6 @@ namespace ArcGISRuntimeSDKDotNet_DesktopSamples.Samples
 	/// <subcategory>Dynamic Service Layers</subcategory>
 	public partial class ArcGISDynamicMapServiceLayerLocalSample : UserControl
     {
-
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ArcGISDynamicMapServiceLayerLocalSample"/> class.
         /// </summary>
@@ -27,7 +25,7 @@ public ArcGISDynamicMapServiceLayerLocalSample()
 
             InitializeComponent();
 
-            CreateLocalServiceAndDynamicLayer();
+            var _ = CreateLocalServiceAndDynamicLayer();
         }
 
         public async Task CreateLocalServiceAndDynamicLayer() 
@@ -44,7 +42,7 @@ public async Task CreateLocalServiceAndDynamicLayer()
                     ServiceUri = localMapService.UrlMapService,
                 };
 
-								MyMapView.Map.Layers.Add(arcGISDynamicMapServiceLayer);
+				MyMapView.Map.Layers.Add(arcGISDynamicMapServiceLayer);
             }
             catch (Exception ex)
             {

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/GraphicsLayers/MovePoints.xaml.cs → src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/Editing/MovePoints.xaml.cs

@@ -1,24 +1,18 @@
 using Esri.ArcGISRuntime.Controls;
 using Esri.ArcGISRuntime.Geometry;
 using Esri.ArcGISRuntime.Layers;
-using Esri.ArcGISRuntime.Symbology;
 using System;
-using System.ComponentModel;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Controls;
 
 namespace ArcGISRuntimeSDKDotNet_DesktopSamples.Samples
 {
     /// <summary>
-    /// Move point graphics around using hittesting and mouse move.
-	/// </summary>
-    /// <title>Move point graphics interactively</title>
-	/// <category>Layers</category>
-	/// <subcategory>Graphics Layers</subcategory>
-	public partial class MovePoints : UserControl
+    /// Demonstrates one method of moving graphic points on the map.
+    /// </summary>
+    /// <title>Move Points</title>
+    /// <category>Editing</category>
+    public partial class MovePoints : UserControl
     {
-
         public MovePoints()
         {
 			InitializeComponent();

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/GeocodingTasks/GeocodeFullAddressInput.xaml.cs

@@ -111,7 +111,7 @@ public GeocodeFullAddressInput()
 
             _candidateAddressesGraphicsLayer = map1.Layers["CandidateAddressesGraphicsLayer"] as GraphicsLayer;
 
-            SetSimpleRendererSymbols();
+            var _ = SetSimpleRendererSymbols();
         }
 
         private async Task SetSimpleRendererSymbols()
@@ -132,7 +132,7 @@ private async Task SetSimpleRendererSymbols()
             _candidateAddressesGraphicsLayer.Renderer = findResultRenderer;
         }
 
-        private async Task SetupLocator()
+        private void SetupLocator()
         {
             if (!IsOnline)
             {
@@ -142,7 +142,6 @@ private async Task SetupLocator()
             {
                 _locatorTask = new OnlineLocatorTask(new Uri("http://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer"), string.Empty);
             }
-
         }
 
         private async void FindButton_Click(object sender, RoutedEventArgs e)

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/GeocodingTasks/GeocodeSingleLineInput.xaml.cs

@@ -93,13 +93,11 @@ public GeocodeSingleLineInput()
 
             _candidateAddressesGraphicsLayer = map1.Layers["CandidateAddressesGraphicsLayer"] as GraphicsLayer;
 
-            SetSimpleRendererSymbols();
+            var _ = SetSimpleRendererSymbols();
         }
 
-
         private async Task SetSimpleRendererSymbols()
         {
-
             PictureMarkerSymbol findResultMarkerSymbol = new PictureMarkerSymbol()
             {
                 Width = 48,
@@ -115,7 +113,7 @@ private async Task SetSimpleRendererSymbols()
             _candidateAddressesGraphicsLayer.Renderer = findResultRenderer;
         }
 
-        private async Task SetupLocator()
+        private void SetupLocator()
         {
             if (!IsOnline)
             {
@@ -129,7 +127,6 @@ private async Task SetupLocator()
 
         private async void FindButton_Click(object sender, RoutedEventArgs e)
         {
-
             _candidateAddressesGraphicsLayer.Graphics.Clear();
 
             string text = SearchTextBox.Text;

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/GraphicsLayers/GraphicsLayerSample.xaml.cs

@@ -9,7 +9,7 @@ namespace ArcGISRuntimeSDKDotNet_DesktopSamples.Samples
     /// <summary>
     /// This sample demonstrates how to add a GraphicsLayer with Graphics and Symbols to the map in XAML.  The sample also shows how to add Polyline graphics to a GraphicsLayer from the code-behind.
     /// </summary>
-    /// <title>Graphics Layer Sample</title>
+    /// <title>Graphics Layer</title>
 	/// <category>Layers</category>
 	/// <subcategory>Graphics Layers</subcategory>
 	public partial class GraphicsLayerSample : UserControl

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/Mapping/LayersInitialized.xaml.cs

@@ -49,10 +49,10 @@ public LayersInitialized()
 
             InitializeComponent();
 
-            HandleLayersInitialized();
+            var _ = HandleLayersInitialized();
         }
 
-        async Task HandleLayersInitialized()
+        private async Task HandleLayersInitialized()
         {
             var loadresult = await mapView1.LayersLoadedAsync();
             LayersInitializedProperty = "Initialized!";
@@ -63,7 +63,6 @@ async Task HandleLayersInitialized()
                   MessageBox.Show(string.Format("Layer {0} failed to load. {1} ", res.Layer.ID, res.LoadError.Message.ToString()));
                 }
             }
-
         }
     }
 }

src/Desktop/ArcGISRuntimeSDKDotNet_DesktopSamples/Samples/NetworkAnalystTasks/RoutingPointToPoint.xaml.cs

@@ -141,7 +141,7 @@ public string EndLocationText
         string _localRoutingDatabase = @"..\..\..\..\..\samples-data\networks\san-diego\san-diego-network.geodatabase";
         string _networkName = "Streets_ND";
 
-        private async Task SetupRouteTask()
+        private void SetupRouteTask()
         {
             if (!IsOnline)
             {
@@ -265,9 +265,16 @@ private async Task CalculateRoute()
 
         }
 
-        private void SolveRouteButton_Click(object sender, RoutedEventArgs e)
+        private async void SolveRouteButton_Click(object sender, RoutedEventArgs e)
         {
-            CalculateRoute();
+            try
+            {
+                await CalculateRoute();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Sample Error");
+            }
         }
     }
 }