Skip to content

Commit 2f493eb

Browse files
nCastle1nCastle1
authored
Merge pull request #556 from Esri/v.next
Merge v.next into master
2 parents 0f5c1f1 + 6bc1194 commit 2f493eb

File tree

451 files changed

+8072
-5689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

451 files changed

+8072
-5689
lines changed

‎src/Android/Xamarin.Android/ArcGISRuntime.Xamarin.Samples.Android.csproj‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<AndroidApplication>true</AndroidApplication>
1717
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1818
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
19-
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
2019
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
2120
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
2221
<NuGetPackageImportStamp>
@@ -59,11 +58,11 @@
5958
</PropertyGroup>
6059
<!-- References -->
6160
<ItemGroup>
62-
<Reference Include="Esri.ArcGISRuntime, Version=100.3.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
63-
<HintPath>..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.3.0\lib\MonoAndroid10\Esri.ArcGISRuntime.dll</HintPath>
61+
<Reference Include="Esri.ArcGISRuntime, Version=100.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
62+
<HintPath>..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.4.0\lib\MonoAndroid10\Esri.ArcGISRuntime.dll</HintPath>
6463
</Reference>
65-
<Reference Include="Esri.ArcGISRuntime.Hydrography, Version=100.3.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
66-
<HintPath>..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.3.0\lib\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.dll</HintPath>
64+
<Reference Include="Esri.ArcGISRuntime.Hydrography, Version=100.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
65+
<HintPath>..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.4.0\lib\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.dll</HintPath>
6766
</Reference>
6867
<Reference Include="Java.Interop" />
6968
<Reference Include="Mono.Android" />
@@ -113,8 +112,12 @@
113112
<HintPath>..\..\..\packages\Xamarin.Auth.1.5.0.3\lib\MonoAndroid10\Xamarin.Auth.dll</HintPath>
114113
</Reference>
115114
</ItemGroup>
116-
<!-- Screenshots -->
117115
<ItemGroup>
116+
<!-- Screenshots -->
117+
<None Include="Samples\Layers\ListKmlContents\ListKmlContents.jpg" />
118+
<None Include="Samples\Layers\IdentifyKmlFeatures\IdentifyKmlFeatures.jpg" />
119+
<None Include="Samples\Layers\DisplayKmlNetworkLinks\DisplayKmlNetworkLinks.jpg" />
120+
<None Include="Samples\Layers\DisplayKml\DisplayKml.jpg" />
118121
<None Include="Samples\Network Analysis\ClosestFacilityStatic\ClosestFacilityStatic.jpg" />
119122
<None Include="Samples\Analysis\DistanceMeasurement\DistanceMeasurement.jpg" />
120123
<None Include="Samples\Analysis\LineOfSightGeoElement\LineOfSightGeoElement.jpg" />
@@ -239,9 +242,14 @@
239242
<None Include="Samples\Symbology\RenderUniqueValues\RenderUniqueValues.jpg" />
240243
<None Include="Samples\Symbology\SimpleRenderers\SimpleRenderers.jpg" />
241244
<None Include="Samples\Symbology\UseDistanceCompositeSym\UseDistanceCompositeSym.jpg" />
245+
<None Include="Samples\Security\IntegratedWindowsAuth\readme.md" />
242246
</ItemGroup>
243-
<!-- Sample Code -->
244247
<ItemGroup>
248+
<!-- Sample Code -->
249+
<Compile Include="Samples\Layers\ListKmlContents\ListKmlContents.cs" />
250+
<Compile Include="Samples\Layers\IdentifyKmlFeatures\IdentifyKmlFeatures.cs" />
251+
<Compile Include="Samples\Layers\DisplayKmlNetworkLinks\DisplayKmlNetworkLinks.cs" />
252+
<Compile Include="Samples\Layers\DisplayKml\DisplayKml.cs" />
245253
<Compile Include="Samples\Analysis\DistanceMeasurement\DistanceMeasurement.cs" />
246254
<Compile Include="Samples\Analysis\LineOfSightGeoElement\LineOfSightGeoElement.cs" />
247255
<Compile Include="Samples\Analysis\LineOfSightLocation\LineOfSightLocation.cs" />
@@ -363,13 +371,13 @@
363371
<Compile Include="Samples\Search\FindPlace\FindPlace.cs" />
364372
<Compile Include="Samples\Security\OAuth\OAuth.cs" />
365373
<Compile Include="Samples\Security\TokenSecuredChallenge\TokenSecuredChallenge.cs" />
366-
<Compile Include="Samples\Security\TokenSecuredKnownUser\TokenSecuredKnownUser.cs" />
367374
<Compile Include="Samples\Symbology\FeatureLayerExtrusion\FeatureLayerExtrusion.cs" />
368375
<Compile Include="Samples\Symbology\RenderPictureMarkers\RenderPictureMarkers.cs" />
369376
<Compile Include="Samples\Symbology\RenderSimpleMarkers\RenderSimpleMarkers.cs" />
370377
<Compile Include="Samples\Symbology\RenderUniqueValues\RenderUniqueValues.cs" />
371378
<Compile Include="Samples\Symbology\SimpleRenderers\SimpleRenderers.cs" />
372379
<Compile Include="Samples\Symbology\UseDistanceCompositeSym\UseDistanceCompositeSym.cs" />
380+
<Compile Include="Samples\Security\IntegratedWindowsAuth\IntegratedWindowsAuth.cs" />
373381
</ItemGroup>
374382
<!-- Sample Manager Code -->
375383
<ItemGroup>
@@ -427,18 +435,23 @@
427435
<ItemGroup>
428436
<None Include="Samples\Security\OAuth\OAuth.jpg" />
429437
<None Include="Samples\Security\TokenSecuredChallenge\TokenSecuredChallenge.jpg" />
430-
<None Include="Samples\Security\TokenSecuredKnownUser\TokenSecuredKnownUser.jpg" />
438+
</ItemGroup>
439+
<ItemGroup>
440+
<AndroidResource Include="Resources\layout\ListKmlContents.axml">
441+
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
442+
<SubType>Designer</SubType>
443+
</AndroidResource>
431444
</ItemGroup>
432445
<!-- Imports -->
433446
<Import Project="..\..\ArcGISRuntime.Samples.Shared\ArcGISRuntime.Samples.Shared.projitems" Label="Shared" />
434447
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
435-
<Import Project="..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets" Condition="Exists('..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets')" />
448+
<Import Project="..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets" Condition="Exists('..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets')" />
436449
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
437450
<PropertyGroup>
438451
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
439452
</PropertyGroup>
440-
<Error Condition="!Exists('..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets'))" />
441-
<Error Condition="!Exists('..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets'))" />
453+
<Error Condition="!Exists('..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets'))" />
454+
<Error Condition="!Exists('..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets'))" />
442455
</Target>
443-
<Import Project="..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets" Condition="Exists('..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets')" />
456+
<Import Project="..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets" Condition="Exists('..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets')" />
444457
</Project>

