Skip to content
This repository has been archived by the owner on Apr 29, 2021. It is now read-only.

Commit

Permalink
Update 9 (#65)
Browse files Browse the repository at this point in the history
* Update for 100.9 and the 2.0.3 release

* Fix issue with constraints

Issue found on iPhone XS in landscape, a previously untested combination of compact width with rounded edges/notch

* Add release note for layout issue

* Update linker settings to work around bug

* Doc update

* Add note about Catalina

* Update README.md

Co-authored-by: Eli Gregory <33433113+esreli@users.noreply.github.com>

Co-authored-by: Eli Gregory <33433113+esreli@users.noreply.github.com>
  • Loading branch information
nCastle1 and esreli committed Aug 30, 2020
1 parent 12af165 commit e1f1c40
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 13 deletions.
2 changes: 1 addition & 1 deletion IndoorRouting.sln
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ Global
$1.TabsToSpaces = True
$0.CSharpFormattingPolicy = $2
$2.scope = text/x-csharp
version = 2.0.2
version = 2.0.3
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion IndoorRouting/IndoorRouting.shproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{C74E25B9-776D-4522-891F-660D1A128785}</ProjectGuid>
<ReleaseVersion>2.0.2</ReleaseVersion>
<ReleaseVersion>2.0.3</ReleaseVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ If there are changes made in the Original repository, you can sync the fork to k
4. ```git merge upstream/master``` to sync your local `master` branch with `upstream/master`. **Note**: Your local changes will be retained and your fork's master branch will be in sync with the upstream repository.

## Requirements
* [ArcGIS Runtime SDK for .NET 100.8 or higher](https://developers.arcgis.com/net/latest/)
* [ArcGIS Runtime SDK for .NET 100.9 or higher](https://developers.arcgis.com/net/latest/)
* [XCode 11 or higher](https://developer.apple.com/xcode/downloads/)
* App supports iOS 12 and above, but requires the iOS 13 SDK to build
* App supports a minimum deployment target of iOS 12 but requires the iOS 13 SDK to build. Note, because ArcGIS Runtime uses [Metal](https://developer.apple.com/metal/), if you want to simulate the app using an iOS simulator you must be running, at minimum, macOS Catalina and iOS 13.
* [Visual Studio for Mac - latest](https://visualstudio.microsoft.com/vs/mac/) or [Visual Studio 2017 or higher](https://visualstudio.microsoft.com/vs/whatsnew/)

## Resources
Expand Down
7 changes: 7 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Release notes

## Release 2.0.3

Changes:

* Updated to ArcGIS Runtime 100.9
* Fixes layout issue affecting some iPhones with notches and a compact width in landscape mode

## Release 2.0.2

Changes:
Expand Down
4 changes: 2 additions & 2 deletions iOS/Controllers/BottomSheetViewController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ public override void ViewWillAppear(bool animated)

NSLayoutConstraint.ActivateConstraints(new[]
{
DisplayedContentView.LeadingAnchor.ConstraintEqualTo(_blurView.LeadingAnchor),
DisplayedContentView.TrailingAnchor.ConstraintEqualTo(_blurView.TrailingAnchor),
DisplayedContentView.LeadingAnchor.ConstraintEqualTo(View.SafeAreaLayoutGuide.LeadingAnchor),
DisplayedContentView.TrailingAnchor.ConstraintEqualTo(View.SafeAreaLayoutGuide.TrailingAnchor),
_blurView.TopAnchor.ConstraintGreaterThanOrEqualTo(View.Superview.SafeAreaLayoutGuide.TopAnchor)
});

Expand Down
12 changes: 7 additions & 5 deletions iOS/IndoorRouting.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<ReleaseVersion>2.0.2</ReleaseVersion>
<ReleaseVersion>2.0.3</ReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -23,8 +23,7 @@
<WarningLevel>4</WarningLevel>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchFastDev>true</MtouchFastDev>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchLink>None</MtouchLink>
<MtouchArch>x86_64</MtouchArch>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
<MtouchTlsProvider>Default</MtouchTlsProvider>
Expand Down Expand Up @@ -342,11 +341,14 @@
<ITunesArtwork Include="iTunesArtwork%402x" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Esri.ArcGISRuntime">
<Version>100.9.0</Version>
</PackageReference>
<PackageReference Include="Esri.ArcGISRuntime.Xamarin.iOS">
<Version>100.8.0</Version>
<Version>100.9.0</Version>
</PackageReference>
<PackageReference Include="Esri.ArcGISRuntime.Toolkit">
<Version>100.8.0</Version>
<Version>100.9.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup />
Expand Down
4 changes: 2 additions & 2 deletions iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<key>CFBundleIdentifier</key>
<string>com.esri.arcgisruntime.opensourceapps.indoorrouting.xamarin</string>
<key>CFBundleShortVersionString</key>
<string>2.0.2</string>
<string>2.0.3</string>
<key>CFBundleVersion</key>
<string>2.0.2</string>
<string>2.0.3</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
Expand Down

0 comments on commit e1f1c40

Please sign in to comment.