Merge pull request #353 from heremaps/esd/42040

Update example apps for release 4.20.4.0

README.md

@@ -26,7 +26,7 @@ For an overview of the existing features, please check the _Developer Guide_ for
 
 > For now, the _Navigate Edition_ is only available upon request. Please contact your HERE representative to receive access including a set of evaluation credentials.
 
-## List of Available Example Apps (Version 4.20.3.0)
+## List of Available Example Apps (Version 4.20.4.0)
 
 - **HelloMap**: Shows the classic 'Hello World'.
 - **HelloMapKotlin**: Shows the classic 'Hello World' using Kotlin language (Android only).

examples/latest/README.md

@@ -1,4 +1,4 @@
-This folder contains the HERE SDK examples apps for version: 4.20.3.0
+This folder contains the HERE SDK examples apps for version: 4.20.4.0
 
 - HERE SDK for Android ([Lite Edition](lite/android/), [Explore Edition](explore/android/), [Navigate Edition](navigate/android/))
 - HERE SDK for iOS ([Lite Edition](lite/ios/), [Explore Edition](explore/ios/), [Navigate Edition](navigate/ios/))

examples/latest/explore/flutter/camera_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.camera_app" 
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/camera_keyframe_tracks_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.examples.camera_keyframe_tracks_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/custom_map_styles_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.custom_map_styles_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/custom_point_tile_source_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.custom_point_tile_source_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/custom_point_tile_source_app/pubspec.yaml

@@ -50,8 +50,9 @@ flutter:
   uses-material-design: true
 
   # To add assets to your application, add an assets section, like this:
-  assets:
-    - assets/
+  # assets:
+  #   - images/a_dot_burr.jpeg
+  #   - images/a_dot_ham.jpeg
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.

examples/latest/explore/flutter/custom_polygon_layers_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.custom_polygon_layers_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/custom_polygon_layers_app/pubspec.yaml

@@ -50,8 +50,9 @@ flutter:
   uses-material-design: true
 
   # To add assets to your application, add an assets section, like this:
-  assets:
-    - assets/
+  # assets:
+  #   - images/a_dot_burr.jpeg
+  #   - images/a_dot_ham.jpeg
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.

examples/latest/explore/flutter/custom_raster_layers_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.custom_raster_layers_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/custom_raster_tile_source_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.custom_raster_tile_source_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/ev_routing_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.ev_routing_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/gestures_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.gestures_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/hello_map_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.hello_map_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/map_items_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.map_items_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/public_transit_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.public_transit_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/routing_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.routing_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/search_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.search_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/traffic_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.traffic_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/flutter/unit_testing_app/android/app/build.gradle

@@ -23,6 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.here.sdk.examples.unit_testing_app"
     compileSdkVersion 34
 
     lintOptions {

examples/latest/explore/ios/Camera/Camera/CameraExample.swift

@@ -18,7 +18,7 @@
  */
 
 import heresdk
-import UIKit
+import SwiftUI
 
 // This example shows how to use the Camera class to rotate and tilt the map programmatically, to set
 // a new transform center that influences those operations, and to move to a new location.
@@ -173,19 +173,21 @@ class CameraExample: TapDelegate, MapCameraDelegate {
     }
 
     private func showDialog(title: String, message: String) {
-        if let topController = UIApplication.shared.windows.first?.rootViewController {
+        if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+           let rootViewController = windowScene.windows.first(where: { $0.isKeyWindow })?.rootViewController {
+
             let alert = UIAlertController(
                 title: title,
                 message: message,
                 preferredStyle: .alert
             )
-            
+
             alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
                 // Handle OK button action.
                 alert.dismiss(animated: true, completion: nil)
             }))
-            
-            topController.present(alert, animated: true, completion: nil)
+
+            rootViewController.present(alert, animated: true, completion: nil)
         }
     }
 }

examples/latest/explore/ios/CameraKeyframeTracks/CameraKeyframeTracks/CameraKeyframeTracksExample.swift

@@ -49,6 +49,9 @@ class CameraKeyframeTracksExample: AnimationDelegate {
             print("Error: Map scene not loaded, \(String(describing: mapError))")
             return
         }
+
+        // Users of the Navigate Edition can enable textured landmarks:
+        // mapView.mapScene.enableFeatures([MapFeatures.landmarks : MapFeatureModes.landmarksTextured])
     }
 
     func onAnimationStateChanged(state: heresdk.AnimationState) {
@@ -181,22 +184,24 @@ class CameraKeyframeTracksExample: AnimationDelegate {
         ])
 
         return geoOrientationKeyframe
-    }
-    
+    }    
+
     private func showDialog(title: String, message: String) {
-        if let topController = UIApplication.shared.windows.first?.rootViewController {
+        if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+           let rootViewController = windowScene.windows.first(where: { $0.isKeyWindow })?.rootViewController {
+
             let alert = UIAlertController(
                 title: title,
                 message: message,
                 preferredStyle: .alert
             )
-            
+
             alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
                 // Handle OK button action.
                 alert.dismiss(animated: true, completion: nil)
             }))
-            
-            topController.present(alert, animated: true, completion: nil)
+
+            rootViewController.present(alert, animated: true, completion: nil)
         }
     }
 }

examples/latest/explore/ios/CustomMapStyles/CustomMapStyles/CustomMapStylesExample.swift

@@ -18,7 +18,7 @@
  */
 
 import heresdk
-import UIKit
+import SwiftUI
 
 class CustomMapStylesExample {
 
@@ -70,19 +70,21 @@ class CustomMapStylesExample {
     }
 
     private func showDialog(title: String, message: String) {
-        if let topController = UIApplication.shared.windows.first?.rootViewController {
+        if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+           let rootViewController = windowScene.windows.first(where: { $0.isKeyWindow })?.rootViewController {
+
             let alert = UIAlertController(
                 title: title,
                 message: message,
                 preferredStyle: .alert
             )
-            
+
             alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
                 // Handle OK button action.
                 alert.dismiss(animated: true, completion: nil)
             }))
-            
-            topController.present(alert, animated: true, completion: nil)
+
+            rootViewController.present(alert, animated: true, completion: nil)
         }
     }
 }