‎src/Android/Xamarin.Android/Properties/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" android:installLocation="auto" package="ArcGISRuntimeSDK_Xamarin_Android">
3-
<uses-sdk android:minSdkVersion="16" />
3+
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
44
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
55
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
66
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

‎src/Android/Xamarin.Android/Resources/layout/Animate3DGraphic.axml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
android:id="@+id/Animate3DGraphicLayout">
8-
<Esri.ArcGISRuntime.UI.SceneView
8+
<Esri.ArcGISRuntime.UI.Controls.SceneView
99
android:id="@+id/PrimarySceneView"
1010
android:layout_width="0dp"
1111
android:layout_height="0dp"
@@ -51,7 +51,7 @@
5151
style="@android:style/Widget.Material.Button.Borderless.Colored" />
5252
</TableRow>
5353
</TableLayout>
54-
<Esri.ArcGISRuntime.UI.MapView
54+
<Esri.ArcGISRuntime.UI.Controls.MapView
5555
android:id="@+id/insetMap"
5656
android:layout_width="120dp"
5757
android:layout_height="120dp"

‎src/Android/Xamarin.Android/Resources/layout/Buffer.axml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
android:layout_width="match_parent"
7575
android:layout_height="match_parent"
7676
android:layout_weight="1">
77-
<Esri.ArcGISRuntime.UI.MapView
77+
<Esri.ArcGISRuntime.UI.Controls.MapView
7878
android:id="@+id/buffer_mapView"
7979
android:layout_width="match_parent"
8080
android:layout_height="match_parent"

