Skip to content

Commit 8f666ca

Browse files
ZackAllenZackAllen
authored
Update 9 (Esri#822)
* Moved all projects to 100.9.0 * Support for dark mode on Xamarin.iOS * Sample update: Surface placement (Esri#806) * New sample: Show popup (Esri#812)
1 parent 1074102 commit 8f666ca

File tree

1,297 files changed

+6030
-2186
lines changed

Some content is hidden

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

1,297 files changed

+6030
-2186
lines changed

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

+19-8
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
</ItemGroup>
8181
<ItemGroup>
8282
<!-- Screenshots -->
83+
<None Include="Samples\Layers\ShowPopup\ShowPopup.jpg" />
8384
<None Include="Samples\SceneView\AnimateImageOverlay\AnimateImageOverlay.jpg" />
8485
<None Include="Samples\Layers\IdentifyRasterCell\IdentifyRasterCell.jpg" />
8586
<None Include="Samples\Utility network\DisplayUtilityAssociations\DisplayUtilityAssociations.jpg" />
@@ -273,6 +274,7 @@
273274
</ItemGroup>
274275
<ItemGroup>
275276
<!-- Sample Code -->
277+
<Compile Include="Samples\Layers\ShowPopup\ShowPopup.cs" />
276278
<Compile Include="Samples\SceneView\AnimateImageOverlay\AnimateImageOverlay.cs" />
277279
<Compile Include="Samples\Layers\IdentifyRasterCell\IdentifyRasterCell.cs" />
278280
<Compile Include="Samples\Utility network\DisplayUtilityAssociations\DisplayUtilityAssociations.cs" />
@@ -568,13 +570,16 @@
568570
</ItemGroup>
569571
<ItemGroup>
570572
<PackageReference Include="Esri.ArcGISRuntime.ARToolkit">
571-
<Version>100.8.0</Version>
573+
<Version>100.9.0</Version>
572574
</PackageReference>
573575
<PackageReference Include="Esri.ArcGISRuntime.Hydrography">
574-
<Version>100.8.0</Version>
576+
<Version>100.9.0</Version>
577+
</PackageReference>
578+
<PackageReference Include="Esri.ArcGISRuntime.Toolkit">
579+
<Version>100.9.0</Version>
575580
</PackageReference>
576581
<PackageReference Include="Esri.ArcGISRuntime.Xamarin.Android">
577-
<Version>100.8.0</Version>
582+
<Version>100.9.0</Version>
578583
</PackageReference>
579584
<PackageReference Include="PCLCrypto">
580585
<Version>2.0.147</Version>
@@ -692,11 +697,6 @@
692697
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
693698
</AndroidResource>
694699
</ItemGroup>
695-
<ItemGroup>
696-
<AndroidResource Include="Resources\layout\SurfacePlacements.axml">
697-
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
698-
</AndroidResource>
699-
</ItemGroup>
700700
<ItemGroup>
701701
<AndroidResource Include="Resources\layout\TraceUtilityNetwork.axml">
702702
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
@@ -742,11 +742,22 @@
742742
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
743743
</AndroidResource>
744744
</ItemGroup>
745+
<ItemGroup>
746+
<AndroidResource Include="Resources\layout\SurfacePlacements.xml">
747+
<SubType>Designer</SubType>
748+
</AndroidResource>
749+
</ItemGroup>
745750
<ItemGroup>
746751
<AndroidResource Include="Resources\layout\AnimateImageOverlay.xml">
747752
<SubType>Designer</SubType>
748753
</AndroidResource>
749754
</ItemGroup>
755+
<ItemGroup>
756+
<AndroidResource Include="Resources\layout\ShowPopup.xml">
757+
<SubType>Designer</SubType>
758+
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
759+
</AndroidResource>
760+
</ItemGroup>
750761
<!-- Imports -->
751762
<Import Project="..\..\ArcGISRuntime.Samples.Shared\ArcGISRuntime.Samples.Shared.projitems" Label="Shared" />
752763
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
android:id="@+id/cameraButton"
3636
android:layout_width="wrap_content"
3737
android:layout_height="wrap_content"
38-
android:text="Camera"
38+
android:text="Follow"
3939
style="@android:style/Widget.Material.Button.Borderless.Colored" />
4040
<Button
4141
android:id="@+id/statsButton"

‎src/Android/Xamarin.Android/Resources/layout/ShowPopup.xml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<android.support.constraint.ConstraintLayout
2+
xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:id="@+id/TraceUtilityNetwork">
8+
<Esri.ArcGISRuntime.UI.Controls.MapView
9+
android:id="@+id/MapView"
10+
android:layout_width="match_parent"
11+
android:layout_height="0dp"
12+
android:layout_weight="1"
13+
app:layout_constraintTop_toTopOf="parent"
14+
app:layout_constraintBottom_toTopOf="@+id/instructionsLabel"/>
15+
<TextView
16+
android:id="@+id/instructionsLabel"
17+
android:text="Tap a feature to display its popup."
18+
android:layout_width="match_parent"
19+
android:layout_height="0dp"
20+
android:layout_weight="1"
21+
app:layout_constraintTop_toBottomOf="@+id/MapView"
22+
app:layout_constraintBottom_toTopOf="@+id/popupViewer"/>
23+
<Esri.ArcGISRuntime.Toolkit.UI.Controls.PopupViewer
24+
android:id="@+id/popupViewer"
25+
android:layout_width="match_parent"
26+
android:layout_height="0dp"
27+
android:layout_weight="1"
28+
android:visibility="invisible"
29+
app:layout_constraintEnd_toEndOf="parent"
30+
app:layout_constraintStart_toStartOf="parent"
31+
app:layout_constraintBottom_toBottomOf="parent"/>
32+
</android.support.constraint.ConstraintLayout>

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

-38
This file was deleted.

‎src/Android/Xamarin.Android/Resources/layout/SurfacePlacements.xml

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<android.support.constraint.ConstraintLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
xmlns:tools="http://schemas.android.com/tools"
6+
android:layout_width="match_parent"
7+
android:layout_height="match_parent"
8+
android:id="@+id/SurfacePlacements">
9+
<Esri.ArcGISRuntime.UI.Controls.SceneView
10+
android:id="@+id/SceneView"
11+
android:layout_width="match_parent"
12+
android:layout_height="0dp"
13+
app:layout_constraintTop_toTopOf="parent"
14+
app:layout_constraintBottom_toTopOf="@id/Toolbar"/>
15+
<android.support.constraint.ConstraintLayout
16+
android:id="@+id/Toolbar"
17+
android:layout_width="match_parent"
18+
android:layout_height="wrap_content"
19+
app:layout_constraintTop_toBottomOf="@+id/SceneView"
20+
app:layout_constraintBottom_toTopOf="@+id/radioGroup"
21+
android:padding="10dp">
22+
<TextView
23+
android:id="@+id/Label"
24+
android:layout_width="wrap_content"
25+
android:layout_height="wrap_content"
26+
android:text="Z Value"/>
27+
<SeekBar
28+
android:id="@+id/Slider"
29+
android:layout_width="0dp"
30+
android:layout_height="wrap_content"
31+
android:min="0"
32+
android:max="140"
33+
android:progress="70"
34+
app:layout_constraintLeft_toRightOf="@+id/Label"
35+
app:layout_constraintRight_toLeftOf="@+id/ValueLabel"/>
36+
<TextView
37+
android:id="@+id/ValueLabel"
38+
android:layout_width="wrap_content"
39+
android:layout_height="wrap_content"
40+
android:text="70 meters"
41+
app:layout_constraintLeft_toRightOf="@+id/Slider"
42+
app:layout_constraintRight_toRightOf="parent"/>
43+
</android.support.constraint.ConstraintLayout>
44+
<RadioGroup
45+
android:id="@+id/radioGroup"
46+
android:layout_width="match_parent"
47+
android:layout_height="wrap_content"
48+
app:layout_constraintEnd_toEndOf="parent"
49+
app:layout_constraintStart_toStartOf="parent"
50+
app:layout_constraintBottom_toBottomOf="parent"
51+
android:orientation="horizontal" >
52+
<RadioButton
53+
android:id="@+id/billboardedButton"
54+
android:layout_width="0dp"
55+
android:layout_height="match_parent"
56+
android:text="Draped Billboarded"
57+
android:layout_weight="1"
58+
android:checked="true"/>
59+
<RadioButton
60+
android:id="@+id/flatButton"
61+
android:layout_width="0dp"
62+
android:layout_height="match_parent"
63+
android:text="Draped Flat"
64+
android:layout_weight="1"/>
65+
</RadioGroup>
66+
</android.support.constraint.ConstraintLayout>

‎src/Android/Xamarin.Android/Samples/Analysis/DistanceMeasurement/readme.metadata.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"measure"
1414
],
1515
"nuget_packages": {
16-
"Esri.ArcGISRuntime": "100.8.0"
16+
"Esri.ArcGISRuntime": "100.9.0",
17+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0"
1718
},
1819
"offline_data": [],
1920
"redirect_from": [

‎src/Android/Xamarin.Android/Samples/Analysis/LineOfSightGeoElement/readme.metadata.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"visibility analysis"
1414
],
1515
"nuget_packages": {
16-
"Esri.ArcGISRuntime": "100.8.0"
16+
"Esri.ArcGISRuntime": "100.9.0",
17+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0"
1718
},
1819
"offline_data": [
1920
"3af5cfec0fd24dac8d88aea679027cb9"

‎src/Android/Xamarin.Android/Samples/Analysis/LineOfSightLocation/readme.metadata.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"visibility analysis"
1414
],
1515
"nuget_packages": {
16-
"Esri.ArcGISRuntime": "100.8.0"
16+
"Esri.ArcGISRuntime": "100.9.0",
17+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0"
1718
},
1819
"offline_data": [],
1920
"redirect_from": [

‎src/Android/Xamarin.Android/Samples/Analysis/QueryFeatureCountAndExtent/readme.metadata.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"query"
1717
],
1818
"nuget_packages": {
19-
"Esri.ArcGISRuntime": "100.8.0"
19+
"Esri.ArcGISRuntime": "100.9.0",
20+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0"
2021
},
2122
"offline_data": [],
2223
"redirect_from": [

‎src/Android/Xamarin.Android/Samples/Analysis/ViewshedCamera/readme.metadata.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"visibility analysis"
1414
],
1515
"nuget_packages": {
16-
"Esri.ArcGISRuntime": "100.8.0"
16+
"Esri.ArcGISRuntime": "100.9.0",
17+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0"
1718
},
1819
"offline_data": [],
1920
"redirect_from": [

‎src/Android/Xamarin.Android/Samples/Analysis/ViewshedGeoElement/readme.metadata.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"visibility analysis"
1717
],
1818
"nuget_packages": {
19-
"Esri.ArcGISRuntime": "100.8.0"
19+
"Esri.ArcGISRuntime": "100.9.0",
20+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0"
2021
},
2122
"offline_data": [
2223
"07d62a792ab6496d9b772a24efea45d0"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace ArcGISRuntime.Samples.ViewshedLocation
2828
category: "Analysis",
2929
description: "Perform a viewshed analysis from a defined vantage point. ",
3030
instructions: "Use the sliders to change the properties (heading, pitch, etc.), of the viewshed and see them updated in real time.",
31-
tags: new[] { "3D", "LocationViewshed", "Scene", "frustum", "viewshed", "visibility analysis" })]
31+
tags: new[] { "3D", "frustum", "scene", "viewshed", "visibility analysis" })]
3232
public class ViewshedLocation : Activity
3333
{
3434
// Hold a reference to the scene view.

‎src/Android/Xamarin.Android/Samples/Analysis/ViewshedLocation/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ The scene shows a [buildings layer in Brest, France](https://tiles.arcgis.com/ti
3131

3232
## Tags
3333

34-
3D, frustum, LocationViewshed, Scene, viewshed, visibility analysis
34+
3D, frustum, scene, viewshed, visibility analysis

‎src/Android/Xamarin.Android/Samples/Analysis/ViewshedLocation/readme.metadata.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
],
99
"keywords": [
1010
"3D",
11-
"LocationViewshed",
12-
"Scene",
1311
"frustum",
12+
"scene",
1413
"viewshed",
1514
"visibility analysis"
1615
],
1716
"nuget_packages": {
18-
"Esri.ArcGISRuntime": "100.8.0"
17+
"Esri.ArcGISRuntime": "100.9.0",
18+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0"
1919
},
2020
"offline_data": [],
2121
"redirect_from": [

‎src/Android/Xamarin.Android/Samples/Augmented reality/CollectDataAR/readme.metadata.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
"world-scale"
2222
],
2323
"nuget_packages": {
24-
"Esri.ArcGISRuntime": "100.8.0",
25-
"Esri.ArcGISRuntime.ARToolkit": "100.7.0"
24+
"Esri.ArcGISRuntime": "100.9.0",
25+
"Esri.ArcGISRuntime.ARToolkit": "100.8.0",
26+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0"
2627
},
2728
"offline_data": [],
2829
"redirect_from": [

‎src/Android/Xamarin.Android/Samples/Augmented reality/DisplayScenesInTabletopAR/readme.metadata.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
"tabletop"
1818
],
1919
"nuget_packages": {
20-
"Esri.ArcGISRuntime": "100.8.0",
21-
"Esri.ArcGISRuntime.ARToolkit": "100.7.0"
20+
"Esri.ArcGISRuntime": "100.9.0",
21+
"Esri.ArcGISRuntime.ARToolkit": "100.8.0",
22+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0"
2223
},
2324
"offline_data": [
2425
"7dd2f97bb007466ea939160d0de96a9d"

‎src/Android/Xamarin.Android/Samples/Augmented reality/ExploreScenesInFlyoverAR/readme.metadata.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
"translation factor"
1717
],
1818
"nuget_packages": {
19-
"Esri.ArcGISRuntime": "100.8.0",
20-
"Esri.ArcGISRuntime.ARToolkit": "100.7.0"
19+
"Esri.ArcGISRuntime": "100.9.0",
20+
"Esri.ArcGISRuntime.ARToolkit": "100.8.0",
21+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0"
2122
},
2223
"offline_data": [],
2324
"redirect_from": [

‎src/Android/Xamarin.Android/Samples/Augmented reality/NavigateAR/readme.metadata.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020
"world-scale"
2121
],
2222
"nuget_packages": {
23-
"Esri.ArcGISRuntime": "100.8.0",
24-
"Esri.ArcGISRuntime.ARToolkit": "100.7.0"
23+
"Esri.ArcGISRuntime": "100.9.0",
24+
"Esri.ArcGISRuntime.ARToolkit": "100.8.0",
25+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0",
26+
"Xamarin.Auth": "1.7.0"
2527
},
2628
"offline_data": [],
2729
"redirect_from": [

‎src/Android/Xamarin.Android/Samples/Augmented reality/ViewHiddenInfrastructureAR/readme.metadata.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
"world-scale"
2121
],
2222
"nuget_packages": {
23-
"Esri.ArcGISRuntime": "100.8.0",
24-
"Esri.ArcGISRuntime.ARToolkit": "100.7.0"
23+
"Esri.ArcGISRuntime": "100.9.0",
24+
"Esri.ArcGISRuntime.ARToolkit": "100.8.0",
25+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0"
2526
},
2627
"offline_data": [],
2728
"redirect_from": [

‎src/Android/Xamarin.Android/Samples/Data/AddFeatures/readme.metadata.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"online service"
1313
],
1414
"nuget_packages": {
15-
"Esri.ArcGISRuntime": "100.8.0"
15+
"Esri.ArcGISRuntime": "100.9.0",
16+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0"
1617
},
1718
"offline_data": [],
1819
"redirect_from": [

‎src/Android/Xamarin.Android/Samples/Data/DeleteFeatures/readme.metadata.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"table"
1515
],
1616
"nuget_packages": {
17-
"Esri.ArcGISRuntime": "100.8.0"
17+
"Esri.ArcGISRuntime": "100.9.0",
18+
"Esri.ArcGISRuntime.Xamarin.Android": "100.9.0"
1819
},
1920
"offline_data": [],
2021
"redirect_from": [

0 commit comments

Comments
 (0)