diff --git a/advanced-navigation-android/.gitignore b/advanced-navigation/.gitignore similarity index 100% rename from advanced-navigation-android/.gitignore rename to advanced-navigation/.gitignore diff --git a/advanced-navigation-android/app/build.gradle b/advanced-navigation/app/build.gradle similarity index 100% rename from advanced-navigation-android/app/build.gradle rename to advanced-navigation/app/build.gradle diff --git a/advanced-navigation-android/app/libs/README.md b/advanced-navigation/app/libs/README.md similarity index 100% rename from advanced-navigation-android/app/libs/README.md rename to advanced-navigation/app/libs/README.md diff --git a/advanced-navigation-android/app/src/main/AndroidManifest.xml b/advanced-navigation/app/src/main/AndroidManifest.xml similarity index 100% rename from advanced-navigation-android/app/src/main/AndroidManifest.xml rename to advanced-navigation/app/src/main/AndroidManifest.xml diff --git a/advanced-navigation-android/app/src/main/java/com/here/android/example/advanced/navigation/MainActivity.java b/advanced-navigation/app/src/main/java/com/here/android/example/advanced/navigation/MainActivity.java similarity index 100% rename from advanced-navigation-android/app/src/main/java/com/here/android/example/advanced/navigation/MainActivity.java rename to advanced-navigation/app/src/main/java/com/here/android/example/advanced/navigation/MainActivity.java diff --git a/advanced-navigation-android/app/src/main/java/com/here/android/example/advanced/navigation/MapFragmentView.java b/advanced-navigation/app/src/main/java/com/here/android/example/advanced/navigation/MapFragmentView.java similarity index 100% rename from advanced-navigation-android/app/src/main/java/com/here/android/example/advanced/navigation/MapFragmentView.java rename to advanced-navigation/app/src/main/java/com/here/android/example/advanced/navigation/MapFragmentView.java diff --git a/advanced-navigation-android/app/src/main/res/drawable/gps_position.png b/advanced-navigation/app/src/main/res/drawable/gps_position.png similarity index 100% rename from advanced-navigation-android/app/src/main/res/drawable/gps_position.png rename to advanced-navigation/app/src/main/res/drawable/gps_position.png diff --git a/advanced-navigation-android/app/src/main/res/layout/activity_main.xml b/advanced-navigation/app/src/main/res/layout/activity_main.xml similarity index 100% rename from advanced-navigation-android/app/src/main/res/layout/activity_main.xml rename to advanced-navigation/app/src/main/res/layout/activity_main.xml diff --git a/advanced-navigation-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/advanced-navigation/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from advanced-navigation-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to advanced-navigation/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/advanced-navigation-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/advanced-navigation/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from advanced-navigation-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to advanced-navigation/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/advanced-navigation-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/advanced-navigation/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from advanced-navigation-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to advanced-navigation/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/advanced-navigation-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/advanced-navigation/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from advanced-navigation-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to advanced-navigation/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/advanced-navigation-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/advanced-navigation/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from advanced-navigation-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to advanced-navigation/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/advanced-navigation-android/app/src/main/res/values/colors.xml b/advanced-navigation/app/src/main/res/values/colors.xml similarity index 100% rename from advanced-navigation-android/app/src/main/res/values/colors.xml rename to advanced-navigation/app/src/main/res/values/colors.xml diff --git a/advanced-navigation-android/app/src/main/res/values/dimens.xml b/advanced-navigation/app/src/main/res/values/dimens.xml similarity index 100% rename from advanced-navigation-android/app/src/main/res/values/dimens.xml rename to advanced-navigation/app/src/main/res/values/dimens.xml diff --git a/advanced-navigation-android/app/src/main/res/values/strings.xml b/advanced-navigation/app/src/main/res/values/strings.xml similarity index 100% rename from advanced-navigation-android/app/src/main/res/values/strings.xml rename to advanced-navigation/app/src/main/res/values/strings.xml diff --git a/advanced-navigation-android/app/src/main/res/values/styles.xml b/advanced-navigation/app/src/main/res/values/styles.xml similarity index 100% rename from advanced-navigation-android/app/src/main/res/values/styles.xml rename to advanced-navigation/app/src/main/res/values/styles.xml diff --git a/advanced-navigation-android/build.gradle b/advanced-navigation/build.gradle similarity index 100% rename from advanced-navigation-android/build.gradle rename to advanced-navigation/build.gradle diff --git a/advanced-navigation-android/gradle.properties b/advanced-navigation/gradle.properties similarity index 100% rename from advanced-navigation-android/gradle.properties rename to advanced-navigation/gradle.properties diff --git a/advanced-navigation-android/gradle/wrapper/gradle-wrapper.jar b/advanced-navigation/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from advanced-navigation-android/gradle/wrapper/gradle-wrapper.jar rename to advanced-navigation/gradle/wrapper/gradle-wrapper.jar diff --git a/advanced-navigation-android/gradle/wrapper/gradle-wrapper.properties b/advanced-navigation/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from advanced-navigation-android/gradle/wrapper/gradle-wrapper.properties rename to advanced-navigation/gradle/wrapper/gradle-wrapper.properties diff --git a/advanced-navigation-android/gradlew b/advanced-navigation/gradlew old mode 100755 new mode 100644 similarity index 100% rename from advanced-navigation-android/gradlew rename to advanced-navigation/gradlew diff --git a/geocoder-and-reverse-geocoder-android/gradlew.bat b/advanced-navigation/gradlew.bat similarity index 100% rename from geocoder-and-reverse-geocoder-android/gradlew.bat rename to advanced-navigation/gradlew.bat diff --git a/advanced-navigation-android/settings.gradle b/advanced-navigation/settings.gradle similarity index 100% rename from advanced-navigation-android/settings.gradle rename to advanced-navigation/settings.gradle diff --git a/geocoder-and-reverse-geocoder-android/.gitignore b/geocoder-and-reverse-geocoder/.gitignore similarity index 100% rename from geocoder-and-reverse-geocoder-android/.gitignore rename to geocoder-and-reverse-geocoder/.gitignore diff --git a/geocoder-and-reverse-geocoder-android/app/build.gradle b/geocoder-and-reverse-geocoder/app/build.gradle similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/build.gradle rename to geocoder-and-reverse-geocoder/app/build.gradle diff --git a/geocoder-and-reverse-geocoder-android/app/libs/README.md b/geocoder-and-reverse-geocoder/app/libs/README.md similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/libs/README.md rename to geocoder-and-reverse-geocoder/app/libs/README.md diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/AndroidManifest.xml b/geocoder-and-reverse-geocoder/app/src/main/AndroidManifest.xml similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/AndroidManifest.xml rename to geocoder-and-reverse-geocoder/app/src/main/AndroidManifest.xml diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/java/com/here/android/example/geocoding/MainActivity.java b/geocoder-and-reverse-geocoder/app/src/main/java/com/here/android/example/geocoding/MainActivity.java similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/java/com/here/android/example/geocoding/MainActivity.java rename to geocoder-and-reverse-geocoder/app/src/main/java/com/here/android/example/geocoding/MainActivity.java diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/java/com/here/android/example/geocoding/MainView.java b/geocoder-and-reverse-geocoder/app/src/main/java/com/here/android/example/geocoding/MainView.java similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/java/com/here/android/example/geocoding/MainView.java rename to geocoder-and-reverse-geocoder/app/src/main/java/com/here/android/example/geocoding/MainView.java diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/res/layout/activity_main.xml b/geocoder-and-reverse-geocoder/app/src/main/res/layout/activity_main.xml similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/res/layout/activity_main.xml rename to geocoder-and-reverse-geocoder/app/src/main/res/layout/activity_main.xml diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/geocoder-and-reverse-geocoder/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to geocoder-and-reverse-geocoder/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/geocoder-and-reverse-geocoder/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to geocoder-and-reverse-geocoder/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/geocoder-and-reverse-geocoder/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to geocoder-and-reverse-geocoder/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/geocoder-and-reverse-geocoder/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to geocoder-and-reverse-geocoder/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/geocoder-and-reverse-geocoder/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to geocoder-and-reverse-geocoder/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/res/values-w820dp/dimens.xml b/geocoder-and-reverse-geocoder/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/res/values-w820dp/dimens.xml rename to geocoder-and-reverse-geocoder/app/src/main/res/values-w820dp/dimens.xml diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/res/values/colors.xml b/geocoder-and-reverse-geocoder/app/src/main/res/values/colors.xml similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/res/values/colors.xml rename to geocoder-and-reverse-geocoder/app/src/main/res/values/colors.xml diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/res/values/dimens.xml b/geocoder-and-reverse-geocoder/app/src/main/res/values/dimens.xml similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/res/values/dimens.xml rename to geocoder-and-reverse-geocoder/app/src/main/res/values/dimens.xml diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/res/values/strings.xml b/geocoder-and-reverse-geocoder/app/src/main/res/values/strings.xml similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/res/values/strings.xml rename to geocoder-and-reverse-geocoder/app/src/main/res/values/strings.xml diff --git a/geocoder-and-reverse-geocoder-android/app/src/main/res/values/styles.xml b/geocoder-and-reverse-geocoder/app/src/main/res/values/styles.xml similarity index 100% rename from geocoder-and-reverse-geocoder-android/app/src/main/res/values/styles.xml rename to geocoder-and-reverse-geocoder/app/src/main/res/values/styles.xml diff --git a/geocoder-and-reverse-geocoder-android/build.gradle b/geocoder-and-reverse-geocoder/build.gradle similarity index 100% rename from geocoder-and-reverse-geocoder-android/build.gradle rename to geocoder-and-reverse-geocoder/build.gradle diff --git a/geocoder-and-reverse-geocoder-android/gradle.properties b/geocoder-and-reverse-geocoder/gradle.properties similarity index 100% rename from geocoder-and-reverse-geocoder-android/gradle.properties rename to geocoder-and-reverse-geocoder/gradle.properties diff --git a/geocoder-and-reverse-geocoder-android/gradle/wrapper/gradle-wrapper.jar b/geocoder-and-reverse-geocoder/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from geocoder-and-reverse-geocoder-android/gradle/wrapper/gradle-wrapper.jar rename to geocoder-and-reverse-geocoder/gradle/wrapper/gradle-wrapper.jar diff --git a/geocoder-and-reverse-geocoder-android/gradle/wrapper/gradle-wrapper.properties b/geocoder-and-reverse-geocoder/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from geocoder-and-reverse-geocoder-android/gradle/wrapper/gradle-wrapper.properties rename to geocoder-and-reverse-geocoder/gradle/wrapper/gradle-wrapper.properties diff --git a/geocoder-and-reverse-geocoder-android/gradlew b/geocoder-and-reverse-geocoder/gradlew old mode 100755 new mode 100644 similarity index 100% rename from geocoder-and-reverse-geocoder-android/gradlew rename to geocoder-and-reverse-geocoder/gradlew diff --git a/map-attribute-android/gradlew.bat b/geocoder-and-reverse-geocoder/gradlew.bat similarity index 100% rename from map-attribute-android/gradlew.bat rename to geocoder-and-reverse-geocoder/gradlew.bat diff --git a/geocoder-and-reverse-geocoder-android/settings.gradle b/geocoder-and-reverse-geocoder/settings.gradle similarity index 100% rename from geocoder-and-reverse-geocoder-android/settings.gradle rename to geocoder-and-reverse-geocoder/settings.gradle diff --git a/map-attribute-android/.gitignore b/map-attribute/.gitignore similarity index 100% rename from map-attribute-android/.gitignore rename to map-attribute/.gitignore diff --git a/map-attribute-android/app/build.gradle b/map-attribute/app/build.gradle similarity index 100% rename from map-attribute-android/app/build.gradle rename to map-attribute/app/build.gradle diff --git a/here-positioning-android/app/libs/README.md b/map-attribute/app/libs/README.md similarity index 100% rename from here-positioning-android/app/libs/README.md rename to map-attribute/app/libs/README.md diff --git a/map-attribute-android/app/src/main/AndroidManifest.xml b/map-attribute/app/src/main/AndroidManifest.xml similarity index 100% rename from map-attribute-android/app/src/main/AndroidManifest.xml rename to map-attribute/app/src/main/AndroidManifest.xml diff --git a/map-attribute-android/app/src/main/java/com/here/android/example/map/attribute/MainActivity.java b/map-attribute/app/src/main/java/com/here/android/example/map/attribute/MainActivity.java similarity index 100% rename from map-attribute-android/app/src/main/java/com/here/android/example/map/attribute/MainActivity.java rename to map-attribute/app/src/main/java/com/here/android/example/map/attribute/MainActivity.java diff --git a/map-attribute-android/app/src/main/java/com/here/android/example/map/attribute/MapFragmentView.java b/map-attribute/app/src/main/java/com/here/android/example/map/attribute/MapFragmentView.java similarity index 100% rename from map-attribute-android/app/src/main/java/com/here/android/example/map/attribute/MapFragmentView.java rename to map-attribute/app/src/main/java/com/here/android/example/map/attribute/MapFragmentView.java diff --git a/map-attribute-android/app/src/main/java/com/here/android/example/map/attribute/SettingsPanel.java b/map-attribute/app/src/main/java/com/here/android/example/map/attribute/SettingsPanel.java similarity index 100% rename from map-attribute-android/app/src/main/java/com/here/android/example/map/attribute/SettingsPanel.java rename to map-attribute/app/src/main/java/com/here/android/example/map/attribute/SettingsPanel.java diff --git a/map-attribute-android/app/src/main/res/drawable/generic_button_bar_i.xml b/map-attribute/app/src/main/res/drawable/generic_button_bar_i.xml similarity index 100% rename from map-attribute-android/app/src/main/res/drawable/generic_button_bar_i.xml rename to map-attribute/app/src/main/res/drawable/generic_button_bar_i.xml diff --git a/map-attribute-android/app/src/main/res/drawable/settingbutton.xml b/map-attribute/app/src/main/res/drawable/settingbutton.xml similarity index 100% rename from map-attribute-android/app/src/main/res/drawable/settingbutton.xml rename to map-attribute/app/src/main/res/drawable/settingbutton.xml diff --git a/map-attribute-android/app/src/main/res/layout/activity_main.xml b/map-attribute/app/src/main/res/layout/activity_main.xml similarity index 100% rename from map-attribute-android/app/src/main/res/layout/activity_main.xml rename to map-attribute/app/src/main/res/layout/activity_main.xml diff --git a/map-attribute-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/map-attribute/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from map-attribute-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to map-attribute/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/map-attribute-android/app/src/main/res/mipmap-mdpi/button_c_normal.png b/map-attribute/app/src/main/res/mipmap-mdpi/button_c_normal.png similarity index 100% rename from map-attribute-android/app/src/main/res/mipmap-mdpi/button_c_normal.png rename to map-attribute/app/src/main/res/mipmap-mdpi/button_c_normal.png diff --git a/map-attribute-android/app/src/main/res/mipmap-mdpi/button_c_pressed.png b/map-attribute/app/src/main/res/mipmap-mdpi/button_c_pressed.png similarity index 100% rename from map-attribute-android/app/src/main/res/mipmap-mdpi/button_c_pressed.png rename to map-attribute/app/src/main/res/mipmap-mdpi/button_c_pressed.png diff --git a/map-attribute-android/app/src/main/res/mipmap-mdpi/button_normal.png b/map-attribute/app/src/main/res/mipmap-mdpi/button_normal.png similarity index 100% rename from map-attribute-android/app/src/main/res/mipmap-mdpi/button_normal.png rename to map-attribute/app/src/main/res/mipmap-mdpi/button_normal.png diff --git a/map-attribute-android/app/src/main/res/mipmap-mdpi/button_pressed.png b/map-attribute/app/src/main/res/mipmap-mdpi/button_pressed.png similarity index 100% rename from map-attribute-android/app/src/main/res/mipmap-mdpi/button_pressed.png rename to map-attribute/app/src/main/res/mipmap-mdpi/button_pressed.png diff --git a/map-attribute-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/map-attribute/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from map-attribute-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to map-attribute/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/map-attribute-android/app/src/main/res/mipmap-mdpi/settings.png b/map-attribute/app/src/main/res/mipmap-mdpi/settings.png similarity index 100% rename from map-attribute-android/app/src/main/res/mipmap-mdpi/settings.png rename to map-attribute/app/src/main/res/mipmap-mdpi/settings.png diff --git a/map-attribute-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/map-attribute/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from map-attribute-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to map-attribute/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/map-attribute-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/map-attribute/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from map-attribute-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to map-attribute/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/map-attribute-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/map-attribute/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from map-attribute-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to map-attribute/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/map-attribute-android/app/src/main/res/values-w820dp/dimens.xml b/map-attribute/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from map-attribute-android/app/src/main/res/values-w820dp/dimens.xml rename to map-attribute/app/src/main/res/values-w820dp/dimens.xml diff --git a/map-attribute-android/app/src/main/res/values/colors.xml b/map-attribute/app/src/main/res/values/colors.xml similarity index 100% rename from map-attribute-android/app/src/main/res/values/colors.xml rename to map-attribute/app/src/main/res/values/colors.xml diff --git a/map-attribute-android/app/src/main/res/values/dimens.xml b/map-attribute/app/src/main/res/values/dimens.xml similarity index 100% rename from map-attribute-android/app/src/main/res/values/dimens.xml rename to map-attribute/app/src/main/res/values/dimens.xml diff --git a/map-attribute-android/app/src/main/res/values/strings.xml b/map-attribute/app/src/main/res/values/strings.xml similarity index 100% rename from map-attribute-android/app/src/main/res/values/strings.xml rename to map-attribute/app/src/main/res/values/strings.xml diff --git a/map-attribute-android/app/src/main/res/values/styles.xml b/map-attribute/app/src/main/res/values/styles.xml similarity index 100% rename from map-attribute-android/app/src/main/res/values/styles.xml rename to map-attribute/app/src/main/res/values/styles.xml diff --git a/here-positioning-android/build.gradle b/map-attribute/build.gradle similarity index 100% rename from here-positioning-android/build.gradle rename to map-attribute/build.gradle diff --git a/here-positioning-android/gradle.properties b/map-attribute/gradle.properties similarity index 100% rename from here-positioning-android/gradle.properties rename to map-attribute/gradle.properties diff --git a/here-positioning-android/gradle/wrapper/gradle-wrapper.jar b/map-attribute/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from here-positioning-android/gradle/wrapper/gradle-wrapper.jar rename to map-attribute/gradle/wrapper/gradle-wrapper.jar diff --git a/here-positioning-android/gradle/wrapper/gradle-wrapper.properties b/map-attribute/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from here-positioning-android/gradle/wrapper/gradle-wrapper.properties rename to map-attribute/gradle/wrapper/gradle-wrapper.properties diff --git a/here-positioning-android/gradlew b/map-attribute/gradlew similarity index 100% rename from here-positioning-android/gradlew rename to map-attribute/gradlew diff --git a/map-downloader-android/gradlew.bat b/map-attribute/gradlew.bat similarity index 100% rename from map-downloader-android/gradlew.bat rename to map-attribute/gradlew.bat diff --git a/here-positioning-android/settings.gradle b/map-attribute/settings.gradle similarity index 100% rename from here-positioning-android/settings.gradle rename to map-attribute/settings.gradle diff --git a/map-customization-android/.gitignore b/map-customization/.gitignore similarity index 100% rename from map-customization-android/.gitignore rename to map-customization/.gitignore diff --git a/map-customization-android/app/build.gradle b/map-customization/app/build.gradle similarity index 100% rename from map-customization-android/app/build.gradle rename to map-customization/app/build.gradle diff --git a/map-attribute-android/app/libs/README.md b/map-customization/app/libs/README.md similarity index 100% rename from map-attribute-android/app/libs/README.md rename to map-customization/app/libs/README.md diff --git a/map-customization-android/app/src/main/AndroidManifest.xml b/map-customization/app/src/main/AndroidManifest.xml similarity index 100% rename from map-customization-android/app/src/main/AndroidManifest.xml rename to map-customization/app/src/main/AndroidManifest.xml diff --git a/map-customization-android/app/src/main/java/com/here/android/example/map/customization/MainActivity.java b/map-customization/app/src/main/java/com/here/android/example/map/customization/MainActivity.java similarity index 100% rename from map-customization-android/app/src/main/java/com/here/android/example/map/customization/MainActivity.java rename to map-customization/app/src/main/java/com/here/android/example/map/customization/MainActivity.java diff --git a/map-customization-android/app/src/main/java/com/here/android/example/map/customization/MapFragmentView.java b/map-customization/app/src/main/java/com/here/android/example/map/customization/MapFragmentView.java similarity index 100% rename from map-customization-android/app/src/main/java/com/here/android/example/map/customization/MapFragmentView.java rename to map-customization/app/src/main/java/com/here/android/example/map/customization/MapFragmentView.java diff --git a/map-customization-android/app/src/main/res/layout/activity_main.xml b/map-customization/app/src/main/res/layout/activity_main.xml similarity index 100% rename from map-customization-android/app/src/main/res/layout/activity_main.xml rename to map-customization/app/src/main/res/layout/activity_main.xml diff --git a/map-customization-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/map-customization/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from map-customization-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to map-customization/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/map-customization-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/map-customization/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from map-customization-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to map-customization/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/map-customization-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/map-customization/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from map-customization-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to map-customization/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/map-customization-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/map-customization/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from map-customization-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to map-customization/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/map-customization-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/map-customization/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from map-customization-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to map-customization/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/here-positioning-android/app/src/main/res/values-w820dp/dimens.xml b/map-customization/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from here-positioning-android/app/src/main/res/values-w820dp/dimens.xml rename to map-customization/app/src/main/res/values-w820dp/dimens.xml diff --git a/map-customization-android/app/src/main/res/values/colors.xml b/map-customization/app/src/main/res/values/colors.xml similarity index 100% rename from map-customization-android/app/src/main/res/values/colors.xml rename to map-customization/app/src/main/res/values/colors.xml diff --git a/here-positioning-android/app/src/main/res/values/dimens.xml b/map-customization/app/src/main/res/values/dimens.xml similarity index 100% rename from here-positioning-android/app/src/main/res/values/dimens.xml rename to map-customization/app/src/main/res/values/dimens.xml diff --git a/map-customization-android/app/src/main/res/values/strings.xml b/map-customization/app/src/main/res/values/strings.xml similarity index 100% rename from map-customization-android/app/src/main/res/values/strings.xml rename to map-customization/app/src/main/res/values/strings.xml diff --git a/map-customization-android/app/src/main/res/values/styles.xml b/map-customization/app/src/main/res/values/styles.xml similarity index 100% rename from map-customization-android/app/src/main/res/values/styles.xml rename to map-customization/app/src/main/res/values/styles.xml diff --git a/map-attribute-android/build.gradle b/map-customization/build.gradle similarity index 100% rename from map-attribute-android/build.gradle rename to map-customization/build.gradle diff --git a/map-attribute-android/gradle.properties b/map-customization/gradle.properties similarity index 100% rename from map-attribute-android/gradle.properties rename to map-customization/gradle.properties diff --git a/map-attribute-android/gradle/wrapper/gradle-wrapper.jar b/map-customization/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from map-attribute-android/gradle/wrapper/gradle-wrapper.jar rename to map-customization/gradle/wrapper/gradle-wrapper.jar diff --git a/map-attribute-android/gradle/wrapper/gradle-wrapper.properties b/map-customization/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from map-attribute-android/gradle/wrapper/gradle-wrapper.properties rename to map-customization/gradle/wrapper/gradle-wrapper.properties diff --git a/map-attribute-android/gradlew b/map-customization/gradlew old mode 100755 new mode 100644 similarity index 100% rename from map-attribute-android/gradlew rename to map-customization/gradlew diff --git a/map-rendering-android/gradlew.bat b/map-customization/gradlew.bat similarity index 100% rename from map-rendering-android/gradlew.bat rename to map-customization/gradlew.bat diff --git a/map-attribute-android/settings.gradle b/map-customization/settings.gradle similarity index 100% rename from map-attribute-android/settings.gradle rename to map-customization/settings.gradle diff --git a/map-downloader-android/.gitignore b/map-downloader/.gitignore similarity index 100% rename from map-downloader-android/.gitignore rename to map-downloader/.gitignore diff --git a/map-downloader-android/app/build.gradle b/map-downloader/app/build.gradle similarity index 100% rename from map-downloader-android/app/build.gradle rename to map-downloader/app/build.gradle diff --git a/map-customization-android/app/libs/README.md b/map-downloader/app/libs/README.md similarity index 100% rename from map-customization-android/app/libs/README.md rename to map-downloader/app/libs/README.md diff --git a/map-downloader-android/app/src/main/AndroidManifest.xml b/map-downloader/app/src/main/AndroidManifest.xml similarity index 100% rename from map-downloader-android/app/src/main/AndroidManifest.xml rename to map-downloader/app/src/main/AndroidManifest.xml diff --git a/map-downloader-android/app/src/main/java/com/here/android/example/map/downloader/MainActivity.java b/map-downloader/app/src/main/java/com/here/android/example/map/downloader/MainActivity.java similarity index 100% rename from map-downloader-android/app/src/main/java/com/here/android/example/map/downloader/MainActivity.java rename to map-downloader/app/src/main/java/com/here/android/example/map/downloader/MainActivity.java diff --git a/map-downloader-android/app/src/main/java/com/here/android/example/map/downloader/MapListAdapter.java b/map-downloader/app/src/main/java/com/here/android/example/map/downloader/MapListAdapter.java similarity index 100% rename from map-downloader-android/app/src/main/java/com/here/android/example/map/downloader/MapListAdapter.java rename to map-downloader/app/src/main/java/com/here/android/example/map/downloader/MapListAdapter.java diff --git a/map-downloader-android/app/src/main/java/com/here/android/example/map/downloader/MapListView.java b/map-downloader/app/src/main/java/com/here/android/example/map/downloader/MapListView.java similarity index 100% rename from map-downloader-android/app/src/main/java/com/here/android/example/map/downloader/MapListView.java rename to map-downloader/app/src/main/java/com/here/android/example/map/downloader/MapListView.java diff --git a/map-downloader-android/app/src/main/res/layout/activity_main.xml b/map-downloader/app/src/main/res/layout/activity_main.xml similarity index 100% rename from map-downloader-android/app/src/main/res/layout/activity_main.xml rename to map-downloader/app/src/main/res/layout/activity_main.xml diff --git a/map-downloader-android/app/src/main/res/layout/list_item.xml b/map-downloader/app/src/main/res/layout/list_item.xml similarity index 100% rename from map-downloader-android/app/src/main/res/layout/list_item.xml rename to map-downloader/app/src/main/res/layout/list_item.xml diff --git a/map-downloader-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/map-downloader/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from map-downloader-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to map-downloader/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/map-downloader-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/map-downloader/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from map-downloader-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to map-downloader/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/map-downloader-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/map-downloader/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from map-downloader-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to map-downloader/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/map-downloader-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/map-downloader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from map-downloader-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to map-downloader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/map-downloader-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/map-downloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from map-downloader-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to map-downloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/map-customization-android/app/src/main/res/values-w820dp/dimens.xml b/map-downloader/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from map-customization-android/app/src/main/res/values-w820dp/dimens.xml rename to map-downloader/app/src/main/res/values-w820dp/dimens.xml diff --git a/map-downloader-android/app/src/main/res/values/colors.xml b/map-downloader/app/src/main/res/values/colors.xml similarity index 100% rename from map-downloader-android/app/src/main/res/values/colors.xml rename to map-downloader/app/src/main/res/values/colors.xml diff --git a/map-customization-android/app/src/main/res/values/dimens.xml b/map-downloader/app/src/main/res/values/dimens.xml similarity index 100% rename from map-customization-android/app/src/main/res/values/dimens.xml rename to map-downloader/app/src/main/res/values/dimens.xml diff --git a/map-downloader-android/app/src/main/res/values/strings.xml b/map-downloader/app/src/main/res/values/strings.xml similarity index 100% rename from map-downloader-android/app/src/main/res/values/strings.xml rename to map-downloader/app/src/main/res/values/strings.xml diff --git a/map-downloader-android/app/src/main/res/values/styles.xml b/map-downloader/app/src/main/res/values/styles.xml similarity index 100% rename from map-downloader-android/app/src/main/res/values/styles.xml rename to map-downloader/app/src/main/res/values/styles.xml diff --git a/map-customization-android/build.gradle b/map-downloader/build.gradle similarity index 100% rename from map-customization-android/build.gradle rename to map-downloader/build.gradle diff --git a/map-customization-android/gradle.properties b/map-downloader/gradle.properties similarity index 100% rename from map-customization-android/gradle.properties rename to map-downloader/gradle.properties diff --git a/map-customization-android/gradle/wrapper/gradle-wrapper.jar b/map-downloader/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from map-customization-android/gradle/wrapper/gradle-wrapper.jar rename to map-downloader/gradle/wrapper/gradle-wrapper.jar diff --git a/map-customization-android/gradle/wrapper/gradle-wrapper.properties b/map-downloader/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from map-customization-android/gradle/wrapper/gradle-wrapper.properties rename to map-downloader/gradle/wrapper/gradle-wrapper.properties diff --git a/map-customization-android/gradlew b/map-downloader/gradlew old mode 100755 new mode 100644 similarity index 100% rename from map-customization-android/gradlew rename to map-downloader/gradlew diff --git a/nlp-android/gradlew.bat b/map-downloader/gradlew.bat similarity index 100% rename from nlp-android/gradlew.bat rename to map-downloader/gradlew.bat diff --git a/map-customization-android/settings.gradle b/map-downloader/settings.gradle similarity index 100% rename from map-customization-android/settings.gradle rename to map-downloader/settings.gradle diff --git a/map-gestures-android/.gitignore b/map-gestures/.gitignore similarity index 100% rename from map-gestures-android/.gitignore rename to map-gestures/.gitignore diff --git a/map-gestures-android/app/build.gradle b/map-gestures/app/build.gradle similarity index 100% rename from map-gestures-android/app/build.gradle rename to map-gestures/app/build.gradle diff --git a/map-downloader-android/app/libs/README.md b/map-gestures/app/libs/README.md similarity index 100% rename from map-downloader-android/app/libs/README.md rename to map-gestures/app/libs/README.md diff --git a/map-gestures-android/app/src/main/AndroidManifest.xml b/map-gestures/app/src/main/AndroidManifest.xml similarity index 100% rename from map-gestures-android/app/src/main/AndroidManifest.xml rename to map-gestures/app/src/main/AndroidManifest.xml diff --git a/map-gestures-android/app/src/main/java/com/here/android/example/map/gesture/MainActivity.java b/map-gestures/app/src/main/java/com/here/android/example/map/gesture/MainActivity.java similarity index 100% rename from map-gestures-android/app/src/main/java/com/here/android/example/map/gesture/MainActivity.java rename to map-gestures/app/src/main/java/com/here/android/example/map/gesture/MainActivity.java diff --git a/map-gestures-android/app/src/main/java/com/here/android/example/map/gesture/MapFragmentView.java b/map-gestures/app/src/main/java/com/here/android/example/map/gesture/MapFragmentView.java similarity index 100% rename from map-gestures-android/app/src/main/java/com/here/android/example/map/gesture/MapFragmentView.java rename to map-gestures/app/src/main/java/com/here/android/example/map/gesture/MapFragmentView.java diff --git a/map-gestures-android/app/src/main/res/drawable/marker.png b/map-gestures/app/src/main/res/drawable/marker.png similarity index 100% rename from map-gestures-android/app/src/main/res/drawable/marker.png rename to map-gestures/app/src/main/res/drawable/marker.png diff --git a/map-gestures-android/app/src/main/res/layout/activity_main.xml b/map-gestures/app/src/main/res/layout/activity_main.xml similarity index 100% rename from map-gestures-android/app/src/main/res/layout/activity_main.xml rename to map-gestures/app/src/main/res/layout/activity_main.xml diff --git a/map-gestures-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/map-gestures/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from map-gestures-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to map-gestures/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/map-gestures-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/map-gestures/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from map-gestures-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to map-gestures/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/map-gestures-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/map-gestures/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from map-gestures-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to map-gestures/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/map-gestures-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/map-gestures/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from map-gestures-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to map-gestures/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/map-gestures-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/map-gestures/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from map-gestures-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to map-gestures/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/map-downloader-android/app/src/main/res/values-w820dp/dimens.xml b/map-gestures/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from map-downloader-android/app/src/main/res/values-w820dp/dimens.xml rename to map-gestures/app/src/main/res/values-w820dp/dimens.xml diff --git a/map-gestures-android/app/src/main/res/values/colors.xml b/map-gestures/app/src/main/res/values/colors.xml similarity index 100% rename from map-gestures-android/app/src/main/res/values/colors.xml rename to map-gestures/app/src/main/res/values/colors.xml diff --git a/map-downloader-android/app/src/main/res/values/dimens.xml b/map-gestures/app/src/main/res/values/dimens.xml similarity index 100% rename from map-downloader-android/app/src/main/res/values/dimens.xml rename to map-gestures/app/src/main/res/values/dimens.xml diff --git a/map-gestures-android/app/src/main/res/values/strings.xml b/map-gestures/app/src/main/res/values/strings.xml similarity index 100% rename from map-gestures-android/app/src/main/res/values/strings.xml rename to map-gestures/app/src/main/res/values/strings.xml diff --git a/map-gestures-android/app/src/main/res/values/styles.xml b/map-gestures/app/src/main/res/values/styles.xml similarity index 100% rename from map-gestures-android/app/src/main/res/values/styles.xml rename to map-gestures/app/src/main/res/values/styles.xml diff --git a/map-downloader-android/build.gradle b/map-gestures/build.gradle similarity index 100% rename from map-downloader-android/build.gradle rename to map-gestures/build.gradle diff --git a/map-downloader-android/gradle.properties b/map-gestures/gradle.properties similarity index 100% rename from map-downloader-android/gradle.properties rename to map-gestures/gradle.properties diff --git a/map-downloader-android/gradle/wrapper/gradle-wrapper.jar b/map-gestures/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from map-downloader-android/gradle/wrapper/gradle-wrapper.jar rename to map-gestures/gradle/wrapper/gradle-wrapper.jar diff --git a/map-downloader-android/gradle/wrapper/gradle-wrapper.properties b/map-gestures/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from map-downloader-android/gradle/wrapper/gradle-wrapper.properties rename to map-gestures/gradle/wrapper/gradle-wrapper.properties diff --git a/map-downloader-android/gradlew b/map-gestures/gradlew old mode 100755 new mode 100644 similarity index 100% rename from map-downloader-android/gradlew rename to map-gestures/gradlew diff --git a/routing-android/gradlew.bat b/map-gestures/gradlew.bat similarity index 100% rename from routing-android/gradlew.bat rename to map-gestures/gradlew.bat diff --git a/map-downloader-android/settings.gradle b/map-gestures/settings.gradle similarity index 100% rename from map-downloader-android/settings.gradle rename to map-gestures/settings.gradle diff --git a/map-objects-android/gradlew.bat b/map-objects-android/gradlew.bat deleted file mode 100644 index e95643d6..00000000 --- a/map-objects-android/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/map-objects-android/.gitignore b/map-objects/.gitignore similarity index 100% rename from map-objects-android/.gitignore rename to map-objects/.gitignore diff --git a/map-objects-android/app/build.gradle b/map-objects/app/build.gradle similarity index 100% rename from map-objects-android/app/build.gradle rename to map-objects/app/build.gradle diff --git a/map-gestures-android/app/libs/README.md b/map-objects/app/libs/README.md similarity index 100% rename from map-gestures-android/app/libs/README.md rename to map-objects/app/libs/README.md diff --git a/map-objects-android/app/src/main/AndroidManifest.xml b/map-objects/app/src/main/AndroidManifest.xml similarity index 100% rename from map-objects-android/app/src/main/AndroidManifest.xml rename to map-objects/app/src/main/AndroidManifest.xml diff --git a/map-objects-android/app/src/main/java/com/here/android/example/map/objects/MainActivity.java b/map-objects/app/src/main/java/com/here/android/example/map/objects/MainActivity.java similarity index 100% rename from map-objects-android/app/src/main/java/com/here/android/example/map/objects/MainActivity.java rename to map-objects/app/src/main/java/com/here/android/example/map/objects/MainActivity.java diff --git a/map-objects-android/app/src/main/java/com/here/android/example/map/objects/MapFragmentView.java b/map-objects/app/src/main/java/com/here/android/example/map/objects/MapFragmentView.java similarity index 100% rename from map-objects-android/app/src/main/java/com/here/android/example/map/objects/MapFragmentView.java rename to map-objects/app/src/main/java/com/here/android/example/map/objects/MapFragmentView.java diff --git a/map-objects-android/app/src/main/res/drawable/cafe.png b/map-objects/app/src/main/res/drawable/cafe.png similarity index 100% rename from map-objects-android/app/src/main/res/drawable/cafe.png rename to map-objects/app/src/main/res/drawable/cafe.png diff --git a/map-objects-android/app/src/main/res/layout/activity_main.xml b/map-objects/app/src/main/res/layout/activity_main.xml similarity index 100% rename from map-objects-android/app/src/main/res/layout/activity_main.xml rename to map-objects/app/src/main/res/layout/activity_main.xml diff --git a/map-objects-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/map-objects/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from map-objects-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to map-objects/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/map-objects-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/map-objects/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from map-objects-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to map-objects/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/map-objects-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/map-objects/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from map-objects-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to map-objects/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/map-objects-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/map-objects/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from map-objects-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to map-objects/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/map-objects-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/map-objects/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from map-objects-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to map-objects/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/map-gestures-android/app/src/main/res/values-w820dp/dimens.xml b/map-objects/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from map-gestures-android/app/src/main/res/values-w820dp/dimens.xml rename to map-objects/app/src/main/res/values-w820dp/dimens.xml diff --git a/map-objects-android/app/src/main/res/values/colors.xml b/map-objects/app/src/main/res/values/colors.xml similarity index 100% rename from map-objects-android/app/src/main/res/values/colors.xml rename to map-objects/app/src/main/res/values/colors.xml diff --git a/map-gestures-android/app/src/main/res/values/dimens.xml b/map-objects/app/src/main/res/values/dimens.xml similarity index 100% rename from map-gestures-android/app/src/main/res/values/dimens.xml rename to map-objects/app/src/main/res/values/dimens.xml diff --git a/map-objects-android/app/src/main/res/values/strings.xml b/map-objects/app/src/main/res/values/strings.xml similarity index 100% rename from map-objects-android/app/src/main/res/values/strings.xml rename to map-objects/app/src/main/res/values/strings.xml diff --git a/map-objects-android/app/src/main/res/values/styles.xml b/map-objects/app/src/main/res/values/styles.xml similarity index 100% rename from map-objects-android/app/src/main/res/values/styles.xml rename to map-objects/app/src/main/res/values/styles.xml diff --git a/map-gestures-android/build.gradle b/map-objects/build.gradle similarity index 100% rename from map-gestures-android/build.gradle rename to map-objects/build.gradle diff --git a/map-gestures-android/gradle.properties b/map-objects/gradle.properties similarity index 100% rename from map-gestures-android/gradle.properties rename to map-objects/gradle.properties diff --git a/map-gestures-android/gradle/wrapper/gradle-wrapper.jar b/map-objects/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from map-gestures-android/gradle/wrapper/gradle-wrapper.jar rename to map-objects/gradle/wrapper/gradle-wrapper.jar diff --git a/map-gestures-android/gradle/wrapper/gradle-wrapper.properties b/map-objects/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from map-gestures-android/gradle/wrapper/gradle-wrapper.properties rename to map-objects/gradle/wrapper/gradle-wrapper.properties diff --git a/map-gestures-android/gradlew b/map-objects/gradlew old mode 100755 new mode 100644 similarity index 100% rename from map-gestures-android/gradlew rename to map-objects/gradlew diff --git a/search-android/gradlew.bat b/map-objects/gradlew.bat similarity index 100% rename from search-android/gradlew.bat rename to map-objects/gradlew.bat diff --git a/map-gestures-android/settings.gradle b/map-objects/settings.gradle similarity index 100% rename from map-gestures-android/settings.gradle rename to map-objects/settings.gradle diff --git a/map-rendering-android/.gitignore b/map-rendering/.gitignore similarity index 100% rename from map-rendering-android/.gitignore rename to map-rendering/.gitignore diff --git a/map-rendering-android/app/build.gradle b/map-rendering/app/build.gradle similarity index 100% rename from map-rendering-android/app/build.gradle rename to map-rendering/app/build.gradle diff --git a/map-objects-android/app/libs/README.md b/map-rendering/app/libs/README.md similarity index 100% rename from map-objects-android/app/libs/README.md rename to map-rendering/app/libs/README.md diff --git a/map-rendering-android/app/src/main/AndroidManifest.xml b/map-rendering/app/src/main/AndroidManifest.xml similarity index 100% rename from map-rendering-android/app/src/main/AndroidManifest.xml rename to map-rendering/app/src/main/AndroidManifest.xml diff --git a/map-rendering-android/app/src/main/java/com/here/android/example/map/basic/MainActivity.java b/map-rendering/app/src/main/java/com/here/android/example/map/basic/MainActivity.java similarity index 100% rename from map-rendering-android/app/src/main/java/com/here/android/example/map/basic/MainActivity.java rename to map-rendering/app/src/main/java/com/here/android/example/map/basic/MainActivity.java diff --git a/map-rendering-android/app/src/main/java/com/here/android/example/map/basic/MapFragmentView.java b/map-rendering/app/src/main/java/com/here/android/example/map/basic/MapFragmentView.java similarity index 100% rename from map-rendering-android/app/src/main/java/com/here/android/example/map/basic/MapFragmentView.java rename to map-rendering/app/src/main/java/com/here/android/example/map/basic/MapFragmentView.java diff --git a/map-rendering-android/app/src/main/res/layout/activity_main.xml b/map-rendering/app/src/main/res/layout/activity_main.xml similarity index 100% rename from map-rendering-android/app/src/main/res/layout/activity_main.xml rename to map-rendering/app/src/main/res/layout/activity_main.xml diff --git a/map-rendering-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/map-rendering/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from map-rendering-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to map-rendering/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/map-rendering-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/map-rendering/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from map-rendering-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to map-rendering/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/map-rendering-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/map-rendering/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from map-rendering-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to map-rendering/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/map-rendering-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/map-rendering/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from map-rendering-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to map-rendering/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/map-rendering-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/map-rendering/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from map-rendering-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to map-rendering/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/map-objects-android/app/src/main/res/values-w820dp/dimens.xml b/map-rendering/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from map-objects-android/app/src/main/res/values-w820dp/dimens.xml rename to map-rendering/app/src/main/res/values-w820dp/dimens.xml diff --git a/map-rendering-android/app/src/main/res/values/colors.xml b/map-rendering/app/src/main/res/values/colors.xml similarity index 100% rename from map-rendering-android/app/src/main/res/values/colors.xml rename to map-rendering/app/src/main/res/values/colors.xml diff --git a/map-objects-android/app/src/main/res/values/dimens.xml b/map-rendering/app/src/main/res/values/dimens.xml similarity index 100% rename from map-objects-android/app/src/main/res/values/dimens.xml rename to map-rendering/app/src/main/res/values/dimens.xml diff --git a/map-rendering-android/app/src/main/res/values/strings.xml b/map-rendering/app/src/main/res/values/strings.xml similarity index 100% rename from map-rendering-android/app/src/main/res/values/strings.xml rename to map-rendering/app/src/main/res/values/strings.xml diff --git a/map-rendering-android/app/src/main/res/values/styles.xml b/map-rendering/app/src/main/res/values/styles.xml similarity index 100% rename from map-rendering-android/app/src/main/res/values/styles.xml rename to map-rendering/app/src/main/res/values/styles.xml diff --git a/map-objects-android/build.gradle b/map-rendering/build.gradle similarity index 100% rename from map-objects-android/build.gradle rename to map-rendering/build.gradle diff --git a/map-objects-android/gradle.properties b/map-rendering/gradle.properties similarity index 100% rename from map-objects-android/gradle.properties rename to map-rendering/gradle.properties diff --git a/map-objects-android/gradle/wrapper/gradle-wrapper.jar b/map-rendering/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from map-objects-android/gradle/wrapper/gradle-wrapper.jar rename to map-rendering/gradle/wrapper/gradle-wrapper.jar diff --git a/map-objects-android/gradle/wrapper/gradle-wrapper.properties b/map-rendering/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from map-objects-android/gradle/wrapper/gradle-wrapper.properties rename to map-rendering/gradle/wrapper/gradle-wrapper.properties diff --git a/map-objects-android/gradlew b/map-rendering/gradlew old mode 100755 new mode 100644 similarity index 100% rename from map-objects-android/gradlew rename to map-rendering/gradlew diff --git a/turn-by-turn-navigation-android/gradlew.bat b/map-rendering/gradlew.bat similarity index 100% rename from turn-by-turn-navigation-android/gradlew.bat rename to map-rendering/gradlew.bat diff --git a/map-objects-android/settings.gradle b/map-rendering/settings.gradle similarity index 100% rename from map-objects-android/settings.gradle rename to map-rendering/settings.gradle diff --git a/nlp-android/.gitignore b/nlp/.gitignore similarity index 100% rename from nlp-android/.gitignore rename to nlp/.gitignore diff --git a/nlp-android/app/build.gradle b/nlp/app/build.gradle similarity index 100% rename from nlp-android/app/build.gradle rename to nlp/app/build.gradle diff --git a/map-rendering-android/app/libs/README.md b/nlp/app/libs/README.md similarity index 100% rename from map-rendering-android/app/libs/README.md rename to nlp/app/libs/README.md diff --git a/nlp-android/app/src/main/AndroidManifest.xml b/nlp/app/src/main/AndroidManifest.xml old mode 100755 new mode 100644 similarity index 100% rename from nlp-android/app/src/main/AndroidManifest.xml rename to nlp/app/src/main/AndroidManifest.xml diff --git a/nlp-android/app/src/main/java/com/here/android/example/nlp/MainActivity.java b/nlp/app/src/main/java/com/here/android/example/nlp/MainActivity.java old mode 100755 new mode 100644 similarity index 100% rename from nlp-android/app/src/main/java/com/here/android/example/nlp/MainActivity.java rename to nlp/app/src/main/java/com/here/android/example/nlp/MainActivity.java diff --git a/nlp-android/app/src/main/java/com/here/android/example/nlp/MapFragmentView.java b/nlp/app/src/main/java/com/here/android/example/nlp/MapFragmentView.java similarity index 100% rename from nlp-android/app/src/main/java/com/here/android/example/nlp/MapFragmentView.java rename to nlp/app/src/main/java/com/here/android/example/nlp/MapFragmentView.java diff --git a/nlp-android/app/src/main/res/drawable/marker.png b/nlp/app/src/main/res/drawable/marker.png similarity index 100% rename from nlp-android/app/src/main/res/drawable/marker.png rename to nlp/app/src/main/res/drawable/marker.png diff --git a/nlp-android/app/src/main/res/layout/activity_main.xml b/nlp/app/src/main/res/layout/activity_main.xml old mode 100755 new mode 100644 similarity index 100% rename from nlp-android/app/src/main/res/layout/activity_main.xml rename to nlp/app/src/main/res/layout/activity_main.xml diff --git a/nlp-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/nlp/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from nlp-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to nlp/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/nlp-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/nlp/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from nlp-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to nlp/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/nlp-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/nlp/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from nlp-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to nlp/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/nlp-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/nlp/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from nlp-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to nlp/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/nlp-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/nlp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from nlp-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to nlp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/nlp-android/app/src/main/res/raw/sk_error.pcm b/nlp/app/src/main/res/raw/sk_error.pcm old mode 100755 new mode 100644 similarity index 100% rename from nlp-android/app/src/main/res/raw/sk_error.pcm rename to nlp/app/src/main/res/raw/sk_error.pcm diff --git a/nlp-android/app/src/main/res/raw/sk_start.pcm b/nlp/app/src/main/res/raw/sk_start.pcm old mode 100755 new mode 100644 similarity index 100% rename from nlp-android/app/src/main/res/raw/sk_start.pcm rename to nlp/app/src/main/res/raw/sk_start.pcm diff --git a/nlp-android/app/src/main/res/raw/sk_stop.pcm b/nlp/app/src/main/res/raw/sk_stop.pcm old mode 100755 new mode 100644 similarity index 100% rename from nlp-android/app/src/main/res/raw/sk_stop.pcm rename to nlp/app/src/main/res/raw/sk_stop.pcm diff --git a/nlp-android/app/src/main/res/values/strings.xml b/nlp/app/src/main/res/values/strings.xml old mode 100755 new mode 100644 similarity index 100% rename from nlp-android/app/src/main/res/values/strings.xml rename to nlp/app/src/main/res/values/strings.xml diff --git a/nlp-android/build.gradle b/nlp/build.gradle similarity index 100% rename from nlp-android/build.gradle rename to nlp/build.gradle diff --git a/map-rendering-android/gradle.properties b/nlp/gradle.properties similarity index 100% rename from map-rendering-android/gradle.properties rename to nlp/gradle.properties diff --git a/map-rendering-android/gradle/wrapper/gradle-wrapper.jar b/nlp/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from map-rendering-android/gradle/wrapper/gradle-wrapper.jar rename to nlp/gradle/wrapper/gradle-wrapper.jar diff --git a/map-rendering-android/gradle/wrapper/gradle-wrapper.properties b/nlp/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from map-rendering-android/gradle/wrapper/gradle-wrapper.properties rename to nlp/gradle/wrapper/gradle-wrapper.properties diff --git a/map-rendering-android/gradlew b/nlp/gradlew old mode 100755 new mode 100644 similarity index 100% rename from map-rendering-android/gradlew rename to nlp/gradlew diff --git a/advanced-navigation-android/gradlew.bat b/nlp/gradlew.bat similarity index 96% rename from advanced-navigation-android/gradlew.bat rename to nlp/gradlew.bat index e95643d6..f9553162 100644 --- a/advanced-navigation-android/gradlew.bat +++ b/nlp/gradlew.bat @@ -1,84 +1,84 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/map-rendering-android/settings.gradle b/nlp/settings.gradle similarity index 100% rename from map-rendering-android/settings.gradle rename to nlp/settings.gradle diff --git a/here-positioning-android/.gitignore b/positioning/.gitignore similarity index 100% rename from here-positioning-android/.gitignore rename to positioning/.gitignore diff --git a/here-positioning-android/app/build.gradle b/positioning/app/build.gradle similarity index 100% rename from here-positioning-android/app/build.gradle rename to positioning/app/build.gradle diff --git a/nlp-android/app/libs/README.md b/positioning/app/libs/README.md similarity index 100% rename from nlp-android/app/libs/README.md rename to positioning/app/libs/README.md diff --git a/here-positioning-android/app/src/main/AndroidManifest.xml b/positioning/app/src/main/AndroidManifest.xml similarity index 100% rename from here-positioning-android/app/src/main/AndroidManifest.xml rename to positioning/app/src/main/AndroidManifest.xml diff --git a/here-positioning-android/app/src/main/java/com/here/android/example/basicpositioningsolution/BasicPositioningActivity.java b/positioning/app/src/main/java/com/here/android/example/basicpositioningsolution/BasicPositioningActivity.java similarity index 100% rename from here-positioning-android/app/src/main/java/com/here/android/example/basicpositioningsolution/BasicPositioningActivity.java rename to positioning/app/src/main/java/com/here/android/example/basicpositioningsolution/BasicPositioningActivity.java diff --git a/here-positioning-android/app/src/main/res/layout/activity_main.xml b/positioning/app/src/main/res/layout/activity_main.xml similarity index 100% rename from here-positioning-android/app/src/main/res/layout/activity_main.xml rename to positioning/app/src/main/res/layout/activity_main.xml diff --git a/here-positioning-android/app/src/main/res/menu/activity_main.xml b/positioning/app/src/main/res/menu/activity_main.xml similarity index 100% rename from here-positioning-android/app/src/main/res/menu/activity_main.xml rename to positioning/app/src/main/res/menu/activity_main.xml diff --git a/here-positioning-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/positioning/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from here-positioning-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to positioning/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/here-positioning-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/positioning/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from here-positioning-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to positioning/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/here-positioning-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/positioning/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from here-positioning-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to positioning/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/here-positioning-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/positioning/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from here-positioning-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to positioning/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/map-rendering-android/app/src/main/res/values-w820dp/dimens.xml b/positioning/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from map-rendering-android/app/src/main/res/values-w820dp/dimens.xml rename to positioning/app/src/main/res/values-w820dp/dimens.xml diff --git a/map-rendering-android/app/src/main/res/values/dimens.xml b/positioning/app/src/main/res/values/dimens.xml similarity index 100% rename from map-rendering-android/app/src/main/res/values/dimens.xml rename to positioning/app/src/main/res/values/dimens.xml diff --git a/here-positioning-android/app/src/main/res/values/strings.xml b/positioning/app/src/main/res/values/strings.xml similarity index 100% rename from here-positioning-android/app/src/main/res/values/strings.xml rename to positioning/app/src/main/res/values/strings.xml diff --git a/map-rendering-android/build.gradle b/positioning/build.gradle similarity index 100% rename from map-rendering-android/build.gradle rename to positioning/build.gradle diff --git a/nlp-android/gradle.properties b/positioning/gradle.properties similarity index 100% rename from nlp-android/gradle.properties rename to positioning/gradle.properties diff --git a/nlp-android/gradle/wrapper/gradle-wrapper.jar b/positioning/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from nlp-android/gradle/wrapper/gradle-wrapper.jar rename to positioning/gradle/wrapper/gradle-wrapper.jar diff --git a/nlp-android/gradle/wrapper/gradle-wrapper.properties b/positioning/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from nlp-android/gradle/wrapper/gradle-wrapper.properties rename to positioning/gradle/wrapper/gradle-wrapper.properties diff --git a/nlp-android/gradlew b/positioning/gradlew old mode 100755 new mode 100644 similarity index 100% rename from nlp-android/gradlew rename to positioning/gradlew diff --git a/here-positioning-android/gradlew.bat b/positioning/gradlew.bat similarity index 96% rename from here-positioning-android/gradlew.bat rename to positioning/gradlew.bat index e95643d6..f9553162 100644 --- a/here-positioning-android/gradlew.bat +++ b/positioning/gradlew.bat @@ -1,84 +1,84 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/nlp-android/settings.gradle b/positioning/settings.gradle similarity index 100% rename from nlp-android/settings.gradle rename to positioning/settings.gradle diff --git a/routing-android/.gitignore b/routing/.gitignore similarity index 100% rename from routing-android/.gitignore rename to routing/.gitignore diff --git a/routing-android/app/build.gradle b/routing/app/build.gradle similarity index 100% rename from routing-android/app/build.gradle rename to routing/app/build.gradle diff --git a/routing-android/app/libs/README.md b/routing/app/libs/README.md similarity index 100% rename from routing-android/app/libs/README.md rename to routing/app/libs/README.md diff --git a/routing-android/app/src/main/AndroidManifest.xml b/routing/app/src/main/AndroidManifest.xml similarity index 100% rename from routing-android/app/src/main/AndroidManifest.xml rename to routing/app/src/main/AndroidManifest.xml diff --git a/routing-android/app/src/main/java/com/here/android/example/routing/MainActivity.java b/routing/app/src/main/java/com/here/android/example/routing/MainActivity.java similarity index 100% rename from routing-android/app/src/main/java/com/here/android/example/routing/MainActivity.java rename to routing/app/src/main/java/com/here/android/example/routing/MainActivity.java diff --git a/routing-android/app/src/main/java/com/here/android/example/routing/MapFragmentView.java b/routing/app/src/main/java/com/here/android/example/routing/MapFragmentView.java similarity index 100% rename from routing-android/app/src/main/java/com/here/android/example/routing/MapFragmentView.java rename to routing/app/src/main/java/com/here/android/example/routing/MapFragmentView.java diff --git a/routing-android/app/src/main/res/layout/activity_main.xml b/routing/app/src/main/res/layout/activity_main.xml similarity index 100% rename from routing-android/app/src/main/res/layout/activity_main.xml rename to routing/app/src/main/res/layout/activity_main.xml diff --git a/routing-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/routing/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from routing-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to routing/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/routing-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/routing/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from routing-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to routing/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/routing-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/routing/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from routing-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to routing/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/routing-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/routing/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from routing-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to routing/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/routing-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/routing/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from routing-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to routing/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/routing-android/app/src/main/res/values-w820dp/dimens.xml b/routing/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from routing-android/app/src/main/res/values-w820dp/dimens.xml rename to routing/app/src/main/res/values-w820dp/dimens.xml diff --git a/routing-android/app/src/main/res/values/colors.xml b/routing/app/src/main/res/values/colors.xml similarity index 100% rename from routing-android/app/src/main/res/values/colors.xml rename to routing/app/src/main/res/values/colors.xml diff --git a/routing-android/app/src/main/res/values/dimens.xml b/routing/app/src/main/res/values/dimens.xml similarity index 100% rename from routing-android/app/src/main/res/values/dimens.xml rename to routing/app/src/main/res/values/dimens.xml diff --git a/routing-android/app/src/main/res/values/strings.xml b/routing/app/src/main/res/values/strings.xml similarity index 100% rename from routing-android/app/src/main/res/values/strings.xml rename to routing/app/src/main/res/values/strings.xml diff --git a/routing-android/app/src/main/res/values/styles.xml b/routing/app/src/main/res/values/styles.xml similarity index 100% rename from routing-android/app/src/main/res/values/styles.xml rename to routing/app/src/main/res/values/styles.xml diff --git a/routing-android/build.gradle b/routing/build.gradle similarity index 100% rename from routing-android/build.gradle rename to routing/build.gradle diff --git a/routing-android/gradle.properties b/routing/gradle.properties similarity index 100% rename from routing-android/gradle.properties rename to routing/gradle.properties diff --git a/routing-android/gradle/wrapper/gradle-wrapper.jar b/routing/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from routing-android/gradle/wrapper/gradle-wrapper.jar rename to routing/gradle/wrapper/gradle-wrapper.jar diff --git a/routing-android/gradle/wrapper/gradle-wrapper.properties b/routing/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from routing-android/gradle/wrapper/gradle-wrapper.properties rename to routing/gradle/wrapper/gradle-wrapper.properties diff --git a/routing-android/gradlew b/routing/gradlew old mode 100755 new mode 100644 similarity index 100% rename from routing-android/gradlew rename to routing/gradlew diff --git a/map-customization-android/gradlew.bat b/routing/gradlew.bat similarity index 96% rename from map-customization-android/gradlew.bat rename to routing/gradlew.bat index e95643d6..f9553162 100644 --- a/map-customization-android/gradlew.bat +++ b/routing/gradlew.bat @@ -1,84 +1,84 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/routing-android/settings.gradle b/routing/settings.gradle similarity index 100% rename from routing-android/settings.gradle rename to routing/settings.gradle diff --git a/search-android/.gitignore b/search/.gitignore similarity index 100% rename from search-android/.gitignore rename to search/.gitignore diff --git a/search-android/app/build.gradle b/search/app/build.gradle similarity index 100% rename from search-android/app/build.gradle rename to search/app/build.gradle diff --git a/search-android/app/libs/README.md b/search/app/libs/README.md similarity index 100% rename from search-android/app/libs/README.md rename to search/app/libs/README.md diff --git a/search-android/app/src/main/AndroidManifest.xml b/search/app/src/main/AndroidManifest.xml similarity index 100% rename from search-android/app/src/main/AndroidManifest.xml rename to search/app/src/main/AndroidManifest.xml diff --git a/search-android/app/src/main/java/com/here/android/example/search/MainActivity.java b/search/app/src/main/java/com/here/android/example/search/MainActivity.java similarity index 100% rename from search-android/app/src/main/java/com/here/android/example/search/MainActivity.java rename to search/app/src/main/java/com/here/android/example/search/MainActivity.java diff --git a/search-android/app/src/main/java/com/here/android/example/search/MapFragmentView.java b/search/app/src/main/java/com/here/android/example/search/MapFragmentView.java similarity index 100% rename from search-android/app/src/main/java/com/here/android/example/search/MapFragmentView.java rename to search/app/src/main/java/com/here/android/example/search/MapFragmentView.java diff --git a/search-android/app/src/main/java/com/here/android/example/search/ResultListActivity.java b/search/app/src/main/java/com/here/android/example/search/ResultListActivity.java similarity index 100% rename from search-android/app/src/main/java/com/here/android/example/search/ResultListActivity.java rename to search/app/src/main/java/com/here/android/example/search/ResultListActivity.java diff --git a/search-android/app/src/main/java/com/here/android/example/search/ResultListAdapter.java b/search/app/src/main/java/com/here/android/example/search/ResultListAdapter.java similarity index 100% rename from search-android/app/src/main/java/com/here/android/example/search/ResultListAdapter.java rename to search/app/src/main/java/com/here/android/example/search/ResultListAdapter.java diff --git a/search-android/app/src/main/res/drawable/marker.png b/search/app/src/main/res/drawable/marker.png similarity index 100% rename from search-android/app/src/main/res/drawable/marker.png rename to search/app/src/main/res/drawable/marker.png diff --git a/search-android/app/src/main/res/layout/activity_main.xml b/search/app/src/main/res/layout/activity_main.xml similarity index 100% rename from search-android/app/src/main/res/layout/activity_main.xml rename to search/app/src/main/res/layout/activity_main.xml diff --git a/search-android/app/src/main/res/layout/result_list.xml b/search/app/src/main/res/layout/result_list.xml similarity index 100% rename from search-android/app/src/main/res/layout/result_list.xml rename to search/app/src/main/res/layout/result_list.xml diff --git a/search-android/app/src/main/res/layout/result_list_item.xml b/search/app/src/main/res/layout/result_list_item.xml similarity index 100% rename from search-android/app/src/main/res/layout/result_list_item.xml rename to search/app/src/main/res/layout/result_list_item.xml diff --git a/search-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/search/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from search-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to search/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/search-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/search/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from search-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to search/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/search-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/search/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from search-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to search/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/search-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/search/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from search-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to search/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/search-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/search/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from search-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to search/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/search-android/app/src/main/res/values-w820dp/dimens.xml b/search/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from search-android/app/src/main/res/values-w820dp/dimens.xml rename to search/app/src/main/res/values-w820dp/dimens.xml diff --git a/search-android/app/src/main/res/values/colors.xml b/search/app/src/main/res/values/colors.xml similarity index 100% rename from search-android/app/src/main/res/values/colors.xml rename to search/app/src/main/res/values/colors.xml diff --git a/search-android/app/src/main/res/values/dimens.xml b/search/app/src/main/res/values/dimens.xml similarity index 100% rename from search-android/app/src/main/res/values/dimens.xml rename to search/app/src/main/res/values/dimens.xml diff --git a/search-android/app/src/main/res/values/strings.xml b/search/app/src/main/res/values/strings.xml similarity index 100% rename from search-android/app/src/main/res/values/strings.xml rename to search/app/src/main/res/values/strings.xml diff --git a/search-android/app/src/main/res/values/styles.xml b/search/app/src/main/res/values/styles.xml similarity index 100% rename from search-android/app/src/main/res/values/styles.xml rename to search/app/src/main/res/values/styles.xml diff --git a/search-android/build.gradle b/search/build.gradle similarity index 100% rename from search-android/build.gradle rename to search/build.gradle diff --git a/search-android/gradle.properties b/search/gradle.properties similarity index 100% rename from search-android/gradle.properties rename to search/gradle.properties diff --git a/search-android/gradle/wrapper/gradle-wrapper.jar b/search/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from search-android/gradle/wrapper/gradle-wrapper.jar rename to search/gradle/wrapper/gradle-wrapper.jar diff --git a/search-android/gradle/wrapper/gradle-wrapper.properties b/search/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from search-android/gradle/wrapper/gradle-wrapper.properties rename to search/gradle/wrapper/gradle-wrapper.properties diff --git a/search-android/gradlew b/search/gradlew old mode 100755 new mode 100644 similarity index 100% rename from search-android/gradlew rename to search/gradlew diff --git a/map-gestures-android/gradlew.bat b/search/gradlew.bat similarity index 96% rename from map-gestures-android/gradlew.bat rename to search/gradlew.bat index e95643d6..f9553162 100644 --- a/map-gestures-android/gradlew.bat +++ b/search/gradlew.bat @@ -1,84 +1,84 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/search-android/settings.gradle b/search/settings.gradle similarity index 100% rename from search-android/settings.gradle rename to search/settings.gradle diff --git a/turn-by-turn-navigation-android/.gitignore b/turn-by-turn-navigation/.gitignore similarity index 100% rename from turn-by-turn-navigation-android/.gitignore rename to turn-by-turn-navigation/.gitignore diff --git a/turn-by-turn-navigation-android/app/build.gradle b/turn-by-turn-navigation/app/build.gradle similarity index 100% rename from turn-by-turn-navigation-android/app/build.gradle rename to turn-by-turn-navigation/app/build.gradle diff --git a/turn-by-turn-navigation-android/app/libs/README.md b/turn-by-turn-navigation/app/libs/README.md similarity index 100% rename from turn-by-turn-navigation-android/app/libs/README.md rename to turn-by-turn-navigation/app/libs/README.md diff --git a/turn-by-turn-navigation-android/app/src/main/AndroidManifest.xml b/turn-by-turn-navigation/app/src/main/AndroidManifest.xml similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/AndroidManifest.xml rename to turn-by-turn-navigation/app/src/main/AndroidManifest.xml diff --git a/turn-by-turn-navigation-android/app/src/main/java/com/here/android/example/guidance/MainActivity.java b/turn-by-turn-navigation/app/src/main/java/com/here/android/example/guidance/MainActivity.java similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/java/com/here/android/example/guidance/MainActivity.java rename to turn-by-turn-navigation/app/src/main/java/com/here/android/example/guidance/MainActivity.java diff --git a/turn-by-turn-navigation-android/app/src/main/java/com/here/android/example/guidance/MapFragmentView.java b/turn-by-turn-navigation/app/src/main/java/com/here/android/example/guidance/MapFragmentView.java similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/java/com/here/android/example/guidance/MapFragmentView.java rename to turn-by-turn-navigation/app/src/main/java/com/here/android/example/guidance/MapFragmentView.java diff --git a/turn-by-turn-navigation-android/app/src/main/res/layout/activity_main.xml b/turn-by-turn-navigation/app/src/main/res/layout/activity_main.xml similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/res/layout/activity_main.xml rename to turn-by-turn-navigation/app/src/main/res/layout/activity_main.xml diff --git a/turn-by-turn-navigation-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/turn-by-turn-navigation/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to turn-by-turn-navigation/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/turn-by-turn-navigation-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/turn-by-turn-navigation/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to turn-by-turn-navigation/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/turn-by-turn-navigation-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/turn-by-turn-navigation/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to turn-by-turn-navigation/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/turn-by-turn-navigation-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/turn-by-turn-navigation/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to turn-by-turn-navigation/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/turn-by-turn-navigation-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/turn-by-turn-navigation/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to turn-by-turn-navigation/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/turn-by-turn-navigation-android/app/src/main/res/values-w820dp/dimens.xml b/turn-by-turn-navigation/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/res/values-w820dp/dimens.xml rename to turn-by-turn-navigation/app/src/main/res/values-w820dp/dimens.xml diff --git a/turn-by-turn-navigation-android/app/src/main/res/values/colors.xml b/turn-by-turn-navigation/app/src/main/res/values/colors.xml similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/res/values/colors.xml rename to turn-by-turn-navigation/app/src/main/res/values/colors.xml diff --git a/turn-by-turn-navigation-android/app/src/main/res/values/dimens.xml b/turn-by-turn-navigation/app/src/main/res/values/dimens.xml similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/res/values/dimens.xml rename to turn-by-turn-navigation/app/src/main/res/values/dimens.xml diff --git a/turn-by-turn-navigation-android/app/src/main/res/values/strings.xml b/turn-by-turn-navigation/app/src/main/res/values/strings.xml similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/res/values/strings.xml rename to turn-by-turn-navigation/app/src/main/res/values/strings.xml diff --git a/turn-by-turn-navigation-android/app/src/main/res/values/styles.xml b/turn-by-turn-navigation/app/src/main/res/values/styles.xml similarity index 100% rename from turn-by-turn-navigation-android/app/src/main/res/values/styles.xml rename to turn-by-turn-navigation/app/src/main/res/values/styles.xml diff --git a/turn-by-turn-navigation-android/build.gradle b/turn-by-turn-navigation/build.gradle similarity index 100% rename from turn-by-turn-navigation-android/build.gradle rename to turn-by-turn-navigation/build.gradle diff --git a/turn-by-turn-navigation-android/gradle.properties b/turn-by-turn-navigation/gradle.properties similarity index 100% rename from turn-by-turn-navigation-android/gradle.properties rename to turn-by-turn-navigation/gradle.properties diff --git a/turn-by-turn-navigation-android/gradle/wrapper/gradle-wrapper.jar b/turn-by-turn-navigation/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from turn-by-turn-navigation-android/gradle/wrapper/gradle-wrapper.jar rename to turn-by-turn-navigation/gradle/wrapper/gradle-wrapper.jar diff --git a/turn-by-turn-navigation-android/gradle/wrapper/gradle-wrapper.properties b/turn-by-turn-navigation/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from turn-by-turn-navigation-android/gradle/wrapper/gradle-wrapper.properties rename to turn-by-turn-navigation/gradle/wrapper/gradle-wrapper.properties diff --git a/turn-by-turn-navigation-android/gradlew b/turn-by-turn-navigation/gradlew old mode 100755 new mode 100644 similarity index 100% rename from turn-by-turn-navigation-android/gradlew rename to turn-by-turn-navigation/gradlew diff --git a/turn-by-turn-navigation/gradlew.bat b/turn-by-turn-navigation/gradlew.bat new file mode 100644 index 00000000..f9553162 --- /dev/null +++ b/turn-by-turn-navigation/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/turn-by-turn-navigation-android/settings.gradle b/turn-by-turn-navigation/settings.gradle similarity index 100% rename from turn-by-turn-navigation-android/settings.gradle rename to turn-by-turn-navigation/settings.gradle diff --git a/urban-mobility-android/gradlew.bat b/urban-mobility-android/gradlew.bat deleted file mode 100644 index e95643d6..00000000 --- a/urban-mobility-android/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/urban-mobility-android/.gitignore b/urban-mobility/.gitignore similarity index 100% rename from urban-mobility-android/.gitignore rename to urban-mobility/.gitignore diff --git a/urban-mobility-android/app/build.gradle b/urban-mobility/app/build.gradle similarity index 100% rename from urban-mobility-android/app/build.gradle rename to urban-mobility/app/build.gradle diff --git a/urban-mobility-android/app/libs/README.md b/urban-mobility/app/libs/README.md similarity index 100% rename from urban-mobility-android/app/libs/README.md rename to urban-mobility/app/libs/README.md diff --git a/urban-mobility-android/app/src/main/AndroidManifest.xml b/urban-mobility/app/src/main/AndroidManifest.xml similarity index 100% rename from urban-mobility-android/app/src/main/AndroidManifest.xml rename to urban-mobility/app/src/main/AndroidManifest.xml diff --git a/urban-mobility-android/app/src/main/java/com/here/android/example/urbanmobility/MainActivity.java b/urban-mobility/app/src/main/java/com/here/android/example/urbanmobility/MainActivity.java similarity index 100% rename from urban-mobility-android/app/src/main/java/com/here/android/example/urbanmobility/MainActivity.java rename to urban-mobility/app/src/main/java/com/here/android/example/urbanmobility/MainActivity.java diff --git a/urban-mobility-android/app/src/main/java/com/here/android/example/urbanmobility/MapFragmentView.java b/urban-mobility/app/src/main/java/com/here/android/example/urbanmobility/MapFragmentView.java similarity index 100% rename from urban-mobility-android/app/src/main/java/com/here/android/example/urbanmobility/MapFragmentView.java rename to urban-mobility/app/src/main/java/com/here/android/example/urbanmobility/MapFragmentView.java diff --git a/urban-mobility-android/app/src/main/java/com/here/android/example/urbanmobility/ResultListActivity.java b/urban-mobility/app/src/main/java/com/here/android/example/urbanmobility/ResultListActivity.java similarity index 100% rename from urban-mobility-android/app/src/main/java/com/here/android/example/urbanmobility/ResultListActivity.java rename to urban-mobility/app/src/main/java/com/here/android/example/urbanmobility/ResultListActivity.java diff --git a/urban-mobility-android/app/src/main/java/com/here/android/example/urbanmobility/ResultListAdapter.java b/urban-mobility/app/src/main/java/com/here/android/example/urbanmobility/ResultListAdapter.java similarity index 100% rename from urban-mobility-android/app/src/main/java/com/here/android/example/urbanmobility/ResultListAdapter.java rename to urban-mobility/app/src/main/java/com/here/android/example/urbanmobility/ResultListAdapter.java diff --git a/urban-mobility-android/app/src/main/res/drawable/marker.png b/urban-mobility/app/src/main/res/drawable/marker.png similarity index 100% rename from urban-mobility-android/app/src/main/res/drawable/marker.png rename to urban-mobility/app/src/main/res/drawable/marker.png diff --git a/urban-mobility-android/app/src/main/res/layout/activity_main.xml b/urban-mobility/app/src/main/res/layout/activity_main.xml similarity index 100% rename from urban-mobility-android/app/src/main/res/layout/activity_main.xml rename to urban-mobility/app/src/main/res/layout/activity_main.xml diff --git a/urban-mobility-android/app/src/main/res/layout/result_list.xml b/urban-mobility/app/src/main/res/layout/result_list.xml similarity index 100% rename from urban-mobility-android/app/src/main/res/layout/result_list.xml rename to urban-mobility/app/src/main/res/layout/result_list.xml diff --git a/urban-mobility-android/app/src/main/res/layout/result_list_item.xml b/urban-mobility/app/src/main/res/layout/result_list_item.xml similarity index 100% rename from urban-mobility-android/app/src/main/res/layout/result_list_item.xml rename to urban-mobility/app/src/main/res/layout/result_list_item.xml diff --git a/urban-mobility-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/urban-mobility/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from urban-mobility-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to urban-mobility/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/urban-mobility-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/urban-mobility/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from urban-mobility-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to urban-mobility/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/urban-mobility-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/urban-mobility/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from urban-mobility-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to urban-mobility/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/urban-mobility-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/urban-mobility/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from urban-mobility-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to urban-mobility/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/urban-mobility-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/urban-mobility/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from urban-mobility-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to urban-mobility/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/urban-mobility-android/app/src/main/res/values-w820dp/dimens.xml b/urban-mobility/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from urban-mobility-android/app/src/main/res/values-w820dp/dimens.xml rename to urban-mobility/app/src/main/res/values-w820dp/dimens.xml diff --git a/urban-mobility-android/app/src/main/res/values/colors.xml b/urban-mobility/app/src/main/res/values/colors.xml similarity index 100% rename from urban-mobility-android/app/src/main/res/values/colors.xml rename to urban-mobility/app/src/main/res/values/colors.xml diff --git a/urban-mobility-android/app/src/main/res/values/dimens.xml b/urban-mobility/app/src/main/res/values/dimens.xml similarity index 100% rename from urban-mobility-android/app/src/main/res/values/dimens.xml rename to urban-mobility/app/src/main/res/values/dimens.xml diff --git a/urban-mobility-android/app/src/main/res/values/strings.xml b/urban-mobility/app/src/main/res/values/strings.xml similarity index 100% rename from urban-mobility-android/app/src/main/res/values/strings.xml rename to urban-mobility/app/src/main/res/values/strings.xml diff --git a/urban-mobility-android/app/src/main/res/values/styles.xml b/urban-mobility/app/src/main/res/values/styles.xml similarity index 100% rename from urban-mobility-android/app/src/main/res/values/styles.xml rename to urban-mobility/app/src/main/res/values/styles.xml diff --git a/urban-mobility-android/build.gradle b/urban-mobility/build.gradle similarity index 100% rename from urban-mobility-android/build.gradle rename to urban-mobility/build.gradle diff --git a/urban-mobility-android/gradle.properties b/urban-mobility/gradle.properties similarity index 100% rename from urban-mobility-android/gradle.properties rename to urban-mobility/gradle.properties diff --git a/urban-mobility-android/gradle/wrapper/gradle-wrapper.jar b/urban-mobility/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from urban-mobility-android/gradle/wrapper/gradle-wrapper.jar rename to urban-mobility/gradle/wrapper/gradle-wrapper.jar diff --git a/urban-mobility-android/gradle/wrapper/gradle-wrapper.properties b/urban-mobility/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from urban-mobility-android/gradle/wrapper/gradle-wrapper.properties rename to urban-mobility/gradle/wrapper/gradle-wrapper.properties diff --git a/urban-mobility-android/gradlew b/urban-mobility/gradlew old mode 100755 new mode 100644 similarity index 100% rename from urban-mobility-android/gradlew rename to urban-mobility/gradlew diff --git a/urban-mobility/gradlew.bat b/urban-mobility/gradlew.bat new file mode 100644 index 00000000..f9553162 --- /dev/null +++ b/urban-mobility/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/urban-mobility-android/settings.gradle b/urban-mobility/settings.gradle similarity index 100% rename from urban-mobility-android/settings.gradle rename to urban-mobility/settings.gradle