Merge pull request #357 from heremaps/esd/42100

Update example apps for release 4.21.0.0
heremaps · Dec 18, 2024 · dcb27d4 · dcb27d4
2 parents 9653e8a + 4fdb530
commit dcb27d4
Show file tree

Hide file tree

Showing 549 changed files with 6,112 additions and 1,860 deletions.
diff --git a/README.md b/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.5.0)
+## List of Available Example Apps (Version 4.21.0.0)
 
 - **HelloMap**: Shows the classic 'Hello World'.
 - **HelloMapKotlin**: Shows the classic 'Hello World' using Kotlin language (Android only).

diff --git a/examples/latest/README.md b/examples/latest/README.md
@@ -1,4 +1,4 @@
-This folder contains the HERE SDK examples apps for version: 4.20.5.0
+This folder contains the HERE SDK examples apps for version: 4.21.0.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/))

diff --git a/examples/latest/explore/android/Camera/app/build.gradle b/examples/latest/explore/android/Camera/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.here.sdk.camera"
         minSdkVersion 24
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/examples/latest/explore/android/Camera/build.gradle b/examples/latest/explore/android/Camera/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/examples/latest/explore/android/Camera/gradle/wrapper/gradle-wrapper.properties b/examples/latest/explore/android/Camera/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/examples/latest/explore/android/CameraKeyframeTracks/app/build.gradle b/examples/latest/explore/android/CameraKeyframeTracks/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.here.camerakeyframetracks"
         minSdkVersion 24
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/examples/latest/explore/android/CameraKeyframeTracks/build.gradle b/examples/latest/explore/android/CameraKeyframeTracks/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/...ples/latest/explore/android/CameraKeyframeTracks/gradle/wrapper/gradle-wrapper.properties b/...ples/latest/explore/android/CameraKeyframeTracks/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Mar 22 17:05:56 IST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/latest/explore/android/CustomMapStyles/app/build.gradle b/examples/latest/explore/android/CustomMapStyles/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.here.sdk.custommapstyles"
         minSdkVersion 24
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/examples/latest/explore/android/CustomMapStyles/build.gradle b/examples/latest/explore/android/CustomMapStyles/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/examples/latest/explore/android/CustomMapStyles/gradle/wrapper/gradle-wrapper.properties b/examples/latest/explore/android/CustomMapStyles/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/examples/latest/explore/android/CustomPointTileSource/app/build.gradle b/examples/latest/explore/android/CustomPointTileSource/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.here.sdk.custompointtilesource"
         minSdkVersion 24
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/examples/latest/explore/android/CustomPointTileSource/build.gradle b/examples/latest/explore/android/CustomPointTileSource/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/...les/latest/explore/android/CustomPointTileSource/gradle/wrapper/gradle-wrapper.properties b/...les/latest/explore/android/CustomPointTileSource/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/examples/latest/explore/android/CustomPolygonLayers/app/build.gradle b/examples/latest/explore/android/CustomPolygonLayers/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.here.sdk.custompolygonlayers"
         minSdkVersion 24
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/examples/latest/explore/android/CustomPolygonLayers/build.gradle b/examples/latest/explore/android/CustomPolygonLayers/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/examples/latest/explore/android/CustomPolygonLayers/gradle/wrapper/gradle-wrapper.properties b/examples/latest/explore/android/CustomPolygonLayers/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/examples/latest/explore/android/CustomRasterLayers/app/build.gradle b/examples/latest/explore/android/CustomRasterLayers/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.here.sdk.customrasterlayers"
         minSdkVersion 24
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/...erLayers/app/src/main/java/com/here/sdk/customrasterlayers/CustomRasterLayersExample.java b/...erLayers/app/src/main/java/com/here/sdk/customrasterlayers/CustomRasterLayersExample.java
@@ -112,9 +112,9 @@ private RasterDataSource createRasterDataSource(String dataSourceName) {
      }
 
      private MapLayer createMapLayer(String dataSourceName) {
-         // The layer should be rendered on top of other layers except the "labels" layer
+         // The layer should be rendered on top of other layers including the "labels" layer
          // so that we don't overlap the raster layer over POI markers.
-         MapLayerPriority priority = new MapLayerPriorityBuilder().renderedBeforeLayer("labels").build();
+         MapLayerPriority priority = new MapLayerPriorityBuilder().renderedAfterLayer("labels").build();
 
          // And it should be visible for all zoom levels.
          MapLayerVisibilityRange range = new MapLayerVisibilityRange(0, 22 + 1);

diff --git a/examples/latest/explore/android/CustomRasterLayers/build.gradle b/examples/latest/explore/android/CustomRasterLayers/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/examples/latest/explore/android/CustomRasterLayers/gradle/wrapper/gradle-wrapper.properties b/examples/latest/explore/android/CustomRasterLayers/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/examples/latest/explore/android/CustomRasterTileSource/app/build.gradle b/examples/latest/explore/android/CustomRasterTileSource/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.here.sdk.customrastertilesource"
         minSdkVersion 24
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/.../app/src/main/java/com/here/sdk/customrastertilesource/CustomRasterTileSourceExample.java b/.../app/src/main/java/com/here/sdk/customrastertilesource/CustomRasterTileSourceExample.java
@@ -80,9 +80,9 @@ private RasterDataSource createRasterDataSource(String dataSourceName) {
      }
 
      private MapLayer createMapLayer(String dataSourceName) {
-         // The layer should be rendered on top of other layers except the "labels" layer
+         // The layer should be rendered on top of other layers including the "labels" layer
          // so that we don't overlap the raster layer over POI markers.
-         MapLayerPriority priority = new MapLayerPriorityBuilder().renderedBeforeLayer("labels").build();
+         MapLayerPriority priority = new MapLayerPriorityBuilder().renderedAfterLayer("labels").build();
 
          // And it should be visible for all zoom levels.
          MapLayerVisibilityRange range = new MapLayerVisibilityRange(0, 22 + 1);

diff --git a/examples/latest/explore/android/CustomRasterTileSource/build.gradle b/examples/latest/explore/android/CustomRasterTileSource/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/...es/latest/explore/android/CustomRasterTileSource/gradle/wrapper/gradle-wrapper.properties b/...es/latest/explore/android/CustomRasterTileSource/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/examples/latest/explore/android/EVRouting/app/build.gradle b/examples/latest/explore/android/EVRouting/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.here.evrouting"
         minSdkVersion 24
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/...test/explore/android/EVRouting/app/src/main/java/com/here/evrouting/EVRoutingExample.java b/...test/explore/android/EVRouting/app/src/main/java/com/here/evrouting/EVRoutingExample.java
@@ -63,7 +63,9 @@
 import com.here.sdk.routing.Section;
 import com.here.sdk.routing.SectionNotice;
 import com.here.sdk.routing.Waypoint;
+import com.here.sdk.search.CategoryQuery;
 import com.here.sdk.search.Place;
+import com.here.sdk.search.PlaceCategory;
 import com.here.sdk.search.SearchCallback;
 import com.here.sdk.search.SearchEngine;
 import com.here.sdk.search.SearchError;
@@ -302,14 +304,15 @@ private void searchAlongARoute(Route route) {
         // within a max distance of xx meters from any point of the route.
         int halfWidthInMeters = 200;
         GeoCorridor routeCorridor = new GeoCorridor(route.getGeometry().vertices, halfWidthInMeters);
-        TextQuery.Area queryArea = new TextQuery.Area(routeCorridor, mapView.getCamera().getState().targetCoordinates);
-        TextQuery textQuery = new TextQuery("charging station", queryArea);
+        PlaceCategory placeCategory = new PlaceCategory(PlaceCategory.BUSINESS_AND_SERVICES_EV_CHARGING_STATION);
+        CategoryQuery.Area categoryQueryArea = new CategoryQuery.Area(routeCorridor, mapView.getCamera().getState().targetCoordinates);
+        CategoryQuery categoryQuery = new CategoryQuery(placeCategory, categoryQueryArea);
 
         SearchOptions searchOptions = new SearchOptions();
         searchOptions.languageCode = LanguageCode.EN_US;
         searchOptions.maxItems = 30;
 
-        searchEngine.searchByText(textQuery, searchOptions, new SearchCallback() {
+        searchEngine.searchByCategory(categoryQuery, searchOptions, new SearchCallback() {
             @Override
             public void onSearchCompleted(SearchError searchError, List<Place> items) {
                 if (searchError != null) {

diff --git a/examples/latest/explore/android/EVRouting/build.gradle b/examples/latest/explore/android/EVRouting/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/examples/latest/explore/android/EVRouting/gradle/wrapper/gradle-wrapper.properties b/examples/latest/explore/android/EVRouting/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/examples/latest/explore/android/Gestures/app/build.gradle b/examples/latest/explore/android/Gestures/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.here.gestures"
         minSdkVersion 24
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/examples/latest/explore/android/Gestures/build.gradle b/examples/latest/explore/android/Gestures/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/examples/latest/explore/android/Gestures/gradle/wrapper/gradle-wrapper.properties b/examples/latest/explore/android/Gestures/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/examples/latest/explore/android/HelloMap/README.md b/examples/latest/explore/android/HelloMap/README.md
@@ -9,4 +9,4 @@ Note: If your AAR version is different than the version shown in the _Developer
 
 2) Open Android Studio and sync the project.
 
-Please do not forget: To run the app, you need to add your HERE SDK credentials to the `MainActivity.java` file. More information can be found in the _Get Started_ section of the _Developer Guide_.
+Please do not forget: To run the app, you need to add your HERE SDK credentials in the `MainActivity.java` file. More information can be found in the _Get Started_ section of the _Developer Guide_.
diff --git a/examples/latest/explore/android/HelloMap/app/build.gradle b/examples/latest/explore/android/HelloMap/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.here.hellomap"
         minSdkVersion 24
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }

diff --git a/...les/latest/explore/android/HelloMap/app/src/main/java/com/here/hellomap/MainActivity.java b/...les/latest/explore/android/HelloMap/app/src/main/java/com/here/hellomap/MainActivity.java
@@ -29,6 +29,7 @@
 
 import com.here.hellomap.PermissionsRequestor.ResultListener;
 import com.here.sdk.core.GeoCoordinates;
+import com.here.sdk.core.engine.AuthenticationMode;
 import com.here.sdk.core.engine.SDKNativeEngine;
 import com.here.sdk.core.engine.SDKOptions;
 import com.here.sdk.core.errors.InstantiationErrorException;
@@ -74,7 +75,9 @@ private void initializeHERESDK() {
         // Set your credentials for the HERE SDK.
         String accessKeyID = "YOUR_ACCESS_KEY_ID";
         String accessKeySecret = "YOUR_ACCESS_KEY_SECRET";
-        SDKOptions options = new SDKOptions(accessKeyID, accessKeySecret);
+        AuthenticationMode authenticationMode = AuthenticationMode.withKeySecret(accessKeyID, accessKeySecret);
+        SDKOptions options = new SDKOptions(authenticationMode);
+
         try {
             Context context = this;
             SDKNativeEngine.makeSharedInstance(context, options);

diff --git a/examples/latest/explore/android/HelloMap/build.gradle b/examples/latest/explore/android/HelloMap/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/examples/latest/explore/android/HelloMap/gradle/wrapper/gradle-wrapper.properties b/examples/latest/explore/android/HelloMap/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/examples/latest/explore/android/HelloMapAndroidAuto/app/build.gradle b/examples/latest/explore/android/HelloMapAndroidAuto/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.here.hellomapandroidauto"
         minSdkVersion 24
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@ Note: If your AAR version is different than the version shown in the _Developer

		2) Open Android Studio and sync the project.

		Please do not forget: To run the app, you need to add your HERE SDK credentials to the `MainActivity.java` file. More information can be found in the _Get Started_ section of the _Developer Guide_.
		Please do not forget: To run the app, you need to add your HERE SDK credentials in the `MainActivity.java` file. More information can be found in the _Get Started_ section of the _Developer Guide_.