From 21613edd8bec9bff185a26ed5427b58420d9bcfd Mon Sep 17 00:00:00 2001 From: Nathan Castle Date: Sun, 21 Feb 2021 13:51:53 -0800 Subject: [PATCH] Updates for U10 (#69) * Update iOS minimum to 13, improve iOS 14 compatibility (#68) * Removes support for iOS 12 * Update target platform version for UWP * Improves iOS 14 support * Upgrade to ArcGIS Runtime 100.10 * doc fix * Minimum version changes, warning fixes * Update RELEASE.md Co-authored-by: Eli Gregory <33433113+esreli@users.noreply.github.com> * Link updates * Update README.md Co-authored-by: Eli Gregory <33433113+esreli@users.noreply.github.com> * 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> --- README.md | 6 +- RELEASE.md | 8 + docs/README.md | 6 +- src/MapsApp.Android/MapsApp.Android.csproj | 8 +- .../Properties/AndroidManifest.xml | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Resources/Resource.Designer.cs | 550 +++++++++--------- src/MapsApp.Shared/MapsApp.Shared.shproj | 2 +- .../ViewModels/AuthViewModel.cs | 9 +- src/MapsApp.UWP/MapsApp.UWP.csproj | 10 +- src/MapsApp.UWP/Package.appxmanifest | 2 +- src/MapsApp.UWP/Properties/AssemblyInfo.cs | 4 +- .../MapsApp.WPF_NetCore.csproj | 4 +- .../MainWindow.xaml.cs | 2 +- .../MapsApp.WPF_NetFramework.csproj | 6 +- .../Properties/AssemblyInfo.cs | 4 +- .../MapsApp.Xamarin.Shared.shproj | 2 +- src/MapsApp.Xamarin.Shared/MapsApp.projitems | 11 +- src/MapsApp.iOS/Info.plist | 4 +- src/MapsApp.iOS/MapsApp.iOS.csproj | 10 +- src/MapsApp.iOS/Properties/AssemblyInfo.cs | 4 +- src/MapsApp.sln | 2 +- 22 files changed, 342 insertions(+), 318 deletions(-) diff --git a/README.md b/README.md index 2183311..2fc7ca5 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ If there are changes made in the Original repository, you can sync the fork to k Maps app uses authenticated ArcGIS Online services for routing and geocoding. You need to configure the app for OAuth authentication. 1. Log in to [developers.arcgis.com](https://developers.arcgis.com). -2. Create a [new application](https://developers.arcgis.com/applications/new). +2. Create a [new application](https://developers.arcgis.com/applications/). 3. After creating the application, navigate to the 'Authentication' tab and add a redirect URI. Any URI should work, but try to choose something unique to your app, like `my-maps-app://auth`. The default value in the app's code is `https://developers.arcgis.com`, so you can use that as an interim value while evaluating the app. 4. While on the 'Authentication' tab, note the **Client ID** and the **Redirect URI** you specified. 5. In [Helpers\Configuration.cs](src/MapsApp.Shared/Helpers/Configuration.cs) within the **MapsApp.Shared** project, replace the default **client ID** and **Redirect URI** with the values noted earlier. @@ -84,7 +84,7 @@ Maps app uses authenticated ArcGIS Online services for routing and geocoding. Yo - [Visual Studio 2017 or higher](https://www.visualstudio.com/downloads/) - Visual Studio 2019 is required if you want to use the .NET Core version of the WPF app. - [.NET Framework 4.6.1 or higher](https://www.microsoft.com/net/download) -- [ArcGIS Runtime SDK for .NET 100.8 or higher](https://developers.arcgis.com/net/) +- [ArcGIS Runtime SDK for .NET 100.10 or higher](https://developers.arcgis.com/net/) ## Resources @@ -122,4 +122,4 @@ Unless required by applicable law or agreed to in writing, software distributed A copy of the license is available in the repository's [LICENSE](https://github.com/Esri/maps-app-dotnet/blob/master/LICENSE) file. -For information about licensing your deployed app, see [License your app](https://developers.arcgis.com/net/latest/wpf/guide/license-your-app.htm). +For information about licensing your deployed app, see [License your app](https://developers.arcgis.com/ios/license-and-deployment/license/). diff --git a/RELEASE.md b/RELEASE.md index b1d23a2..6b63231 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,5 +1,13 @@ # Release notes +## 1.0.9 + +- Deprecate support for iOS 12. +- Updates Xamarin.Forms to add support for iOS 14. +- Updates the minimum Android version to SDK 23 (Android 6). +- Updates to ArcGIS Runtime 100.10. +- Updates to fix several warnings, for deprecations and other issues. + ## 1.0.8 - Improves app configuration and setup instructions for clarity. diff --git a/docs/README.md b/docs/README.md index daca35f..fee9350 100644 --- a/docs/README.md +++ b/docs/README.md @@ -92,9 +92,9 @@ Inside the view (XAML), a `MapView` control is created and its `Map` property is ## Place search & geocoding -At the top of the screen, there is a menu button and a search bar. The search bar provides the geocoding functionality. [Geocoding](https://developers.arcgis.com/net/latest/wpf/guide/search-for-places-geocoding-.htm) lets you transform an address or a place name to a specific geographic location. Reverse geocoding lets you use a geographic location to find a description of the location, like a postal address or place name. +At the top of the screen, there is a menu button and a search bar. The search bar provides the geocoding functionality. [Geocoding](https://developers.arcgis.com/net/geocode-and-search/) lets you transform an address or a place name to a specific geographic location. Reverse geocoding lets you use a geographic location to find a description of the location, like a postal address or place name. -In the solution, the logic for geocoding is contained inside the shared `GeocodeViewModel`. First, a `LocatorTask` is defined to use the [ArcGIS World Geocoding Service](https://developers.arcgis.com/features/geocoding/). Before using the `LocatorTask`, it must be loaded. The loadable pattern is described [here](https://developers.arcgis.com/net/latest/wpf/guide/loadable-pattern.htm). +In the solution, the logic for geocoding is contained inside the shared `GeocodeViewModel`. First, a `LocatorTask` is defined to use the [ArcGIS World Geocoding Service](https://developers.arcgis.com/features/geocoding/). Before using the `LocatorTask`, it must be loaded. The loadable pattern is described [here](https://developers.arcgis.com/net/programming-patterns/loadable/). ```csharp /// @@ -348,7 +348,7 @@ The process of accessing token secured services with a challenge handler is illu 5. If the user is successfully authenticated, a credential (token) is included in requests to the secured service. 6. The authentication manager stores the credential for this portal and all requests for secured content include the token in the request. -For an application to use this pattern, follow these [guides](https://developers.arcgis.com/documentation/core-concepts/security-and-authentication/signing-in-arcgis-online-users/) to register your app.. The `AuthenticationManager` provided by the ArcGIS Runtime SDK abstracts much of the authentication logic for you. In the Maps App, the `AuthenticationManager` is configured to prompt the user for credentials. [Go here](https://developers.arcgis.com/net/latest/wpf/guide/use-the-authentication-manager.htm) for details and other ways to configure the `AuthenticationManager`. +For an application to use this pattern, follow these [guides](https://developers.arcgis.com/net/security-and-authentication/) to register your app. The `AuthenticationManager` provided by the ArcGIS Runtime SDK abstracts much of the authentication logic for you. In the Maps App, the `AuthenticationManager` is configured to prompt the user for credentials. | Android | WPF | |:-------:|:---:| diff --git a/src/MapsApp.Android/MapsApp.Android.csproj b/src/MapsApp.Android/MapsApp.Android.csproj index 8ad0ab4..2e47b64 100644 --- a/src/MapsApp.Android/MapsApp.Android.csproj +++ b/src/MapsApp.Android/MapsApp.Android.csproj @@ -24,7 +24,7 @@ false - 1.0.8 + 1.0.9 true @@ -179,10 +179,10 @@ - 100.9.0 + 100.10.0 - 100.9.0 + 100.10.0 2.4.2 @@ -203,7 +203,7 @@ 1.7.0 - 4.8.0.1364 + 4.8.0.1687 diff --git a/src/MapsApp.Android/Properties/AndroidManifest.xml b/src/MapsApp.Android/Properties/AndroidManifest.xml index 013781d..e5cf2c0 100644 --- a/src/MapsApp.Android/Properties/AndroidManifest.xml +++ b/src/MapsApp.Android/Properties/AndroidManifest.xml @@ -1,6 +1,6 @@  - + diff --git a/src/MapsApp.Android/Properties/AssemblyInfo.cs b/src/MapsApp.Android/Properties/AssemblyInfo.cs index fe7d100..3bfb0e7 100644 --- a/src/MapsApp.Android/Properties/AssemblyInfo.cs +++ b/src/MapsApp.Android/Properties/AssemblyInfo.cs @@ -25,8 +25,8 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.8.0")] -[assembly: AssemblyFileVersion("1.0.8.0")] +[assembly: AssemblyVersion("1.0.9.0")] +[assembly: AssemblyFileVersion("1.0.9.0")] // Add some common permissions, these can be removed if not needed [assembly: UsesPermission(Android.Manifest.Permission.Internet)] diff --git a/src/MapsApp.Android/Resources/Resource.Designer.cs b/src/MapsApp.Android/Resources/Resource.Designer.cs index 9f5e060..4006f5d 100644 --- a/src/MapsApp.Android/Resources/Resource.Designer.cs +++ b/src/MapsApp.Android/Resources/Resource.Designer.cs @@ -394,6 +394,7 @@ public static void UpdateIdValues() global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Attribute.scrimAnimationDuration = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.scrimAnimationDuration; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Attribute.scrimBackground = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.scrimBackground; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Attribute.scrimVisibleHeightTrigger = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.scrimVisibleHeightTrigger; + global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Attribute.scrollViewStyle = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.scrollViewStyle; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Attribute.searchHintIcon = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.searchHintIcon; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Attribute.searchIcon = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.searchIcon; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Attribute.searchViewStyle = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.searchViewStyle; @@ -1330,6 +1331,7 @@ public static void UpdateIdValues() global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.String.fab_transformation_sheet_behavior = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.String.fab_transformation_sheet_behavior; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.String.hide_bottom_view_on_scroll_behavior = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.String.hide_bottom_view_on_scroll_behavior; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.String.mtrl_chip_close_icon_content_description = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.String.mtrl_chip_close_icon_content_description; + global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.String.overflow_tab_title = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.String.overflow_tab_title; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.String.password_toggle_content_description = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.String.password_toggle_content_description; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.String.path_password_eye = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.String.path_password_eye; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.String.path_password_eye_mask_strike_through = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.String.path_password_eye_mask_strike_through; @@ -1535,7 +1537,6 @@ public static void UpdateIdValues() global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.CardView = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.CardView; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.CardView_Dark = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.CardView_Dark; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.CardView_Light = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.CardView_Light; - global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.collectionViewScrollBars = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.collectionViewScrollBars; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.collectionViewTheme = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.collectionViewTheme; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.MainTheme = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.MainTheme; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.MainTheme_Base = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.MainTheme_Base; @@ -1570,6 +1571,8 @@ public static void UpdateIdValues() global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Text = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Text; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton_Overflow; + global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.scrollViewScrollBars = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.scrollViewScrollBars; + global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.scrollViewTheme = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.scrollViewTheme; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.TextAppearance_AppCompat = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.TextAppearance_AppCompat; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.TextAppearance_AppCompat_Body1 = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.TextAppearance_AppCompat_Body1; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Style.TextAppearance_AppCompat_Body2 = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.TextAppearance_AppCompat_Body2; @@ -2419,6 +2422,8 @@ public static void UpdateIdValues() global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Styleable.ScrimInsetsFrameLayout_insetForeground = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrimInsetsFrameLayout_insetForeground; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Styleable.ScrollingViewBehavior_Layout = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrollingViewBehavior_Layout; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Styleable.ScrollingViewBehavior_Layout_behavior_overlapTop = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrollingViewBehavior_Layout_behavior_overlapTop; + global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Styleable.ScrollViewRendererTheme = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrollViewRendererTheme; + global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Styleable.ScrollViewRendererTheme_scrollViewStyle = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrollViewRendererTheme_scrollViewStyle; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Styleable.SearchView = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.SearchView; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Styleable.SearchView_android_focusable = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.SearchView_android_focusable; global::Esri.ArcGISRuntime.Xamarin.Forms.Resource.Styleable.SearchView_android_imeOptions = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.SearchView_android_imeOptions; @@ -3142,6 +3147,7 @@ public static void UpdateIdValues() global::Xamarin.Forms.Platform.Android.Resource.Attribute.scrimAnimationDuration = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.scrimAnimationDuration; global::Xamarin.Forms.Platform.Android.Resource.Attribute.scrimBackground = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.scrimBackground; global::Xamarin.Forms.Platform.Android.Resource.Attribute.scrimVisibleHeightTrigger = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.scrimVisibleHeightTrigger; + global::Xamarin.Forms.Platform.Android.Resource.Attribute.scrollViewStyle = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.scrollViewStyle; global::Xamarin.Forms.Platform.Android.Resource.Attribute.searchHintIcon = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.searchHintIcon; global::Xamarin.Forms.Platform.Android.Resource.Attribute.searchIcon = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.searchIcon; global::Xamarin.Forms.Platform.Android.Resource.Attribute.searchViewStyle = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.searchViewStyle; @@ -4344,7 +4350,6 @@ public static void UpdateIdValues() global::Xamarin.Forms.Platform.Android.Resource.Style.CardView = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.CardView; global::Xamarin.Forms.Platform.Android.Resource.Style.CardView_Dark = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.CardView_Dark; global::Xamarin.Forms.Platform.Android.Resource.Style.CardView_Light = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.CardView_Light; - global::Xamarin.Forms.Platform.Android.Resource.Style.collectionViewScrollBars = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.collectionViewScrollBars; global::Xamarin.Forms.Platform.Android.Resource.Style.collectionViewTheme = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.collectionViewTheme; global::Xamarin.Forms.Platform.Android.Resource.Style.MainTheme = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.MainTheme; global::Xamarin.Forms.Platform.Android.Resource.Style.MainTheme_Base = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.MainTheme_Base; @@ -4379,6 +4384,8 @@ public static void UpdateIdValues() global::Xamarin.Forms.Platform.Android.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Text = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Text; global::Xamarin.Forms.Platform.Android.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton; global::Xamarin.Forms.Platform.Android.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton_Overflow; + global::Xamarin.Forms.Platform.Android.Resource.Style.scrollViewScrollBars = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.scrollViewScrollBars; + global::Xamarin.Forms.Platform.Android.Resource.Style.scrollViewTheme = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.scrollViewTheme; global::Xamarin.Forms.Platform.Android.Resource.Style.TextAppearance_AppCompat = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.TextAppearance_AppCompat; global::Xamarin.Forms.Platform.Android.Resource.Style.TextAppearance_AppCompat_Body1 = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.TextAppearance_AppCompat_Body1; global::Xamarin.Forms.Platform.Android.Resource.Style.TextAppearance_AppCompat_Body2 = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.TextAppearance_AppCompat_Body2; @@ -5247,6 +5254,8 @@ public static void UpdateIdValues() global::Xamarin.Forms.Platform.Android.Resource.Styleable.ScrimInsetsFrameLayout_insetForeground = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrimInsetsFrameLayout_insetForeground; global::Xamarin.Forms.Platform.Android.Resource.Styleable.ScrollingViewBehavior_Layout = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrollingViewBehavior_Layout; global::Xamarin.Forms.Platform.Android.Resource.Styleable.ScrollingViewBehavior_Layout_behavior_overlapTop = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrollingViewBehavior_Layout_behavior_overlapTop; + global::Xamarin.Forms.Platform.Android.Resource.Styleable.ScrollViewRendererTheme = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrollViewRendererTheme; + global::Xamarin.Forms.Platform.Android.Resource.Styleable.ScrollViewRendererTheme_scrollViewStyle = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrollViewRendererTheme_scrollViewStyle; global::Xamarin.Forms.Platform.Android.Resource.Styleable.SearchView = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.SearchView; global::Xamarin.Forms.Platform.Android.Resource.Styleable.SearchView_android_focusable = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.SearchView_android_focusable; global::Xamarin.Forms.Platform.Android.Resource.Styleable.SearchView_android_imeOptions = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.SearchView_android_imeOptions; @@ -5821,6 +5830,7 @@ public static void UpdateIdValues() global::Xamarin.Forms.Platform.Resource.Attribute.scrimAnimationDuration = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.scrimAnimationDuration; global::Xamarin.Forms.Platform.Resource.Attribute.scrimBackground = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.scrimBackground; global::Xamarin.Forms.Platform.Resource.Attribute.scrimVisibleHeightTrigger = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.scrimVisibleHeightTrigger; + global::Xamarin.Forms.Platform.Resource.Attribute.scrollViewStyle = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.scrollViewStyle; global::Xamarin.Forms.Platform.Resource.Attribute.searchHintIcon = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.searchHintIcon; global::Xamarin.Forms.Platform.Resource.Attribute.searchIcon = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.searchIcon; global::Xamarin.Forms.Platform.Resource.Attribute.searchViewStyle = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Attribute.searchViewStyle; @@ -7023,7 +7033,6 @@ public static void UpdateIdValues() global::Xamarin.Forms.Platform.Resource.Style.CardView = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.CardView; global::Xamarin.Forms.Platform.Resource.Style.CardView_Dark = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.CardView_Dark; global::Xamarin.Forms.Platform.Resource.Style.CardView_Light = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.CardView_Light; - global::Xamarin.Forms.Platform.Resource.Style.collectionViewScrollBars = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.collectionViewScrollBars; global::Xamarin.Forms.Platform.Resource.Style.collectionViewTheme = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.collectionViewTheme; global::Xamarin.Forms.Platform.Resource.Style.MainTheme = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.MainTheme; global::Xamarin.Forms.Platform.Resource.Style.MainTheme_Base = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.MainTheme_Base; @@ -7058,6 +7067,8 @@ public static void UpdateIdValues() global::Xamarin.Forms.Platform.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Text = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Text; global::Xamarin.Forms.Platform.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton; global::Xamarin.Forms.Platform.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton_Overflow; + global::Xamarin.Forms.Platform.Resource.Style.scrollViewScrollBars = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.scrollViewScrollBars; + global::Xamarin.Forms.Platform.Resource.Style.scrollViewTheme = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.scrollViewTheme; global::Xamarin.Forms.Platform.Resource.Style.TextAppearance_AppCompat = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.TextAppearance_AppCompat; global::Xamarin.Forms.Platform.Resource.Style.TextAppearance_AppCompat_Body1 = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.TextAppearance_AppCompat_Body1; global::Xamarin.Forms.Platform.Resource.Style.TextAppearance_AppCompat_Body2 = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Style.TextAppearance_AppCompat_Body2; @@ -7926,6 +7937,8 @@ public static void UpdateIdValues() global::Xamarin.Forms.Platform.Resource.Styleable.ScrimInsetsFrameLayout_insetForeground = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrimInsetsFrameLayout_insetForeground; global::Xamarin.Forms.Platform.Resource.Styleable.ScrollingViewBehavior_Layout = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrollingViewBehavior_Layout; global::Xamarin.Forms.Platform.Resource.Styleable.ScrollingViewBehavior_Layout_behavior_overlapTop = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrollingViewBehavior_Layout_behavior_overlapTop; + global::Xamarin.Forms.Platform.Resource.Styleable.ScrollViewRendererTheme = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrollViewRendererTheme; + global::Xamarin.Forms.Platform.Resource.Styleable.ScrollViewRendererTheme_scrollViewStyle = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.ScrollViewRendererTheme_scrollViewStyle; global::Xamarin.Forms.Platform.Resource.Styleable.SearchView = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.SearchView; global::Xamarin.Forms.Platform.Resource.Styleable.SearchView_android_focusable = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.SearchView_android_focusable; global::Xamarin.Forms.Platform.Resource.Styleable.SearchView_android_imeOptions = global::Esri.ArcGISRuntime.OpenSourceApps.MapsApp.Android.Resource.Styleable.SearchView_android_imeOptions; @@ -9326,427 +9339,430 @@ public partial class Attribute public const int scrimVisibleHeightTrigger = 2130903391; // aapt resource value: 0x7F030160 - public const int searchHintIcon = 2130903392; + public const int scrollViewStyle = 2130903392; // aapt resource value: 0x7F030161 - public const int searchIcon = 2130903393; + public const int searchHintIcon = 2130903393; // aapt resource value: 0x7F030162 - public const int searchViewStyle = 2130903394; + public const int searchIcon = 2130903394; // aapt resource value: 0x7F030163 - public const int seekBarStyle = 2130903395; + public const int searchViewStyle = 2130903395; // aapt resource value: 0x7F030164 - public const int selectableItemBackground = 2130903396; + public const int seekBarStyle = 2130903396; // aapt resource value: 0x7F030165 - public const int selectableItemBackgroundBorderless = 2130903397; + public const int selectableItemBackground = 2130903397; // aapt resource value: 0x7F030166 - public const int showAsAction = 2130903398; + public const int selectableItemBackgroundBorderless = 2130903398; // aapt resource value: 0x7F030167 - public const int showDividers = 2130903399; + public const int showAsAction = 2130903399; // aapt resource value: 0x7F030168 - public const int showMotionSpec = 2130903400; + public const int showDividers = 2130903400; // aapt resource value: 0x7F030169 - public const int showText = 2130903401; + public const int showMotionSpec = 2130903401; // aapt resource value: 0x7F03016A - public const int showTitle = 2130903402; + public const int showText = 2130903402; // aapt resource value: 0x7F03016B - public const int singleChoiceItemLayout = 2130903403; + public const int showTitle = 2130903403; // aapt resource value: 0x7F03016C - public const int singleLine = 2130903404; + public const int singleChoiceItemLayout = 2130903404; // aapt resource value: 0x7F03016D - public const int singleSelection = 2130903405; + public const int singleLine = 2130903405; // aapt resource value: 0x7F03016E - public const int snackbarButtonStyle = 2130903406; + public const int singleSelection = 2130903406; // aapt resource value: 0x7F03016F - public const int snackbarStyle = 2130903407; + public const int snackbarButtonStyle = 2130903407; // aapt resource value: 0x7F030170 - public const int spanCount = 2130903408; + public const int snackbarStyle = 2130903408; // aapt resource value: 0x7F030171 - public const int spinBars = 2130903409; + public const int spanCount = 2130903409; // aapt resource value: 0x7F030172 - public const int spinnerDropDownItemStyle = 2130903410; + public const int spinBars = 2130903410; // aapt resource value: 0x7F030173 - public const int spinnerStyle = 2130903411; + public const int spinnerDropDownItemStyle = 2130903411; // aapt resource value: 0x7F030174 - public const int splitTrack = 2130903412; + public const int spinnerStyle = 2130903412; // aapt resource value: 0x7F030175 - public const int srcCompat = 2130903413; + public const int splitTrack = 2130903413; // aapt resource value: 0x7F030176 - public const int stackFromEnd = 2130903414; + public const int srcCompat = 2130903414; // aapt resource value: 0x7F030177 - public const int state_above_anchor = 2130903415; + public const int stackFromEnd = 2130903415; // aapt resource value: 0x7F030178 - public const int state_collapsed = 2130903416; + public const int state_above_anchor = 2130903416; // aapt resource value: 0x7F030179 - public const int state_collapsible = 2130903417; + public const int state_collapsed = 2130903417; // aapt resource value: 0x7F03017A - public const int state_liftable = 2130903418; + public const int state_collapsible = 2130903418; // aapt resource value: 0x7F03017B - public const int state_lifted = 2130903419; + public const int state_liftable = 2130903419; // aapt resource value: 0x7F03017C - public const int statusBarBackground = 2130903420; + public const int state_lifted = 2130903420; // aapt resource value: 0x7F03017D - public const int statusBarScrim = 2130903421; + public const int statusBarBackground = 2130903421; // aapt resource value: 0x7F03017E - public const int strokeColor = 2130903422; + public const int statusBarScrim = 2130903422; // aapt resource value: 0x7F03017F - public const int strokeWidth = 2130903423; + public const int strokeColor = 2130903423; // aapt resource value: 0x7F030180 - public const int subMenuArrow = 2130903424; + public const int strokeWidth = 2130903424; // aapt resource value: 0x7F030181 - public const int submitBackground = 2130903425; + public const int subMenuArrow = 2130903425; // aapt resource value: 0x7F030182 - public const int subtitle = 2130903426; + public const int submitBackground = 2130903426; // aapt resource value: 0x7F030183 - public const int subtitleTextAppearance = 2130903427; + public const int subtitle = 2130903427; // aapt resource value: 0x7F030184 - public const int subtitleTextColor = 2130903428; + public const int subtitleTextAppearance = 2130903428; // aapt resource value: 0x7F030185 - public const int subtitleTextStyle = 2130903429; + public const int subtitleTextColor = 2130903429; // aapt resource value: 0x7F030186 - public const int suggestionRowLayout = 2130903430; + public const int subtitleTextStyle = 2130903430; // aapt resource value: 0x7F030187 - public const int switchMinWidth = 2130903431; + public const int suggestionRowLayout = 2130903431; // aapt resource value: 0x7F030188 - public const int switchPadding = 2130903432; + public const int switchMinWidth = 2130903432; // aapt resource value: 0x7F030189 - public const int switchStyle = 2130903433; + public const int switchPadding = 2130903433; // aapt resource value: 0x7F03018A - public const int switchTextAppearance = 2130903434; + public const int switchStyle = 2130903434; // aapt resource value: 0x7F03018B - public const int tabBackground = 2130903435; + public const int switchTextAppearance = 2130903435; // aapt resource value: 0x7F03018C - public const int tabContentStart = 2130903436; + public const int tabBackground = 2130903436; // aapt resource value: 0x7F03018D - public const int tabGravity = 2130903437; + public const int tabContentStart = 2130903437; // aapt resource value: 0x7F03018E - public const int tabIconTint = 2130903438; + public const int tabGravity = 2130903438; // aapt resource value: 0x7F03018F - public const int tabIconTintMode = 2130903439; + public const int tabIconTint = 2130903439; // aapt resource value: 0x7F030190 - public const int tabIndicator = 2130903440; + public const int tabIconTintMode = 2130903440; // aapt resource value: 0x7F030191 - public const int tabIndicatorAnimationDuration = 2130903441; + public const int tabIndicator = 2130903441; // aapt resource value: 0x7F030192 - public const int tabIndicatorColor = 2130903442; + public const int tabIndicatorAnimationDuration = 2130903442; // aapt resource value: 0x7F030193 - public const int tabIndicatorFullWidth = 2130903443; + public const int tabIndicatorColor = 2130903443; // aapt resource value: 0x7F030194 - public const int tabIndicatorGravity = 2130903444; + public const int tabIndicatorFullWidth = 2130903444; // aapt resource value: 0x7F030195 - public const int tabIndicatorHeight = 2130903445; + public const int tabIndicatorGravity = 2130903445; // aapt resource value: 0x7F030196 - public const int tabInlineLabel = 2130903446; + public const int tabIndicatorHeight = 2130903446; // aapt resource value: 0x7F030197 - public const int tabMaxWidth = 2130903447; + public const int tabInlineLabel = 2130903447; // aapt resource value: 0x7F030198 - public const int tabMinWidth = 2130903448; + public const int tabMaxWidth = 2130903448; // aapt resource value: 0x7F030199 - public const int tabMode = 2130903449; + public const int tabMinWidth = 2130903449; // aapt resource value: 0x7F03019A - public const int tabPadding = 2130903450; + public const int tabMode = 2130903450; // aapt resource value: 0x7F03019B - public const int tabPaddingBottom = 2130903451; + public const int tabPadding = 2130903451; // aapt resource value: 0x7F03019C - public const int tabPaddingEnd = 2130903452; + public const int tabPaddingBottom = 2130903452; // aapt resource value: 0x7F03019D - public const int tabPaddingStart = 2130903453; + public const int tabPaddingEnd = 2130903453; // aapt resource value: 0x7F03019E - public const int tabPaddingTop = 2130903454; + public const int tabPaddingStart = 2130903454; // aapt resource value: 0x7F03019F - public const int tabRippleColor = 2130903455; + public const int tabPaddingTop = 2130903455; // aapt resource value: 0x7F0301A0 - public const int tabSelectedTextColor = 2130903456; + public const int tabRippleColor = 2130903456; // aapt resource value: 0x7F0301A1 - public const int tabStyle = 2130903457; + public const int tabSelectedTextColor = 2130903457; // aapt resource value: 0x7F0301A2 - public const int tabTextAppearance = 2130903458; + public const int tabStyle = 2130903458; // aapt resource value: 0x7F0301A3 - public const int tabTextColor = 2130903459; + public const int tabTextAppearance = 2130903459; // aapt resource value: 0x7F0301A4 - public const int tabUnboundedRipple = 2130903460; + public const int tabTextColor = 2130903460; // aapt resource value: 0x7F0301A5 - public const int textAllCaps = 2130903461; + public const int tabUnboundedRipple = 2130903461; // aapt resource value: 0x7F0301A6 - public const int textAppearanceBody1 = 2130903462; + public const int textAllCaps = 2130903462; // aapt resource value: 0x7F0301A7 - public const int textAppearanceBody2 = 2130903463; + public const int textAppearanceBody1 = 2130903463; // aapt resource value: 0x7F0301A8 - public const int textAppearanceButton = 2130903464; + public const int textAppearanceBody2 = 2130903464; // aapt resource value: 0x7F0301A9 - public const int textAppearanceCaption = 2130903465; + public const int textAppearanceButton = 2130903465; // aapt resource value: 0x7F0301AA - public const int textAppearanceHeadline1 = 2130903466; + public const int textAppearanceCaption = 2130903466; // aapt resource value: 0x7F0301AB - public const int textAppearanceHeadline2 = 2130903467; + public const int textAppearanceHeadline1 = 2130903467; // aapt resource value: 0x7F0301AC - public const int textAppearanceHeadline3 = 2130903468; + public const int textAppearanceHeadline2 = 2130903468; // aapt resource value: 0x7F0301AD - public const int textAppearanceHeadline4 = 2130903469; + public const int textAppearanceHeadline3 = 2130903469; // aapt resource value: 0x7F0301AE - public const int textAppearanceHeadline5 = 2130903470; + public const int textAppearanceHeadline4 = 2130903470; // aapt resource value: 0x7F0301AF - public const int textAppearanceHeadline6 = 2130903471; + public const int textAppearanceHeadline5 = 2130903471; // aapt resource value: 0x7F0301B0 - public const int textAppearanceLargePopupMenu = 2130903472; + public const int textAppearanceHeadline6 = 2130903472; // aapt resource value: 0x7F0301B1 - public const int textAppearanceListItem = 2130903473; + public const int textAppearanceLargePopupMenu = 2130903473; // aapt resource value: 0x7F0301B2 - public const int textAppearanceListItemSecondary = 2130903474; + public const int textAppearanceListItem = 2130903474; // aapt resource value: 0x7F0301B3 - public const int textAppearanceListItemSmall = 2130903475; + public const int textAppearanceListItemSecondary = 2130903475; // aapt resource value: 0x7F0301B4 - public const int textAppearanceOverline = 2130903476; + public const int textAppearanceListItemSmall = 2130903476; // aapt resource value: 0x7F0301B5 - public const int textAppearancePopupMenuHeader = 2130903477; + public const int textAppearanceOverline = 2130903477; // aapt resource value: 0x7F0301B6 - public const int textAppearanceSearchResultSubtitle = 2130903478; + public const int textAppearancePopupMenuHeader = 2130903478; // aapt resource value: 0x7F0301B7 - public const int textAppearanceSearchResultTitle = 2130903479; + public const int textAppearanceSearchResultSubtitle = 2130903479; // aapt resource value: 0x7F0301B8 - public const int textAppearanceSmallPopupMenu = 2130903480; + public const int textAppearanceSearchResultTitle = 2130903480; // aapt resource value: 0x7F0301B9 - public const int textAppearanceSubtitle1 = 2130903481; + public const int textAppearanceSmallPopupMenu = 2130903481; // aapt resource value: 0x7F0301BA - public const int textAppearanceSubtitle2 = 2130903482; + public const int textAppearanceSubtitle1 = 2130903482; // aapt resource value: 0x7F0301BB - public const int textColorAlertDialogListItem = 2130903483; + public const int textAppearanceSubtitle2 = 2130903483; // aapt resource value: 0x7F0301BC - public const int textColorSearchUrl = 2130903484; + public const int textColorAlertDialogListItem = 2130903484; // aapt resource value: 0x7F0301BD - public const int textEndPadding = 2130903485; + public const int textColorSearchUrl = 2130903485; // aapt resource value: 0x7F0301BE - public const int textInputStyle = 2130903486; + public const int textEndPadding = 2130903486; // aapt resource value: 0x7F0301BF - public const int textLocale = 2130903487; + public const int textInputStyle = 2130903487; // aapt resource value: 0x7F0301C0 - public const int textStartPadding = 2130903488; + public const int textLocale = 2130903488; // aapt resource value: 0x7F0301C1 - public const int theme = 2130903489; + public const int textStartPadding = 2130903489; // aapt resource value: 0x7F0301C2 - public const int thickness = 2130903490; + public const int theme = 2130903490; // aapt resource value: 0x7F0301C3 - public const int thumbTextPadding = 2130903491; + public const int thickness = 2130903491; // aapt resource value: 0x7F0301C4 - public const int thumbTint = 2130903492; + public const int thumbTextPadding = 2130903492; // aapt resource value: 0x7F0301C5 - public const int thumbTintMode = 2130903493; + public const int thumbTint = 2130903493; // aapt resource value: 0x7F0301C6 - public const int tickMark = 2130903494; + public const int thumbTintMode = 2130903494; // aapt resource value: 0x7F0301C7 - public const int tickMarkTint = 2130903495; + public const int tickMark = 2130903495; // aapt resource value: 0x7F0301C8 - public const int tickMarkTintMode = 2130903496; + public const int tickMarkTint = 2130903496; // aapt resource value: 0x7F0301C9 - public const int tint = 2130903497; + public const int tickMarkTintMode = 2130903497; // aapt resource value: 0x7F0301CA - public const int tintMode = 2130903498; + public const int tint = 2130903498; // aapt resource value: 0x7F0301CB - public const int title = 2130903499; + public const int tintMode = 2130903499; // aapt resource value: 0x7F0301CC - public const int titleEnabled = 2130903500; + public const int title = 2130903500; // aapt resource value: 0x7F0301CD - public const int titleMargin = 2130903501; + public const int titleEnabled = 2130903501; // aapt resource value: 0x7F0301CE - public const int titleMarginBottom = 2130903502; + public const int titleMargin = 2130903502; // aapt resource value: 0x7F0301CF - public const int titleMarginEnd = 2130903503; - - // aapt resource value: 0x7F0301D2 - public const int titleMargins = 2130903506; + public const int titleMarginBottom = 2130903503; // aapt resource value: 0x7F0301D0 - public const int titleMarginStart = 2130903504; + public const int titleMarginEnd = 2130903504; + + // aapt resource value: 0x7F0301D3 + public const int titleMargins = 2130903507; // aapt resource value: 0x7F0301D1 - public const int titleMarginTop = 2130903505; + public const int titleMarginStart = 2130903505; - // aapt resource value: 0x7F0301D3 - public const int titleTextAppearance = 2130903507; + // aapt resource value: 0x7F0301D2 + public const int titleMarginTop = 2130903506; // aapt resource value: 0x7F0301D4 - public const int titleTextColor = 2130903508; + public const int titleTextAppearance = 2130903508; // aapt resource value: 0x7F0301D5 - public const int titleTextStyle = 2130903509; + public const int titleTextColor = 2130903509; // aapt resource value: 0x7F0301D6 - public const int toolbarId = 2130903510; + public const int titleTextStyle = 2130903510; // aapt resource value: 0x7F0301D7 - public const int toolbarNavigationButtonStyle = 2130903511; + public const int toolbarId = 2130903511; // aapt resource value: 0x7F0301D8 - public const int toolbarStyle = 2130903512; + public const int toolbarNavigationButtonStyle = 2130903512; // aapt resource value: 0x7F0301D9 - public const int tooltipForegroundColor = 2130903513; + public const int toolbarStyle = 2130903513; // aapt resource value: 0x7F0301DA - public const int tooltipFrameBackground = 2130903514; + public const int tooltipForegroundColor = 2130903514; // aapt resource value: 0x7F0301DB - public const int tooltipText = 2130903515; + public const int tooltipFrameBackground = 2130903515; // aapt resource value: 0x7F0301DC - public const int track = 2130903516; + public const int tooltipText = 2130903516; // aapt resource value: 0x7F0301DD - public const int trackTint = 2130903517; + public const int track = 2130903517; // aapt resource value: 0x7F0301DE - public const int trackTintMode = 2130903518; + public const int trackTint = 2130903518; // aapt resource value: 0x7F0301DF - public const int ttcIndex = 2130903519; + public const int trackTintMode = 2130903519; // aapt resource value: 0x7F0301E0 - public const int useCompatPadding = 2130903520; + public const int ttcIndex = 2130903520; // aapt resource value: 0x7F0301E1 - public const int viewInflaterClass = 2130903521; + public const int useCompatPadding = 2130903521; // aapt resource value: 0x7F0301E2 - public const int voiceIcon = 2130903522; + public const int viewInflaterClass = 2130903522; // aapt resource value: 0x7F0301E3 - public const int windowActionBar = 2130903523; + public const int voiceIcon = 2130903523; // aapt resource value: 0x7F0301E4 - public const int windowActionBarOverlay = 2130903524; + public const int windowActionBar = 2130903524; // aapt resource value: 0x7F0301E5 - public const int windowActionModeOverlay = 2130903525; + public const int windowActionBarOverlay = 2130903525; // aapt resource value: 0x7F0301E6 - public const int windowFixedHeightMajor = 2130903526; + public const int windowActionModeOverlay = 2130903526; // aapt resource value: 0x7F0301E7 - public const int windowFixedHeightMinor = 2130903527; + public const int windowFixedHeightMajor = 2130903527; // aapt resource value: 0x7F0301E8 - public const int windowFixedWidthMajor = 2130903528; + public const int windowFixedHeightMinor = 2130903528; // aapt resource value: 0x7F0301E9 - public const int windowFixedWidthMinor = 2130903529; + public const int windowFixedWidthMajor = 2130903529; // aapt resource value: 0x7F0301EA - public const int windowMinWidthMajor = 2130903530; + public const int windowFixedWidthMinor = 2130903530; // aapt resource value: 0x7F0301EB - public const int windowMinWidthMinor = 2130903531; + public const int windowMinWidthMajor = 2130903531; // aapt resource value: 0x7F0301EC - public const int windowNoTitle = 2130903532; + public const int windowMinWidthMinor = 2130903532; + + // aapt resource value: 0x7F0301ED + public const int windowNoTitle = 2130903533; static Attribute() { @@ -13221,10 +13237,7 @@ public partial class Style public const int CardView_Light = 2131558598; // aapt resource value: 0x7F0D01FB - public const int collectionViewScrollBars = 2131558907; - - // aapt resource value: 0x7F0D01FC - public const int collectionViewTheme = 2131558908; + public const int collectionViewTheme = 2131558907; // aapt resource value: 0x7F0D00C7 public const int MainTheme = 2131558599; @@ -13325,6 +13338,12 @@ public partial class Style // aapt resource value: 0x7F0D00E7 public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131558631; + // aapt resource value: 0x7F0D01FC + public const int scrollViewScrollBars = 2131558908; + + // aapt resource value: 0x7F0D01FD + public const int scrollViewTheme = 2131558909; + // aapt resource value: 0x7F0D00E8 public const int TextAppearance_AppCompat = 2131558632; @@ -14163,7 +14182,7 @@ private Style() public partial class Styleable { - // aapt resource value: { 0x7F030031,0x7F030032,0x7F030033,0x7F030093,0x7F030094,0x7F030095,0x7F030096,0x7F030097,0x7F030098,0x7F0300A6,0x7F0300AB,0x7F0300AC,0x7F0300BF,0x7F0300E9,0x7F0300EE,0x7F0300F3,0x7F0300F4,0x7F0300F6,0x7F030100,0x7F03010A,0x7F030131,0x7F03013D,0x7F03014E,0x7F030152,0x7F030153,0x7F030182,0x7F030185,0x7F0301CB,0x7F0301D5 } + // aapt resource value: { 0x7F030031,0x7F030032,0x7F030033,0x7F030093,0x7F030094,0x7F030095,0x7F030096,0x7F030097,0x7F030098,0x7F0300A6,0x7F0300AB,0x7F0300AC,0x7F0300BF,0x7F0300E9,0x7F0300EE,0x7F0300F3,0x7F0300F4,0x7F0300F6,0x7F030100,0x7F03010A,0x7F030131,0x7F03013D,0x7F03014E,0x7F030152,0x7F030153,0x7F030183,0x7F030186,0x7F0301CC,0x7F0301D6 } public static int[] ActionBar = new int[] { 2130903089, 2130903090, @@ -14190,10 +14209,10 @@ public partial class Styleable 2130903374, 2130903378, 2130903379, - 2130903426, - 2130903429, - 2130903499, - 2130903509}; + 2130903427, + 2130903430, + 2130903500, + 2130903510}; // aapt resource value: { 0x10100B3 } public static int[] ActionBarLayout = new int[] { @@ -14300,14 +14319,14 @@ public partial class Styleable public static int[] ActionMenuView = new int[] { -1}; - // aapt resource value: { 0x7F030031,0x7F030032,0x7F03007F,0x7F0300E9,0x7F030185,0x7F0301D5 } + // aapt resource value: { 0x7F030031,0x7F030032,0x7F03007F,0x7F0300E9,0x7F030186,0x7F0301D6 } public static int[] ActionMode = new int[] { 2130903089, 2130903090, 2130903167, 2130903273, - 2130903429, - 2130903509}; + 2130903430, + 2130903510}; // aapt resource value: 0 public const int ActionMode_background = 0; @@ -14338,7 +14357,7 @@ public partial class Styleable // aapt resource value: 1 public const int ActivityChooserView_initialActivityCount = 1; - // aapt resource value: { 0x10100F2,0x7F030053,0x7F030054,0x7F030126,0x7F030127,0x7F03013A,0x7F03016A,0x7F03016B } + // aapt resource value: { 0x10100F2,0x7F030053,0x7F030054,0x7F030126,0x7F030127,0x7F03013A,0x7F03016B,0x7F03016C } public static int[] AlertDialog = new int[] { 16842994, 2130903123, @@ -14346,8 +14365,8 @@ public partial class Styleable 2130903334, 2130903335, 2130903354, - 2130903402, - 2130903403}; + 2130903403, + 2130903404}; // aapt resource value: 0 public const int AlertDialog_android_layout = 0; @@ -14439,12 +14458,12 @@ public partial class Styleable 2130903237, 2130903327}; - // aapt resource value: { 0x7F030178,0x7F030179,0x7F03017A,0x7F03017B } + // aapt resource value: { 0x7F030179,0x7F03017A,0x7F03017B,0x7F03017C } public static int[] AppBarLayoutStates = new int[] { - 2130903416, 2130903417, 2130903418, - 2130903419}; + 2130903419, + 2130903420}; // aapt resource value: 0 public const int AppBarLayoutStates_state_collapsed = 0; @@ -14487,12 +14506,12 @@ public partial class Styleable // aapt resource value: 5 public const int AppBarLayout_liftOnScroll = 5; - // aapt resource value: { 0x1010119,0x7F030175,0x7F0301C9,0x7F0301CA } + // aapt resource value: { 0x1010119,0x7F030176,0x7F0301CA,0x7F0301CB } public static int[] AppCompatImageView = new int[] { 16843033, - 2130903413, - 2130903497, - 2130903498}; + 2130903414, + 2130903498, + 2130903499}; // aapt resource value: 0 public const int AppCompatImageView_android_src = 0; @@ -14506,12 +14525,12 @@ public partial class Styleable // aapt resource value: 3 public const int AppCompatImageView_tintMode = 3; - // aapt resource value: { 0x1010142,0x7F0301C6,0x7F0301C7,0x7F0301C8 } + // aapt resource value: { 0x1010142,0x7F0301C7,0x7F0301C8,0x7F0301C9 } public static int[] AppCompatSeekBar = new int[] { 16843074, - 2130903494, 2130903495, - 2130903496}; + 2130903496, + 2130903497}; // aapt resource value: 0 public const int AppCompatSeekBar_android_thumb = 0; @@ -14556,7 +14575,7 @@ public partial class Styleable // aapt resource value: 0 public const int AppCompatTextHelper_android_textAppearance = 0; - // aapt resource value: { 0x1010034,0x7F03002C,0x7F03002D,0x7F03002E,0x7F03002F,0x7F030030,0x7F0300B0,0x7F0300B1,0x7F0300B2,0x7F0300B3,0x7F0300B5,0x7F0300B6,0x7F0300B7,0x7F0300B8,0x7F0300D8,0x7F0300DB,0x7F0300E3,0x7F030112,0x7F030120,0x7F0301A5,0x7F0301BF } + // aapt resource value: { 0x1010034,0x7F03002C,0x7F03002D,0x7F03002E,0x7F03002F,0x7F030030,0x7F0300B0,0x7F0300B1,0x7F0300B2,0x7F0300B3,0x7F0300B5,0x7F0300B6,0x7F0300B7,0x7F0300B8,0x7F0300D8,0x7F0300DB,0x7F0300E3,0x7F030112,0x7F030120,0x7F0301A6,0x7F0301C0 } public static int[] AppCompatTextView = new int[] { 16842804, 2130903084, @@ -14577,8 +14596,8 @@ public partial class Styleable 2130903267, 2130903314, 2130903328, - 2130903461, - 2130903487}; + 2130903462, + 2130903488}; // aapt resource value: 0 public const int AppCompatTextView_android_textAppearance = 0; @@ -14643,7 +14662,7 @@ public partial class Styleable // aapt resource value: 20 public const int AppCompatTextView_textLocale = 20; - // aapt resource value: { 0x1010057,0x10100AE,0x7F030000,0x7F030001,0x7F030002,0x7F030003,0x7F030004,0x7F030005,0x7F030006,0x7F030007,0x7F030008,0x7F030009,0x7F03000A,0x7F03000B,0x7F03000C,0x7F03000E,0x7F03000F,0x7F030010,0x7F030011,0x7F030012,0x7F030013,0x7F030014,0x7F030015,0x7F030016,0x7F030017,0x7F030018,0x7F030019,0x7F03001A,0x7F03001B,0x7F03001C,0x7F03001D,0x7F03001E,0x7F030021,0x7F030022,0x7F030023,0x7F030024,0x7F030025,0x7F03002B,0x7F03003E,0x7F03004C,0x7F03004D,0x7F03004E,0x7F03004F,0x7F030050,0x7F030055,0x7F030056,0x7F030060,0x7F030065,0x7F030086,0x7F030087,0x7F030088,0x7F030089,0x7F03008A,0x7F03008B,0x7F03008C,0x7F03008D,0x7F03008E,0x7F030090,0x7F03009F,0x7F0300A8,0x7F0300A9,0x7F0300AA,0x7F0300AD,0x7F0300AF,0x7F0300BA,0x7F0300BB,0x7F0300BC,0x7F0300BD,0x7F0300BE,0x7F0300F3,0x7F0300FF,0x7F030122,0x7F030123,0x7F030124,0x7F030125,0x7F030128,0x7F030129,0x7F03012A,0x7F03012B,0x7F03012C,0x7F03012D,0x7F03012E,0x7F03012F,0x7F030130,0x7F030145,0x7F030146,0x7F030147,0x7F03014D,0x7F03014F,0x7F030156,0x7F030157,0x7F030158,0x7F030159,0x7F030162,0x7F030163,0x7F030164,0x7F030165,0x7F030172,0x7F030173,0x7F030189,0x7F0301B0,0x7F0301B1,0x7F0301B2,0x7F0301B3,0x7F0301B5,0x7F0301B6,0x7F0301B7,0x7F0301B8,0x7F0301BB,0x7F0301BC,0x7F0301D7,0x7F0301D8,0x7F0301D9,0x7F0301DA,0x7F0301E1,0x7F0301E3,0x7F0301E4,0x7F0301E5,0x7F0301E6,0x7F0301E7,0x7F0301E8,0x7F0301E9,0x7F0301EA,0x7F0301EB,0x7F0301EC } + // aapt resource value: { 0x1010057,0x10100AE,0x7F030000,0x7F030001,0x7F030002,0x7F030003,0x7F030004,0x7F030005,0x7F030006,0x7F030007,0x7F030008,0x7F030009,0x7F03000A,0x7F03000B,0x7F03000C,0x7F03000E,0x7F03000F,0x7F030010,0x7F030011,0x7F030012,0x7F030013,0x7F030014,0x7F030015,0x7F030016,0x7F030017,0x7F030018,0x7F030019,0x7F03001A,0x7F03001B,0x7F03001C,0x7F03001D,0x7F03001E,0x7F030021,0x7F030022,0x7F030023,0x7F030024,0x7F030025,0x7F03002B,0x7F03003E,0x7F03004C,0x7F03004D,0x7F03004E,0x7F03004F,0x7F030050,0x7F030055,0x7F030056,0x7F030060,0x7F030065,0x7F030086,0x7F030087,0x7F030088,0x7F030089,0x7F03008A,0x7F03008B,0x7F03008C,0x7F03008D,0x7F03008E,0x7F030090,0x7F03009F,0x7F0300A8,0x7F0300A9,0x7F0300AA,0x7F0300AD,0x7F0300AF,0x7F0300BA,0x7F0300BB,0x7F0300BC,0x7F0300BD,0x7F0300BE,0x7F0300F3,0x7F0300FF,0x7F030122,0x7F030123,0x7F030124,0x7F030125,0x7F030128,0x7F030129,0x7F03012A,0x7F03012B,0x7F03012C,0x7F03012D,0x7F03012E,0x7F03012F,0x7F030130,0x7F030145,0x7F030146,0x7F030147,0x7F03014D,0x7F03014F,0x7F030156,0x7F030157,0x7F030158,0x7F030159,0x7F030163,0x7F030164,0x7F030165,0x7F030166,0x7F030173,0x7F030174,0x7F03018A,0x7F0301B1,0x7F0301B2,0x7F0301B3,0x7F0301B4,0x7F0301B6,0x7F0301B7,0x7F0301B8,0x7F0301B9,0x7F0301BC,0x7F0301BD,0x7F0301D8,0x7F0301D9,0x7F0301DA,0x7F0301DB,0x7F0301E2,0x7F0301E4,0x7F0301E5,0x7F0301E6,0x7F0301E7,0x7F0301E8,0x7F0301E9,0x7F0301EA,0x7F0301EB,0x7F0301EC,0x7F0301ED } public static int[] AppCompatTheme = new int[] { 16842839, 16842926, @@ -14738,29 +14757,28 @@ public partial class Styleable 2130903383, 2130903384, 2130903385, - 2130903394, 2130903395, 2130903396, 2130903397, - 2130903410, + 2130903398, 2130903411, - 2130903433, - 2130903472, + 2130903412, + 2130903434, 2130903473, 2130903474, 2130903475, - 2130903477, + 2130903476, 2130903478, 2130903479, 2130903480, - 2130903483, + 2130903481, 2130903484, - 2130903511, + 2130903485, 2130903512, 2130903513, 2130903514, - 2130903521, - 2130903523, + 2130903515, + 2130903522, 2130903524, 2130903525, 2130903526, @@ -14769,7 +14787,8 @@ public partial class Styleable 2130903529, 2130903530, 2130903531, - 2130903532}; + 2130903532, + 2130903533}; // aapt resource value: 2 public const int AppCompatTheme_actionBarDivider = 2; @@ -15297,7 +15316,7 @@ public partial class Styleable // aapt resource value: 12 public const int CardView_contentPaddingTop = 12; - // aapt resource value: { 0x1010034,0x10100AB,0x101011F,0x101014F,0x10101E5,0x7F030062,0x7F030063,0x7F030064,0x7F030066,0x7F030067,0x7F030068,0x7F03006A,0x7F03006B,0x7F03006C,0x7F03006D,0x7F03006E,0x7F03006F,0x7F030074,0x7F030075,0x7F030076,0x7F030078,0x7F030079,0x7F03007A,0x7F03007B,0x7F03007C,0x7F03007D,0x7F03007E,0x7F0300ED,0x7F0300F7,0x7F0300FB,0x7F03015C,0x7F030168,0x7F0301BD,0x7F0301C0 } + // aapt resource value: { 0x1010034,0x10100AB,0x101011F,0x101014F,0x10101E5,0x7F030062,0x7F030063,0x7F030064,0x7F030066,0x7F030067,0x7F030068,0x7F03006A,0x7F03006B,0x7F03006C,0x7F03006D,0x7F03006E,0x7F03006F,0x7F030074,0x7F030075,0x7F030076,0x7F030078,0x7F030079,0x7F03007A,0x7F03007B,0x7F03007C,0x7F03007D,0x7F03007E,0x7F0300ED,0x7F0300F7,0x7F0300FB,0x7F03015C,0x7F030169,0x7F0301BE,0x7F0301C1 } public static int[] Chip = new int[] { 16842804, 16842923, @@ -15330,18 +15349,18 @@ public partial class Styleable 2130903287, 2130903291, 2130903388, - 2130903400, - 2130903485, - 2130903488}; + 2130903401, + 2130903486, + 2130903489}; - // aapt resource value: { 0x7F030061,0x7F030070,0x7F030071,0x7F030072,0x7F03016C,0x7F03016D } + // aapt resource value: { 0x7F030061,0x7F030070,0x7F030071,0x7F030072,0x7F03016D,0x7F03016E } public static int[] ChipGroup = new int[] { 2130903137, 2130903152, 2130903153, 2130903154, - 2130903404, - 2130903405}; + 2130903405, + 2130903406}; // aapt resource value: 0 public const int ChipGroup_checkedChip = 0; @@ -15463,7 +15482,7 @@ public partial class Styleable // aapt resource value: 33 public const int Chip_textStartPadding = 33; - // aapt resource value: { 0x7F030082,0x7F030083,0x7F03009E,0x7F0300C6,0x7F0300C7,0x7F0300C8,0x7F0300C9,0x7F0300CA,0x7F0300CB,0x7F0300CC,0x7F03015D,0x7F03015F,0x7F03017D,0x7F0301CB,0x7F0301CC,0x7F0301D6 } + // aapt resource value: { 0x7F030082,0x7F030083,0x7F03009E,0x7F0300C6,0x7F0300C7,0x7F0300C8,0x7F0300C9,0x7F0300CA,0x7F0300CB,0x7F0300CC,0x7F03015D,0x7F03015F,0x7F03017E,0x7F0301CC,0x7F0301CD,0x7F0301D7 } public static int[] CollapsingToolbarLayout = new int[] { 2130903170, 2130903171, @@ -15477,10 +15496,10 @@ public partial class Styleable 2130903244, 2130903389, 2130903391, - 2130903421, - 2130903499, + 2130903422, 2130903500, - 2130903510}; + 2130903501, + 2130903511}; // aapt resource value: 0 public const int CollapsingToolbarLayout_collapsedTitleGravity = 0; @@ -15575,10 +15594,10 @@ public partial class Styleable // aapt resource value: 3 public const int CompoundButton_buttonTintMode = 3; - // aapt resource value: { 0x7F030110,0x7F03017C } + // aapt resource value: { 0x7F030110,0x7F03017D } public static int[] CoordinatorLayout = new int[] { 2130903312, - 2130903420}; + 2130903421}; // aapt resource value: 0 public const int CoordinatorLayout_keylines = 0; @@ -15628,7 +15647,7 @@ public partial class Styleable // aapt resource value: 1 public const int DesignTheme_bottomSheetStyle = 1; - // aapt resource value: { 0x7F030029,0x7F03002A,0x7F030036,0x7F030085,0x7F0300B4,0x7F0300E6,0x7F030171,0x7F0301C2 } + // aapt resource value: { 0x7F030029,0x7F03002A,0x7F030036,0x7F030085,0x7F0300B4,0x7F0300E6,0x7F030172,0x7F0301C3 } public static int[] DrawerArrowToggle = new int[] { 2130903081, 2130903082, @@ -15636,8 +15655,8 @@ public partial class Styleable 2130903173, 2130903220, 2130903270, - 2130903409, - 2130903490}; + 2130903410, + 2130903491}; // aapt resource value: 0 public const int DrawerArrowToggle_arrowHeadLength = 0; @@ -15663,7 +15682,7 @@ public partial class Styleable // aapt resource value: 7 public const int DrawerArrowToggle_thickness = 7; - // aapt resource value: { 0x7F030034,0x7F030035,0x7F03003D,0x7F0300BF,0x7F0300D1,0x7F0300D2,0x7F0300ED,0x7F0300F5,0x7F030137,0x7F030151,0x7F03015C,0x7F030168,0x7F0301E0 } + // aapt resource value: { 0x7F030034,0x7F030035,0x7F03003D,0x7F0300BF,0x7F0300D1,0x7F0300D2,0x7F0300ED,0x7F0300F5,0x7F030137,0x7F030151,0x7F03015C,0x7F030169,0x7F0301E1 } public static int[] FloatingActionButton = new int[] { 2130903092, 2130903093, @@ -15676,8 +15695,8 @@ public partial class Styleable 2130903351, 2130903377, 2130903388, - 2130903400, - 2130903520}; + 2130903401, + 2130903521}; // aapt resource value: 0 public const int FloatingActionButton_backgroundTint = 0; @@ -15745,7 +15764,7 @@ public partial class Styleable 2130903264, 2130903265}; - // aapt resource value: { 0x1010532,0x1010533,0x101053F,0x101056F,0x1010570,0x7F0300DA,0x7F0300E2,0x7F0300E3,0x7F0300E4,0x7F0301DF } + // aapt resource value: { 0x1010532,0x1010533,0x101053F,0x101056F,0x1010570,0x7F0300DA,0x7F0300E2,0x7F0300E3,0x7F0300E4,0x7F0301E0 } public static int[] FontFamilyFont = new int[] { 16844082, 16844083, @@ -15756,7 +15775,7 @@ public partial class Styleable 2130903266, 2130903267, 2130903268, - 2130903519}; + 2130903520}; // aapt resource value: 0 public const int FontFamilyFont_android_font = 0; @@ -15890,7 +15909,7 @@ public partial class Styleable // aapt resource value: 0 public const int ItemsViewRendererTheme_collectionViewStyle = 0; - // aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F0300AC,0x7F0300AE,0x7F030138,0x7F030167 } + // aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F0300AC,0x7F0300AE,0x7F030138,0x7F030168 } public static int[] LinearLayoutCompat = new int[] { 16842927, 16842948, @@ -15900,7 +15919,7 @@ public partial class Styleable 2130903212, 2130903214, 2130903352, - 2130903399}; + 2130903400}; // aapt resource value: 2 public const int LinearLayoutCompat_android_baselineAligned = 2; @@ -15959,7 +15978,7 @@ public partial class Styleable // aapt resource value: 1 public const int ListPopupWindow_android_dropDownVerticalOffset = 1; - // aapt resource value: { 0x10101B7,0x10101B8,0x10101B9,0x10101BA,0x7F030034,0x7F030035,0x7F0300A1,0x7F0300F6,0x7F0300F8,0x7F0300F9,0x7F0300FA,0x7F0300FC,0x7F0300FD,0x7F03015C,0x7F03017E,0x7F03017F } + // aapt resource value: { 0x10101B7,0x10101B8,0x10101B9,0x10101BA,0x7F030034,0x7F030035,0x7F0300A1,0x7F0300F6,0x7F0300F8,0x7F0300F9,0x7F0300FA,0x7F0300FC,0x7F0300FD,0x7F03015C,0x7F03017F,0x7F030180 } public static int[] MaterialButton = new int[] { 16843191, 16843192, @@ -15975,8 +15994,8 @@ public partial class Styleable 2130903292, 2130903293, 2130903388, - 2130903422, - 2130903423}; + 2130903423, + 2130903424}; // aapt resource value: 3 public const int MaterialButton_android_insetBottom = 3; @@ -16026,10 +16045,10 @@ public partial class Styleable // aapt resource value: 15 public const int MaterialButton_strokeWidth = 15; - // aapt resource value: { 0x7F03017E,0x7F03017F } + // aapt resource value: { 0x7F03017F,0x7F030180 } public static int[] MaterialCardView = new int[] { - 2130903422, - 2130903423}; + 2130903423, + 2130903424}; // aapt resource value: 0 public const int MaterialCardView_strokeColor = 0; @@ -16037,7 +16056,7 @@ public partial class Styleable // aapt resource value: 1 public const int MaterialCardView_strokeWidth = 1; - // aapt resource value: { 0x7F030041,0x7F030042,0x7F030069,0x7F030073,0x7F030077,0x7F030086,0x7F030087,0x7F03008D,0x7F03008E,0x7F03008F,0x7F0300BE,0x7F0300D9,0x7F030133,0x7F030134,0x7F03013E,0x7F03015E,0x7F03016E,0x7F0301A1,0x7F0301A6,0x7F0301A7,0x7F0301A8,0x7F0301A9,0x7F0301AA,0x7F0301AB,0x7F0301AC,0x7F0301AD,0x7F0301AE,0x7F0301AF,0x7F0301B4,0x7F0301B9,0x7F0301BA,0x7F0301BE } + // aapt resource value: { 0x7F030041,0x7F030042,0x7F030069,0x7F030073,0x7F030077,0x7F030086,0x7F030087,0x7F03008D,0x7F03008E,0x7F03008F,0x7F0300BE,0x7F0300D9,0x7F030133,0x7F030134,0x7F03013E,0x7F03015E,0x7F03016F,0x7F0301A2,0x7F0301A7,0x7F0301A8,0x7F0301A9,0x7F0301AA,0x7F0301AB,0x7F0301AC,0x7F0301AD,0x7F0301AE,0x7F0301AF,0x7F0301B0,0x7F0301B5,0x7F0301BA,0x7F0301BB,0x7F0301BF } public static int[] MaterialComponentsTheme = new int[] { 2130903105, 2130903106, @@ -16055,9 +16074,8 @@ public partial class Styleable 2130903348, 2130903358, 2130903390, - 2130903406, - 2130903457, - 2130903462, + 2130903407, + 2130903458, 2130903463, 2130903464, 2130903465, @@ -16067,10 +16085,11 @@ public partial class Styleable 2130903469, 2130903470, 2130903471, - 2130903476, - 2130903481, + 2130903472, + 2130903477, 2130903482, - 2130903486}; + 2130903483, + 2130903487}; // aapt resource value: 0 public const int MaterialComponentsTheme_bottomSheetDialogTheme = 0; @@ -16195,7 +16214,7 @@ public partial class Styleable // aapt resource value: 2 public const int MenuGroup_android_visible = 2; - // aapt resource value: { 0x1010002,0x101000E,0x10100D0,0x1010106,0x1010194,0x10101DE,0x10101DF,0x10101E1,0x10101E2,0x10101E3,0x10101E4,0x10101E5,0x101026F,0x7F03000D,0x7F03001F,0x7F030020,0x7F030028,0x7F030092,0x7F0300FC,0x7F0300FD,0x7F03013F,0x7F030166,0x7F0301DB } + // aapt resource value: { 0x1010002,0x101000E,0x10100D0,0x1010106,0x1010194,0x10101DE,0x10101DF,0x10101E1,0x10101E2,0x10101E3,0x10101E4,0x10101E5,0x101026F,0x7F03000D,0x7F03001F,0x7F030020,0x7F030028,0x7F030092,0x7F0300FC,0x7F0300FD,0x7F03013F,0x7F030167,0x7F0301DC } public static int[] MenuItem = new int[] { 16842754, 16842766, @@ -16218,8 +16237,8 @@ public partial class Styleable 2130903292, 2130903293, 2130903359, - 2130903398, - 2130903515}; + 2130903399, + 2130903516}; // aapt resource value: 13 public const int MenuItem_actionLayout = 13; @@ -16290,7 +16309,7 @@ public partial class Styleable // aapt resource value: 22 public const int MenuItem_tooltipText = 22; - // aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F030150,0x7F030180 } + // aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F030150,0x7F030181 } public static int[] MenuView = new int[] { 16842926, 16843052, @@ -16300,7 +16319,7 @@ public partial class Styleable 16843056, 16843057, 2130903376, - 2130903424}; + 2130903425}; // aapt resource value: 4 public const int MenuView_android_headerBackground = 4; @@ -16386,9 +16405,9 @@ public partial class Styleable 16843465, 2130903360}; - // aapt resource value: { 0x7F030177 } + // aapt resource value: { 0x7F030178 } public static int[] PopupWindowBackgroundState = new int[] { - 2130903415}; + 2130903416}; // aapt resource value: 0 public const int PopupWindowBackgroundState_state_above_anchor = 0; @@ -16413,7 +16432,7 @@ public partial class Styleable // aapt resource value: 1 public const int RecycleListView_paddingTopNoTitle = 1; - // aapt resource value: { 0x10100C4,0x10100EB,0x10100F1,0x7F0300D3,0x7F0300D4,0x7F0300D5,0x7F0300D6,0x7F0300D7,0x7F030114,0x7F03015B,0x7F030170,0x7F030176 } + // aapt resource value: { 0x10100C4,0x10100EB,0x10100F1,0x7F0300D3,0x7F0300D4,0x7F0300D5,0x7F0300D6,0x7F0300D7,0x7F030114,0x7F03015B,0x7F030171,0x7F030177 } public static int[] RecyclerView = new int[] { 16842948, 16842987, @@ -16425,8 +16444,8 @@ public partial class Styleable 2130903255, 2130903316, 2130903387, - 2130903408, - 2130903414}; + 2130903409, + 2130903415}; // aapt resource value: 1 public const int RecyclerView_android_clipToPadding = 1; @@ -16478,7 +16497,14 @@ public partial class Styleable // aapt resource value: 0 public const int ScrollingViewBehavior_Layout_behavior_overlapTop = 0; - // aapt resource value: { 0x10100DA,0x101011F,0x1010220,0x1010264,0x7F030078,0x7F030091,0x7F0300A7,0x7F0300E7,0x7F0300FE,0x7F030113,0x7F030154,0x7F030155,0x7F030160,0x7F030161,0x7F030181,0x7F030186,0x7F0301E2 } + // aapt resource value: { 0x7F030160 } + public static int[] ScrollViewRendererTheme = new int[] { + 2130903392}; + + // aapt resource value: 0 + public const int ScrollViewRendererTheme_scrollViewStyle = 0; + + // aapt resource value: { 0x10100DA,0x101011F,0x1010220,0x1010264,0x7F030078,0x7F030091,0x7F0300A7,0x7F0300E7,0x7F0300FE,0x7F030113,0x7F030154,0x7F030155,0x7F030161,0x7F030162,0x7F030182,0x7F030187,0x7F0301E3 } public static int[] SearchView = new int[] { 16842970, 16843039, @@ -16492,11 +16518,11 @@ public partial class Styleable 2130903315, 2130903380, 2130903381, - 2130903392, 2130903393, - 2130903425, - 2130903430, - 2130903522}; + 2130903394, + 2130903426, + 2130903431, + 2130903523}; // aapt resource value: 0 public const int SearchView_android_focusable = 0; @@ -16549,10 +16575,10 @@ public partial class Styleable // aapt resource value: 16 public const int SearchView_voiceIcon = 16; - // aapt resource value: { 0x7F03016E,0x7F03016F } + // aapt resource value: { 0x7F03016F,0x7F030170 } public static int[] Snackbar = new int[] { - 2130903406, - 2130903407}; + 2130903407, + 2130903408}; // aapt resource value: { 0x101011F,0x7F0300BF,0x7F030135 } public static int[] SnackbarLayout = new int[] { @@ -16632,22 +16658,22 @@ public partial class Styleable // aapt resource value: 1 public const int StateListDrawable_android_visible = 1; - // aapt resource value: { 0x1010124,0x1010125,0x1010142,0x7F030169,0x7F030174,0x7F030187,0x7F030188,0x7F03018A,0x7F0301C3,0x7F0301C4,0x7F0301C5,0x7F0301DC,0x7F0301DD,0x7F0301DE } + // aapt resource value: { 0x1010124,0x1010125,0x1010142,0x7F03016A,0x7F030175,0x7F030188,0x7F030189,0x7F03018B,0x7F0301C4,0x7F0301C5,0x7F0301C6,0x7F0301DD,0x7F0301DE,0x7F0301DF } public static int[] SwitchCompat = new int[] { 16843044, 16843045, 16843074, - 2130903401, - 2130903412, - 2130903431, + 2130903402, + 2130903413, 2130903432, - 2130903434, - 2130903491, + 2130903433, + 2130903435, 2130903492, 2130903493, - 2130903516, + 2130903494, 2130903517, - 2130903518}; + 2130903518, + 2130903519}; // aapt resource value: 1 public const int SwitchCompat_android_textOff = 1; @@ -16706,9 +16732,8 @@ public partial class Styleable // aapt resource value: 2 public const int TabItem_android_text = 2; - // aapt resource value: { 0x7F03018B,0x7F03018C,0x7F03018D,0x7F03018E,0x7F03018F,0x7F030190,0x7F030191,0x7F030192,0x7F030193,0x7F030194,0x7F030195,0x7F030196,0x7F030197,0x7F030198,0x7F030199,0x7F03019A,0x7F03019B,0x7F03019C,0x7F03019D,0x7F03019E,0x7F03019F,0x7F0301A0,0x7F0301A2,0x7F0301A3,0x7F0301A4 } + // aapt resource value: { 0x7F03018C,0x7F03018D,0x7F03018E,0x7F03018F,0x7F030190,0x7F030191,0x7F030192,0x7F030193,0x7F030194,0x7F030195,0x7F030196,0x7F030197,0x7F030198,0x7F030199,0x7F03019A,0x7F03019B,0x7F03019C,0x7F03019D,0x7F03019E,0x7F03019F,0x7F0301A0,0x7F0301A1,0x7F0301A3,0x7F0301A4,0x7F0301A5 } public static int[] TabLayout = new int[] { - 2130903435, 2130903436, 2130903437, 2130903438, @@ -16730,9 +16755,10 @@ public partial class Styleable 2130903454, 2130903455, 2130903456, - 2130903458, + 2130903457, 2130903459, - 2130903460}; + 2130903460, + 2130903461}; // aapt resource value: 0 public const int TabLayout_tabBackground = 0; @@ -16809,7 +16835,7 @@ public partial class Styleable // aapt resource value: 24 public const int TabLayout_tabUnboundedRipple = 24; - // aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x1010585,0x7F0300DB,0x7F0300E3,0x7F0301A5,0x7F0301BF } + // aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x1010585,0x7F0300DB,0x7F0300E3,0x7F0301A6,0x7F0301C0 } public static int[] TextAppearance = new int[] { 16842901, 16842902, @@ -16825,8 +16851,8 @@ public partial class Styleable 16844165, 2130903259, 2130903267, - 2130903461, - 2130903487}; + 2130903462, + 2130903488}; // aapt resource value: 10 public const int TextAppearance_android_fontFamily = 10; @@ -17006,7 +17032,7 @@ public partial class Styleable // aapt resource value: 2 public const int ThemeEnforcement_enforceTextAppearance = 2; - // aapt resource value: { 0x10100AF,0x1010140,0x7F030052,0x7F030080,0x7F030081,0x7F030093,0x7F030094,0x7F030095,0x7F030096,0x7F030097,0x7F030098,0x7F030131,0x7F030132,0x7F030136,0x7F030139,0x7F03013B,0x7F03013C,0x7F03014E,0x7F030182,0x7F030183,0x7F030184,0x7F0301CB,0x7F0301CD,0x7F0301CE,0x7F0301CF,0x7F0301D0,0x7F0301D1,0x7F0301D2,0x7F0301D3,0x7F0301D4 } + // aapt resource value: { 0x10100AF,0x1010140,0x7F030052,0x7F030080,0x7F030081,0x7F030093,0x7F030094,0x7F030095,0x7F030096,0x7F030097,0x7F030098,0x7F030131,0x7F030132,0x7F030136,0x7F030139,0x7F03013B,0x7F03013C,0x7F03014E,0x7F030183,0x7F030184,0x7F030185,0x7F0301CC,0x7F0301CE,0x7F0301CF,0x7F0301D0,0x7F0301D1,0x7F0301D2,0x7F0301D3,0x7F0301D4,0x7F0301D5 } public static int[] Toolbar = new int[] { 16842927, 16843072, @@ -17026,18 +17052,18 @@ public partial class Styleable 2130903355, 2130903356, 2130903374, - 2130903426, 2130903427, 2130903428, - 2130903499, - 2130903501, + 2130903429, + 2130903500, 2130903502, 2130903503, 2130903504, 2130903505, 2130903506, 2130903507, - 2130903508}; + 2130903508, + 2130903509}; // aapt resource value: 0 public const int Toolbar_android_gravity = 0; @@ -17129,13 +17155,13 @@ public partial class Styleable // aapt resource value: 29 public const int Toolbar_titleTextColor = 29; - // aapt resource value: { 0x1010000,0x10100DA,0x7F030142,0x7F030143,0x7F0301C1 } + // aapt resource value: { 0x1010000,0x10100DA,0x7F030142,0x7F030143,0x7F0301C2 } public static int[] View = new int[] { 16842752, 16842970, 2130903362, 2130903363, - 2130903489}; + 2130903490}; // aapt resource value: { 0x10100D4,0x7F030034,0x7F030035 } public static int[] ViewBackgroundHelper = new int[] { diff --git a/src/MapsApp.Shared/MapsApp.Shared.shproj b/src/MapsApp.Shared/MapsApp.Shared.shproj index 9edefe4..44fa9b7 100644 --- a/src/MapsApp.Shared/MapsApp.Shared.shproj +++ b/src/MapsApp.Shared/MapsApp.Shared.shproj @@ -3,7 +3,7 @@ 2c2a9421-c9c7-4a51-aae3-216f7e05d8d8 14.0 - 1.0.8 + 1.0.9 diff --git a/src/MapsApp.Shared/ViewModels/AuthViewModel.cs b/src/MapsApp.Shared/ViewModels/AuthViewModel.cs index 5a59807..65abfbd 100644 --- a/src/MapsApp.Shared/ViewModels/AuthViewModel.cs +++ b/src/MapsApp.Shared/ViewModels/AuthViewModel.cs @@ -141,15 +141,10 @@ private async Task SignIntoPortal() private void UpdateAuthenticationManager() { // Define the server information for ArcGIS Online - var portalServerInfo = new ServerInfo + var portalServerInfo = new ServerInfo(new Uri(Configuration.ArcGISOnlineUrl)) { - ServerUri = new Uri(Configuration.ArcGISOnlineUrl), TokenAuthenticationType = TokenAuthenticationType.OAuthImplicit, - OAuthClientInfo = new OAuthClientInfo - { - ClientId = Configuration.AppClientID, - RedirectUri = new Uri(Configuration.RedirectURL) - }, + OAuthClientInfo = new OAuthClientInfo(Configuration.AppClientID, new Uri(Configuration.RedirectURL)) }; try diff --git a/src/MapsApp.UWP/MapsApp.UWP.csproj b/src/MapsApp.UWP/MapsApp.UWP.csproj index b8ad362..df98888 100644 --- a/src/MapsApp.UWP/MapsApp.UWP.csproj +++ b/src/MapsApp.UWP/MapsApp.UWP.csproj @@ -11,7 +11,7 @@ MapsApp en-US UAP - 10.0.17763.0 + 10.0.18362.0 10.0.17134.0 14 true @@ -24,7 +24,7 @@ x64 win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot True - 1.0.8 + 1.0.9 true @@ -252,10 +252,10 @@ - 100.9.0 + 100.10.0 - 100.9.0 + 100.10.0 6.2.10 @@ -264,7 +264,7 @@ 1.7.0 - 4.8.0.1364 + 4.8.0.1687 diff --git a/src/MapsApp.UWP/Package.appxmanifest b/src/MapsApp.UWP/Package.appxmanifest index 9cf8cbb..ed48405 100644 --- a/src/MapsApp.UWP/Package.appxmanifest +++ b/src/MapsApp.UWP/Package.appxmanifest @@ -1,6 +1,6 @@  - + MapsApp.UWP diff --git a/src/MapsApp.UWP/Properties/AssemblyInfo.cs b/src/MapsApp.UWP/Properties/AssemblyInfo.cs index 05e470d..b9b9aad 100644 --- a/src/MapsApp.UWP/Properties/AssemblyInfo.cs +++ b/src/MapsApp.UWP/Properties/AssemblyInfo.cs @@ -24,6 +24,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.8.0")] -[assembly: AssemblyFileVersion("1.0.8.0")] +[assembly: AssemblyVersion("1.0.9.0")] +[assembly: AssemblyFileVersion("1.0.9.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/src/MapsApp.WPF_NetCore/MapsApp.WPF_NetCore.csproj b/src/MapsApp.WPF_NetCore/MapsApp.WPF_NetCore.csproj index c538963..0bb1b5f 100644 --- a/src/MapsApp.WPF_NetCore/MapsApp.WPF_NetCore.csproj +++ b/src/MapsApp.WPF_NetCore/MapsApp.WPF_NetCore.csproj @@ -9,7 +9,7 @@ WPF;NET_CORE $(DefaultItemExcludes);netframework\**;obj\**;netcore\**;out\**;bin\** ..\MapsApp.WPF_NetFramework\Images\ArcGIS_Open_Source_Apps.ico - 1.0.8 + 1.0.9 @@ -32,7 +32,7 @@ - + diff --git a/src/MapsApp.WPF_NetFramework/MainWindow.xaml.cs b/src/MapsApp.WPF_NetFramework/MainWindow.xaml.cs index 048c935..2c18c0e 100644 --- a/src/MapsApp.WPF_NetFramework/MainWindow.xaml.cs +++ b/src/MapsApp.WPF_NetFramework/MainWindow.xaml.cs @@ -214,7 +214,7 @@ private async void Initialize() } }; } - catch (Exception ex) + catch (Exception) { geocodeViewModel.ErrorMessage = "Couldn't load images"; } diff --git a/src/MapsApp.WPF_NetFramework/MapsApp.WPF_NetFramework.csproj b/src/MapsApp.WPF_NetFramework/MapsApp.WPF_NetFramework.csproj index 83379fc..ccce3a3 100644 --- a/src/MapsApp.WPF_NetFramework/MapsApp.WPF_NetFramework.csproj +++ b/src/MapsApp.WPF_NetFramework/MapsApp.WPF_NetFramework.csproj @@ -27,11 +27,11 @@ false true 0 - 1.0.8.0 + 1.0.9.0 false true - 1.0.8 + 1.0.9 AnyCPU @@ -199,7 +199,7 @@ - 100.9.0 + 100.10.0 1.1.19 diff --git a/src/MapsApp.WPF_NetFramework/Properties/AssemblyInfo.cs b/src/MapsApp.WPF_NetFramework/Properties/AssemblyInfo.cs index 74fd5ef..371ed66 100644 --- a/src/MapsApp.WPF_NetFramework/Properties/AssemblyInfo.cs +++ b/src/MapsApp.WPF_NetFramework/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.8.0")] -[assembly: AssemblyFileVersion("1.0.8.0")] +[assembly: AssemblyVersion("1.0.9.0")] +[assembly: AssemblyFileVersion("1.0.9.0")] diff --git a/src/MapsApp.Xamarin.Shared/MapsApp.Xamarin.Shared.shproj b/src/MapsApp.Xamarin.Shared/MapsApp.Xamarin.Shared.shproj index 24cc4c5..29fcbd0 100644 --- a/src/MapsApp.Xamarin.Shared/MapsApp.Xamarin.Shared.shproj +++ b/src/MapsApp.Xamarin.Shared/MapsApp.Xamarin.Shared.shproj @@ -2,7 +2,7 @@ c0e5c9c0-53d2-4eed-b36e-d7a8db55e1d1 - 1.0.8 + 1.0.9 diff --git a/src/MapsApp.Xamarin.Shared/MapsApp.projitems b/src/MapsApp.Xamarin.Shared/MapsApp.projitems index 53810c7..c1af03e 100644 --- a/src/MapsApp.Xamarin.Shared/MapsApp.projitems +++ b/src/MapsApp.Xamarin.Shared/MapsApp.projitems @@ -15,6 +15,9 @@ + + + ControlStyles.xaml Code @@ -27,8 +30,6 @@ LightTheme.xaml Code - - Designer MSBuild:UpdateDesignTimeXaml @@ -59,20 +60,14 @@ ErrorDialog.xaml Code - - Designer MSBuild:UpdateDesignTimeXaml - - Designer MSBuild:UpdateDesignTimeXaml - - Designer MSBuild:UpdateDesignTimeXaml diff --git a/src/MapsApp.iOS/Info.plist b/src/MapsApp.iOS/Info.plist index edaa3e9..e1c8db4 100644 --- a/src/MapsApp.iOS/Info.plist +++ b/src/MapsApp.iOS/Info.plist @@ -26,7 +26,7 @@ CFBundleIdentifier com.esri.arcgisruntime.opensourceapps.maps-app-xamarin CFBundleVersion - 1.0.8 + 1.0.9 CFBundleIconFiles Icon-60@2x.png @@ -75,6 +75,6 @@ CFBundleName MapsApp MinimumOSVersion - 12.0 + 13.0 diff --git a/src/MapsApp.iOS/MapsApp.iOS.csproj b/src/MapsApp.iOS/MapsApp.iOS.csproj index 84fb38e..d7e0d75 100644 --- a/src/MapsApp.iOS/MapsApp.iOS.csproj +++ b/src/MapsApp.iOS/MapsApp.iOS.csproj @@ -26,11 +26,11 @@ true true 0 - 1.0.8.0 + 1.0.9.0 false true true - 1.0.8 + 1.0.9 true @@ -519,10 +519,10 @@ - 100.9.0 + 100.10.0 - 100.9.0 + 100.10.0 1.0.21 @@ -537,7 +537,7 @@ 1.7.0 - 4.8.0.1364 + 4.8.0.1687 diff --git a/src/MapsApp.iOS/Properties/AssemblyInfo.cs b/src/MapsApp.iOS/Properties/AssemblyInfo.cs index 951aca4..5ea16e0 100644 --- a/src/MapsApp.iOS/Properties/AssemblyInfo.cs +++ b/src/MapsApp.iOS/Properties/AssemblyInfo.cs @@ -32,7 +32,7 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.8.0")] -[assembly: AssemblyFileVersion("1.0.8.0")] +[assembly: AssemblyVersion("1.0.9.0")] +[assembly: AssemblyFileVersion("1.0.9.0")] [assembly: XamlCompilation(XamlCompilationOptions.Compile)] diff --git a/src/MapsApp.sln b/src/MapsApp.sln index 95e2276..7e7dd03 100644 --- a/src/MapsApp.sln +++ b/src/MapsApp.sln @@ -328,6 +328,6 @@ Global SolutionGuid = {85B96781-BD01-489E-9F9F-91FFECC94A17} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution - version = 1.0.8 + version = 1.0.9 EndGlobalSection EndGlobal