‎src/Android/Xamarin.Android/Resources/layout/DistanceMeasurement.axml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
android:layout_width="match_parent"
8989
android:layout_height="match_parent"
9090
android:layout_weight="1">
91-
<Esri.ArcGISRuntime.UI.SceneView
91+
<Esri.ArcGISRuntime.UI.Controls.SceneView
9292
android:id="@+id/distanceMeasurement_sceneView"
9393
android:layout_width="match_parent"
9494
android:layout_height="match_parent"

‎src/Android/Xamarin.Android/Resources/layout/FeatureLayerRenderingModeMapLayout.axml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:text="Static:"
88
android:layout_width="fill_parent"
99
android:layout_height="wrap_content" />
10-
<Esri.ArcGISRuntime.UI.MapView
10+
<Esri.ArcGISRuntime.UI.Controls.MapView
1111
android:layout_width="match_parent"
1212
android:layout_height="wrap_content"
1313
android:layout_weight="1"
@@ -16,7 +16,7 @@
1616
android:text="Dynamic:"
1717
android:layout_width="fill_parent"
1818
android:layout_height="wrap_content" />
19-
<Esri.ArcGISRuntime.UI.MapView
19+
<Esri.ArcGISRuntime.UI.Controls.MapView
2020
android:layout_width="match_parent"
2121
android:layout_height="wrap_content"
2222
android:layout_weight="1"

‎src/Android/Xamarin.Android/Resources/layout/GeoViewSync.axml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
android:orientation="vertical"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent">
6-
<Esri.ArcGISRuntime.UI.MapView
6+
<Esri.ArcGISRuntime.UI.Controls.MapView
77
android:layout_width="match_parent"
88
android:layout_height="wrap_content"
99
android:layout_weight="1"
1010
android:id="@+id/GeoViewSync_MyMapView" />
11-
<Esri.ArcGISRuntime.UI.SceneView
11+
<Esri.ArcGISRuntime.UI.Controls.SceneView
1212
android:layout_width="match_parent"
1313
android:layout_height="wrap_content"
1414
android:layout_weight="1"

‎src/Android/Xamarin.Android/Resources/layout/ListKmlContents.axml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:orientation="vertical"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent">
6+
<LinearLayout
7+
android:layout_weight="1"
8+
android:layout_width="fill_parent"
9+
android:layout_height="0dp">
10+
<ListView
11+
android:layout_width="fill_parent"
12+
android:layout_height="wrap_content"
13+
14+
android:id="@+id/ListKmlContents_ContentList" />
15+
</LinearLayout>
16+
17+
<LinearLayout
18+
android:layout_weight="1"
19+
android:layout_width="fill_parent"
20+
android:layout_height="0dp">
21+
<Esri.ArcGISRuntime.UI.Controls.SceneView
22+
android:layout_width="fill_parent"
23+
android:layout_height="fill_parent"
24+
android:layout_alignParentBottom="true"
25+
android:id="@+id/ListKmlContents_MySceneView" />
26+
</LinearLayout>
27+
</LinearLayout>
28+
29+
30+
31+

‎src/Android/Xamarin.Android/Samples/Analysis/DistanceMeasurement/DistanceMeasurement.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ public class DistanceMeasurement : Activity
4040
// URLs to various services used to provide an interesting scene for the sample.
4141
private readonly Uri _buildingService =
4242
new Uri(
43-
"http://tiles.arcgis.com/tiles/P3ePLMYs2RVChkJx/arcgis/rest/services/Buildings_Brest/SceneServer/layers/0");
43+
"https://tiles.arcgis.com/tiles/P3ePLMYs2RVChkJx/arcgis/rest/services/Buildings_Brest/SceneServer/layers/0");
4444

4545
private readonly Uri _worldElevationService =
46-
new Uri("http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer");
46+
new Uri("https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer");
4747

4848
// Reference to the measurement used.
4949
private LocationDistanceMeasurement _distanceMeasurement;

‎src/Android/Xamarin.Android/Samples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class LineOfSightGeoElement : Activity
4242
private SeekBar _myHeightSlider;
4343

4444
// URL of the elevation service - provides elevation component of the scene
45-
private readonly Uri _elevationUri = new Uri("http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer");
45+
private readonly Uri _elevationUri = new Uri("https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer");
4646

4747
// URL of the building service - provides builidng models
4848
private readonly Uri _buildingsUri = new Uri("https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/New_York_LoD2_3D_Buildings/SceneServer/layers/0");

0 commit comments

Comments
 (0)