From fe7b4c75d70622e4fa4ebd15a8966f81a2dd6c0e Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Mon, 9 Feb 2015 17:28:49 -0800 Subject: [PATCH 01/19] #826 - Breaking the Gradle parent up so that each module is responsible for itself. Changing root build.gradle to just be used for Gradle Wrapper management. --- android/java/app/build.gradle | 9 +++++++++ android/java/build.gradle | 10 +++------- android/java/lib/build.gradle | 9 +++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/android/java/app/build.gradle b/android/java/app/build.gradle index 906f092c4..1f9cd341a 100644 --- a/android/java/app/build.gradle +++ b/android/java/app/build.gradle @@ -1,3 +1,12 @@ +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.0.0' + } +} + apply plugin: 'com.android.application' task accessToken { diff --git a/android/java/build.gradle b/android/java/build.gradle index 1a3b0cc1a..e51332720 100644 --- a/android/java/build.gradle +++ b/android/java/build.gradle @@ -1,9 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' - } +task wrapper(type: Wrapper) { + gradleVersion = '2.2.1' } + diff --git a/android/java/lib/build.gradle b/android/java/lib/build.gradle index 14d3d9b3f..eba0ea98f 100644 --- a/android/java/lib/build.gradle +++ b/android/java/lib/build.gradle @@ -1,3 +1,12 @@ +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.0.0' + } +} + apply plugin: 'com.android.library' android { From 9c5f1c0608bbd507e1753faddea41292b72c8b37 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Mon, 9 Feb 2015 17:30:44 -0800 Subject: [PATCH 02/19] #826 - Converting from jcenter() to mavenCentral() --- android/java/app/build.gradle | 4 ++-- android/java/lib/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/java/app/build.gradle b/android/java/app/build.gradle index 1f9cd341a..2677f9088 100644 --- a/android/java/app/build.gradle +++ b/android/java/app/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:1.0.0' @@ -31,7 +31,7 @@ android { buildToolsVersion "21.1.2" repositories { - jcenter() + mavenCentral() } defaultConfig { diff --git a/android/java/lib/build.gradle b/android/java/lib/build.gradle index eba0ea98f..7d30b5ff3 100644 --- a/android/java/lib/build.gradle +++ b/android/java/lib/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:1.0.0' @@ -14,7 +14,7 @@ android { buildToolsVersion "21.1.2" repositories { - jcenter() + mavenCentral() } defaultConfig { From c7d4f7d256b9a2320ea6dc76dba1605d1ed3999c Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Mon, 9 Feb 2015 17:51:46 -0800 Subject: [PATCH 03/19] #826 -Adding checkstyle to TestApp build process. --- android/java/app/build.gradle | 22 +++- android/java/checks.xml | 185 ++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 android/java/checks.xml diff --git a/android/java/app/build.gradle b/android/java/app/build.gradle index 2677f9088..00c5c3f62 100644 --- a/android/java/app/build.gradle +++ b/android/java/app/build.gradle @@ -8,6 +8,7 @@ buildscript { } apply plugin: 'com.android.application' +apply plugin: 'checkstyle' task accessToken { def rawDir = new File("app/src/main/res/raw") @@ -55,6 +56,7 @@ android { lintOptions { checkAllWarnings true disable 'UnusedAttribute' + abortOnError false //disable 'IconDensities' } @@ -67,9 +69,27 @@ android { } dependencies { - compile project(':lib') + compile(project(':lib')) { + transitive = true + } compile 'com.android.support:support-annotations:21.0.0' compile 'com.android.support:support-v4:21.0.3' compile 'com.android.support:appcompat-v7:21.0.3' compile 'com.mapzen.android:lost:0.2' } + +checkstyle { + configFile project.file('../checks.xml') + showViolations true +} + +android.applicationVariants.all { variant -> + def name = variant.buildType.name + def checkstyle = project.tasks.create "checkstyle${name.capitalize()}", Checkstyle + checkstyle.dependsOn variant.javaCompile + checkstyle.source variant.javaCompile.source + checkstyle.classpath = project.fileTree(variant.javaCompile.destinationDir) + checkstyle.exclude('**/BuildConfig.java') + checkstyle.exclude('**/R.java') + project.tasks.getByName("check").dependsOn checkstyle +} diff --git a/android/java/checks.xml b/android/java/checks.xml new file mode 100644 index 000000000..0ee271678 --- /dev/null +++ b/android/java/checks.xml @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f4239a2b5174f346d661c55bb642ce8af9ed58e7 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Mon, 9 Feb 2015 18:49:44 -0800 Subject: [PATCH 04/19] #826 - Initial setup of Maven Central publishing functionality --- android/java/lib/build.gradle | 208 ++++++++++++++++++++++++++++- android/java/lib/gradle.properties | 22 +++ 2 files changed, 224 insertions(+), 6 deletions(-) create mode 100644 android/java/lib/gradle.properties diff --git a/android/java/lib/build.gradle b/android/java/lib/build.gradle index 7d30b5ff3..8f079159d 100644 --- a/android/java/lib/build.gradle +++ b/android/java/lib/build.gradle @@ -8,8 +8,38 @@ buildscript { } apply plugin: 'com.android.library' +apply plugin: 'checkstyle' +apply plugin: 'maven' +apply plugin: 'signing' + +allprojects { + group project.GROUP + version project.VERSION_NAME + + repositories { + mavenCentral() + } +} + +repositories { + mavenCentral() +} + +dependencies { + compile 'commons-validator:commons-validator:1.4.1' + compile 'com.android.support:support-annotations:21.0.3' + compile 'com.android.support:support-v4:21.0.3' +} android { + compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) + buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION + + defaultConfig { + minSdkVersion Integer.parseInt(project.ANDROID_MIN_SDK) + targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) + } + compileSdkVersion 21 buildToolsVersion "21.1.2" @@ -20,8 +50,6 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 21 - versionCode 4 - versionName "0.1.3" } compileOptions { @@ -51,8 +79,176 @@ configurations { all*.exclude group: 'commons-collections', module: 'commons-collections' } -dependencies { - compile 'commons-validator:commons-validator:1.4.1' - compile 'com.android.support:support-annotations:21.0.3' - compile 'com.android.support:support-v4:21.0.3' + +android.libraryVariants.all { variant -> + def name = variant.name + task "javadoc$name"(type: Javadoc) { + description = "Generates javadoc for build $name" + failOnError = false + destinationDir = new File(destinationDir, variant.baseName) + source = files(variant.javaCompile.source) + ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar" + classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar) + options.links("http://docs.oracle.com/javase/7/docs/api/") + options.links("http://d.android.com/reference/") + exclude '**/R.html', '**/R.*.html' + } +} + +checkstyle { + configFile project.file('../checks.xml') + showViolations true +} + +android.libraryVariants.all { variant -> + def name = variant.buildType.name + def checkstyle = project.tasks.create "checkstyle${name.capitalize()}", Checkstyle + checkstyle.dependsOn variant.javaCompile + checkstyle.source variant.javaCompile.source + checkstyle.classpath = project.fileTree(variant.javaCompile.destinationDir) + checkstyle.exclude('**/BuildConfig.java') + checkstyle.exclude('**/R.java') + checkstyle.exclude('**/uk/co/senab/bitmapcache/*') + checkstyle.exclude('**/com/cocoahero/android/geojson/**') + project.tasks.getByName("check").dependsOn checkstyle +} + +// From https://raw.github.com/mcxiaoke/gradle-mvn-push/master/jar.gradle +android.libraryVariants.all { variant -> + def jarTask = project.tasks.create(name: "jar${variant.name.capitalize()}", type: Jar) { + from variant.javaCompile.destinationDir + exclude "**/R.class" + exclude "**/BuildConfig.class" + } + jarTask.dependsOn variant.javaCompile + artifacts.add('archives', jarTask); +} + +// From https://raw.github.com/mcxiaoke/gradle-mvn-push/master/gradle-mvn-push.gradle +def isReleaseBuild() { + return VERSION_NAME.contains("SNAPSHOT") == false +} + +def getReleaseRepositoryUrl() { + return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL : + "https://oss.sonatype.org/service/local/staging/deploy/maven2/" +} + +def getSnapshotRepositoryUrl() { + return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL : + "https://oss.sonatype.org/content/repositories/snapshots/" +} + +def getRepositoryUsername() { + return hasProperty('USERNAME') ? USERNAME : + (hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : "") +} + +def getRepositoryPassword() { + return hasProperty('PASSWORD') ? PASSWORD : + (hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "") +} + + +task apklib(type: Zip) { + appendix = extension = 'apklib' + + from 'AndroidManifest.xml' + into('res') { + from 'res' + } + into('src') { + from 'src' + } +} + +artifacts { + archives apklib +} + +afterEvaluate { project -> + uploadArchives { + repositories { + mavenDeployer { + beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + + pom.groupId = GROUP + pom.artifactId = POM_ARTIFACT_ID + pom.version = VERSION_NAME + + repository(url: getReleaseRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), + password: getRepositoryPassword()) + } + snapshotRepository(url: getSnapshotRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), + password: getRepositoryPassword()) + } + +/* + // Leaving out as artifact was incorrectly named when found + addFilter('aar') { artifact, file -> + artifact.name == archivesBaseName + } + addFilter('apklib') { artifact, file -> + artifact.name == archivesBaseName + '-apklib' + } +*/ + + pom.project { + name POM_NAME + packaging POM_PACKAGING + description POM_DESCRIPTION + url POM_URL + + scm { + url POM_SCM_URL + connection POM_SCM_CONNECTION + developerConnection POM_SCM_DEV_CONNECTION + } + + licenses { + license { + name POM_LICENCE_NAME + url POM_LICENCE_URL + distribution POM_LICENCE_DIST + } + } + + developers { + developer { + id POM_DEVELOPER_ID + name POM_DEVELOPER_NAME + } + } + } + } + } + } + + signing { + required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } + sign configurations.archives + } + + task androidJavadocs(type: Javadoc) { + failOnError false + source = android.sourceSets.main.java.sourceFiles + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + } + + task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { + classifier = 'javadoc' + from androidJavadocs.destinationDir + } + + task androidSourcesJar(type: Jar) { + classifier = 'sources' + from android.sourceSets.main.java.sourceFiles + } + + artifacts { + archives androidSourcesJar + archives androidJavadocsJar + } } diff --git a/android/java/lib/gradle.properties b/android/java/lib/gradle.properties new file mode 100644 index 000000000..ba69bd9e4 --- /dev/null +++ b/android/java/lib/gradle.properties @@ -0,0 +1,22 @@ +GROUP=com.mapbox.mapboxgl +VERSION_NAME=0.0.1-SNAPSHOT + +POM_DESCRIPTION=Mapbox GL Android SDK +POM_URL=https://github.com/mapbox/mapbox-gl-native +POM_SCM_URL=https://github.com/mapbox/mapbox-gl-native +POM_SCM_CONNECTION=scm:git@github.com:mapbox/mapbox-gl-native.git +POM_SCM_DEV_CONNECTION=scm:git@github.com:mapbox/mapbox-gl-native.git +POM_LICENCE_NAME=The Apache Software License, Version 2.0 +POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENCE_DIST=repo +POM_DEVELOPER_ID=mapbox +POM_DEVELOPER_NAME=Mapbox + +ANDROID_MIN_SDK=14 +ANDROID_BUILD_TARGET_SDK_VERSION=21 +ANDROID_BUILD_TOOLS_VERSION=21.1.2 +ANDROID_BUILD_SDK_VERSION=21 + +POM_NAME=Mapbox GL Android SDK +POM_ARTIFACT_ID=mapbox-gl-android-sdk +POM_PACKAGING=aar From 302bd034107fb6ba10bbd121301992773d5d9108 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Mon, 9 Feb 2015 19:06:34 -0800 Subject: [PATCH 05/19] #826 - Adding Android SDK Manager for better CI support --- android/java/app/build.gradle | 2 ++ android/java/lib/build.gradle | 2 ++ 2 files changed, 4 insertions(+) diff --git a/android/java/app/build.gradle b/android/java/app/build.gradle index 00c5c3f62..292c67ba4 100644 --- a/android/java/app/build.gradle +++ b/android/java/app/build.gradle @@ -4,9 +4,11 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.10.1' } } +apply plugin: 'android-sdk-manager' apply plugin: 'com.android.application' apply plugin: 'checkstyle' diff --git a/android/java/lib/build.gradle b/android/java/lib/build.gradle index 8f079159d..84cb1e7f5 100644 --- a/android/java/lib/build.gradle +++ b/android/java/lib/build.gradle @@ -4,9 +4,11 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.10.1' } } +apply plugin: 'android-sdk-manager' apply plugin: 'com.android.library' apply plugin: 'checkstyle' apply plugin: 'maven' From 8ce9d3c71c17b01e4bfa64b649b83b05d282c32b Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 11:03:18 -0800 Subject: [PATCH 06/19] #826 -Removing redundant sdk version configs --- android/java/lib/build.gradle | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/android/java/lib/build.gradle b/android/java/lib/build.gradle index 84cb1e7f5..a5141b190 100644 --- a/android/java/lib/build.gradle +++ b/android/java/lib/build.gradle @@ -49,11 +49,6 @@ android { mavenCentral() } - defaultConfig { - minSdkVersion 14 - targetSdkVersion 21 - } - compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 @@ -71,6 +66,7 @@ android { release { minifyEnabled false + jniDebuggable false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } From 1480b894233c551d6182ce10632617b48e3d38b9 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 11:04:40 -0800 Subject: [PATCH 07/19] #826 -Removing more redundant sdk version configs --- android/java/lib/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/android/java/lib/build.gradle b/android/java/lib/build.gradle index a5141b190..5b183603a 100644 --- a/android/java/lib/build.gradle +++ b/android/java/lib/build.gradle @@ -42,9 +42,6 @@ android { targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) } - compileSdkVersion 21 - buildToolsVersion "21.1.2" - repositories { mavenCentral() } From dc5f1140d9000a8959cf964f6a1a344d392db475 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 12:22:33 -0800 Subject: [PATCH 08/19] #826 - Renaming app module to MapboxGLAndroidSDKTestApp --- .../{app => MapboxGLAndroidSDKTestApp}/build.gradle | 6 +++--- .../{app => MapboxGLAndroidSDKTestApp}/lint.xml | 0 .../src/main/AndroidManifest.xml | 0 .../java/com/mapbox/mapboxgl/app/MainActivity.java | 0 .../java/com/mapbox/mapboxgl/app/MapFragment.java | 0 .../src/main/res/drawable-hdpi/ic_action_about.png | Bin .../res/drawable-hdpi/ic_action_location_found.png | Bin .../drawable-hdpi/ic_action_location_searching.png | Bin .../src/main/res/drawable-hdpi/icon.png | Bin .../src/main/res/drawable-hdpi/icon_burned.png | Bin .../src/main/res/drawable-mdpi/compass.png | Bin .../src/main/res/drawable-mdpi/ic_action_about.png | Bin .../res/drawable-mdpi/ic_action_location_found.png | Bin .../drawable-mdpi/ic_action_location_searching.png | Bin .../src/main/res/drawable-mdpi/icon.png | Bin .../src/main/res/drawable-mdpi/icon_burned.png | Bin .../src/main/res/drawable-xhdpi/ic_action_about.png | Bin .../res/drawable-xhdpi/ic_action_location_found.png | Bin .../drawable-xhdpi/ic_action_location_searching.png | Bin .../src/main/res/drawable-xhdpi/icon.png | Bin .../src/main/res/drawable-xhdpi/icon_burned.png | Bin .../main/res/drawable-xxhdpi/ic_action_about.png | Bin .../drawable-xxhdpi/ic_action_location_found.png | Bin .../ic_action_location_searching.png | Bin .../src/main/res/drawable-xxhdpi/icon.png | Bin .../src/main/res/drawable-xxhdpi/icon_burned.png | Bin .../src/main/res/drawable-xxxhdpi/icon.png | Bin .../src/main/res/drawable-xxxhdpi/icon_burned.png | Bin .../src/main/res/layout/activity_main.xml | 0 .../src/main/res/layout/fragment_main.xml | 0 .../src/main/res/menu/menu_main.xml | 0 .../src/main/res/raw/token.txt | 1 + .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 android/java/settings.gradle | 2 +- 35 files changed, 5 insertions(+), 4 deletions(-) rename android/java/{app => MapboxGLAndroidSDKTestApp}/build.gradle (93%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/lint.xml (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/AndroidManifest.xml (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-hdpi/ic_action_about.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-hdpi/ic_action_location_found.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-hdpi/ic_action_location_searching.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-hdpi/icon.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-hdpi/icon_burned.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-mdpi/compass.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-mdpi/ic_action_about.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-mdpi/ic_action_location_found.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-mdpi/ic_action_location_searching.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-mdpi/icon.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-mdpi/icon_burned.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-xhdpi/ic_action_about.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-xhdpi/ic_action_location_found.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-xhdpi/ic_action_location_searching.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-xhdpi/icon.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-xhdpi/icon_burned.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-xxhdpi/ic_action_about.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-xxhdpi/ic_action_location_found.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-xxhdpi/ic_action_location_searching.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-xxhdpi/icon.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-xxhdpi/icon_burned.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-xxxhdpi/icon.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/drawable-xxxhdpi/icon_burned.png (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/layout/activity_main.xml (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/layout/fragment_main.xml (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/menu/menu_main.xml (100%) create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/values/strings.xml (100%) rename android/java/{app => MapboxGLAndroidSDKTestApp}/src/main/res/values/styles.xml (100%) diff --git a/android/java/app/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle similarity index 93% rename from android/java/app/build.gradle rename to android/java/MapboxGLAndroidSDKTestApp/build.gradle index 292c67ba4..c1dd00a52 100644 --- a/android/java/app/build.gradle +++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle @@ -13,9 +13,9 @@ apply plugin: 'com.android.application' apply plugin: 'checkstyle' task accessToken { - def rawDir = new File("app/src/main/res/raw") - rawDir.mkdirs() - def tokenFile = new File("app/src/main/res/raw/token.txt") +// def rawDir = new File("app/src/main/res/raw") +// rawDir.mkdirs() + def tokenFile = new File("MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt") if (!tokenFile.exists()) { String token = System.getenv('MAPBOX_ACCESS_TOKEN') if (token == null) { diff --git a/android/java/app/lint.xml b/android/java/MapboxGLAndroidSDKTestApp/lint.xml similarity index 100% rename from android/java/app/lint.xml rename to android/java/MapboxGLAndroidSDKTestApp/lint.xml diff --git a/android/java/app/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml similarity index 100% rename from android/java/app/src/main/AndroidManifest.xml rename to android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml diff --git a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java similarity index 100% rename from android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java rename to android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java diff --git a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java similarity index 100% rename from android/java/app/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java rename to android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java diff --git a/android/java/app/src/main/res/drawable-hdpi/ic_action_about.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_action_about.png similarity index 100% rename from android/java/app/src/main/res/drawable-hdpi/ic_action_about.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_action_about.png diff --git a/android/java/app/src/main/res/drawable-hdpi/ic_action_location_found.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_action_location_found.png similarity index 100% rename from android/java/app/src/main/res/drawable-hdpi/ic_action_location_found.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_action_location_found.png diff --git a/android/java/app/src/main/res/drawable-hdpi/ic_action_location_searching.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_action_location_searching.png similarity index 100% rename from android/java/app/src/main/res/drawable-hdpi/ic_action_location_searching.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_action_location_searching.png diff --git a/android/java/app/src/main/res/drawable-hdpi/icon.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from android/java/app/src/main/res/drawable-hdpi/icon.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png diff --git a/android/java/app/src/main/res/drawable-hdpi/icon_burned.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png similarity index 100% rename from android/java/app/src/main/res/drawable-hdpi/icon_burned.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png diff --git a/android/java/app/src/main/res/drawable-mdpi/compass.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/compass.png similarity index 100% rename from android/java/app/src/main/res/drawable-mdpi/compass.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/compass.png diff --git a/android/java/app/src/main/res/drawable-mdpi/ic_action_about.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_action_about.png similarity index 100% rename from android/java/app/src/main/res/drawable-mdpi/ic_action_about.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_action_about.png diff --git a/android/java/app/src/main/res/drawable-mdpi/ic_action_location_found.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_action_location_found.png similarity index 100% rename from android/java/app/src/main/res/drawable-mdpi/ic_action_location_found.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_action_location_found.png diff --git a/android/java/app/src/main/res/drawable-mdpi/ic_action_location_searching.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_action_location_searching.png similarity index 100% rename from android/java/app/src/main/res/drawable-mdpi/ic_action_location_searching.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_action_location_searching.png diff --git a/android/java/app/src/main/res/drawable-mdpi/icon.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from android/java/app/src/main/res/drawable-mdpi/icon.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png diff --git a/android/java/app/src/main/res/drawable-mdpi/icon_burned.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png similarity index 100% rename from android/java/app/src/main/res/drawable-mdpi/icon_burned.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png diff --git a/android/java/app/src/main/res/drawable-xhdpi/ic_action_about.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_action_about.png similarity index 100% rename from android/java/app/src/main/res/drawable-xhdpi/ic_action_about.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_action_about.png diff --git a/android/java/app/src/main/res/drawable-xhdpi/ic_action_location_found.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_action_location_found.png similarity index 100% rename from android/java/app/src/main/res/drawable-xhdpi/ic_action_location_found.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_action_location_found.png diff --git a/android/java/app/src/main/res/drawable-xhdpi/ic_action_location_searching.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_action_location_searching.png similarity index 100% rename from android/java/app/src/main/res/drawable-xhdpi/ic_action_location_searching.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_action_location_searching.png diff --git a/android/java/app/src/main/res/drawable-xhdpi/icon.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from android/java/app/src/main/res/drawable-xhdpi/icon.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png diff --git a/android/java/app/src/main/res/drawable-xhdpi/icon_burned.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png similarity index 100% rename from android/java/app/src/main/res/drawable-xhdpi/icon_burned.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png diff --git a/android/java/app/src/main/res/drawable-xxhdpi/ic_action_about.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_about.png similarity index 100% rename from android/java/app/src/main/res/drawable-xxhdpi/ic_action_about.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_about.png diff --git a/android/java/app/src/main/res/drawable-xxhdpi/ic_action_location_found.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_location_found.png similarity index 100% rename from android/java/app/src/main/res/drawable-xxhdpi/ic_action_location_found.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_location_found.png diff --git a/android/java/app/src/main/res/drawable-xxhdpi/ic_action_location_searching.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_location_searching.png similarity index 100% rename from android/java/app/src/main/res/drawable-xxhdpi/ic_action_location_searching.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_location_searching.png diff --git a/android/java/app/src/main/res/drawable-xxhdpi/icon.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from android/java/app/src/main/res/drawable-xxhdpi/icon.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png diff --git a/android/java/app/src/main/res/drawable-xxhdpi/icon_burned.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png similarity index 100% rename from android/java/app/src/main/res/drawable-xxhdpi/icon_burned.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png diff --git a/android/java/app/src/main/res/drawable-xxxhdpi/icon.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from android/java/app/src/main/res/drawable-xxxhdpi/icon.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png diff --git a/android/java/app/src/main/res/drawable-xxxhdpi/icon_burned.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png similarity index 100% rename from android/java/app/src/main/res/drawable-xxxhdpi/icon_burned.png rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png diff --git a/android/java/app/src/main/res/layout/activity_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml similarity index 100% rename from android/java/app/src/main/res/layout/activity_main.xml rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml diff --git a/android/java/app/src/main/res/layout/fragment_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml similarity index 100% rename from android/java/app/src/main/res/layout/fragment_main.xml rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml diff --git a/android/java/app/src/main/res/menu/menu_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml similarity index 100% rename from android/java/app/src/main/res/menu/menu_main.xml rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt new file mode 100644 index 000000000..dd3ef5113 --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt @@ -0,0 +1 @@ +pk.eyJ1IjoiYmxlZWdlIiwiYSI6IlhFcHdyMlEifQ.A8U0V-ob2G0RjI_gznrjtg \ No newline at end of file diff --git a/android/java/app/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml similarity index 100% rename from android/java/app/src/main/res/values/strings.xml rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml diff --git a/android/java/app/src/main/res/values/styles.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml similarity index 100% rename from android/java/app/src/main/res/values/styles.xml rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml diff --git a/android/java/settings.gradle b/android/java/settings.gradle index 0959cbb33..9738fefb9 100644 --- a/android/java/settings.gradle +++ b/android/java/settings.gradle @@ -1,2 +1,2 @@ -include ':app' +include ':MapboxGLAndroidSDKTestApp' include ':lib' From 8282d980000fa7a40efbd8bc0648558a277804b6 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 12:24:39 -0800 Subject: [PATCH 09/19] #826 - Renaming lib module to MapboxGLAndroidSDK --- android/java/{lib => MapboxGLAndroidSDK}/build.gradle | 0 android/java/{lib => MapboxGLAndroidSDK}/gradle.properties | 0 android/java/{lib => MapboxGLAndroidSDK}/lint.xml | 0 .../{lib => MapboxGLAndroidSDK}/src/main/AndroidManifest.xml | 0 .../com/almeros/android/multitouch/BaseGestureDetector.java | 0 .../com/almeros/android/multitouch/MoveGestureDetector.java | 0 .../com/almeros/android/multitouch/RotateGestureDetector.java | 0 .../com/almeros/android/multitouch/ShoveGestureDetector.java | 0 .../almeros/android/multitouch/TwoFingerGestureDetector.java | 0 .../multitouch/gesturedetectors/BaseGestureDetector.java | 0 .../multitouch/gesturedetectors/MoveGestureDetector.java | 0 .../multitouch/gesturedetectors/RotateGestureDetector.java | 0 .../multitouch/gesturedetectors/ShoveGestureDetector.java | 0 .../multitouch/gesturedetectors/TwoFingerGestureDetector.java | 0 .../src/main/java/com/mapbox/mapboxgl/lib/LonLat.java | 0 .../src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java | 0 .../src/main/java/com/mapbox/mapboxgl/lib/MapView.java | 0 .../src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java | 0 .../{lib => MapboxGLAndroidSDK}/src/main/res/values/attrs.xml | 0 android/java/MapboxGLAndroidSDKTestApp/build.gradle | 2 +- android/java/settings.gradle | 2 +- 21 files changed, 2 insertions(+), 2 deletions(-) rename android/java/{lib => MapboxGLAndroidSDK}/build.gradle (100%) rename android/java/{lib => MapboxGLAndroidSDK}/gradle.properties (100%) rename android/java/{lib => MapboxGLAndroidSDK}/lint.xml (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/AndroidManifest.xml (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/almeros/android/multitouch/BaseGestureDetector.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/almeros/android/multitouch/MoveGestureDetector.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/almeros/android/multitouch/RotateGestureDetector.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/almeros/android/multitouch/ShoveGestureDetector.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/almeros/android/multitouch/TwoFingerGestureDetector.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/mapbox/mapboxgl/lib/MapView.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java (100%) rename android/java/{lib => MapboxGLAndroidSDK}/src/main/res/values/attrs.xml (100%) diff --git a/android/java/lib/build.gradle b/android/java/MapboxGLAndroidSDK/build.gradle similarity index 100% rename from android/java/lib/build.gradle rename to android/java/MapboxGLAndroidSDK/build.gradle diff --git a/android/java/lib/gradle.properties b/android/java/MapboxGLAndroidSDK/gradle.properties similarity index 100% rename from android/java/lib/gradle.properties rename to android/java/MapboxGLAndroidSDK/gradle.properties diff --git a/android/java/lib/lint.xml b/android/java/MapboxGLAndroidSDK/lint.xml similarity index 100% rename from android/java/lib/lint.xml rename to android/java/MapboxGLAndroidSDK/lint.xml diff --git a/android/java/lib/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDK/src/main/AndroidManifest.xml similarity index 100% rename from android/java/lib/src/main/AndroidManifest.xml rename to android/java/MapboxGLAndroidSDK/src/main/AndroidManifest.xml diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/BaseGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/BaseGestureDetector.java similarity index 100% rename from android/java/lib/src/main/java/com/almeros/android/multitouch/BaseGestureDetector.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/BaseGestureDetector.java diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/MoveGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/MoveGestureDetector.java similarity index 100% rename from android/java/lib/src/main/java/com/almeros/android/multitouch/MoveGestureDetector.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/MoveGestureDetector.java diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/RotateGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/RotateGestureDetector.java similarity index 100% rename from android/java/lib/src/main/java/com/almeros/android/multitouch/RotateGestureDetector.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/RotateGestureDetector.java diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/ShoveGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/ShoveGestureDetector.java similarity index 100% rename from android/java/lib/src/main/java/com/almeros/android/multitouch/ShoveGestureDetector.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/ShoveGestureDetector.java diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/TwoFingerGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/TwoFingerGestureDetector.java similarity index 100% rename from android/java/lib/src/main/java/com/almeros/android/multitouch/TwoFingerGestureDetector.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/TwoFingerGestureDetector.java diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java similarity index 100% rename from android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java similarity index 100% rename from android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java similarity index 100% rename from android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java similarity index 100% rename from android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java similarity index 100% rename from android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java similarity index 100% rename from android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java similarity index 100% rename from android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/MapView.java similarity index 100% rename from android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/MapView.java diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java similarity index 100% rename from android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java diff --git a/android/java/lib/src/main/res/values/attrs.xml b/android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml similarity index 100% rename from android/java/lib/src/main/res/values/attrs.xml rename to android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle index c1dd00a52..564b94bbf 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle +++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle @@ -71,7 +71,7 @@ android { } dependencies { - compile(project(':lib')) { + compile(project(':MapboxGLAndroidSDK')) { transitive = true } compile 'com.android.support:support-annotations:21.0.0' diff --git a/android/java/settings.gradle b/android/java/settings.gradle index 9738fefb9..62a6aeed9 100644 --- a/android/java/settings.gradle +++ b/android/java/settings.gradle @@ -1,2 +1,2 @@ include ':MapboxGLAndroidSDKTestApp' -include ':lib' +include ':MapboxGLAndroidSDK' From d98c88a531608dd0097d874fad0fcdcf736b9f8a Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 12:25:41 -0800 Subject: [PATCH 10/19] #826 - Reordering modules --- android/java/settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/java/settings.gradle b/android/java/settings.gradle index 62a6aeed9..71a8f1a9a 100644 --- a/android/java/settings.gradle +++ b/android/java/settings.gradle @@ -1,2 +1,2 @@ -include ':MapboxGLAndroidSDKTestApp' include ':MapboxGLAndroidSDK' +include ':MapboxGLAndroidSDKTestApp' From c84cac9bdc6ac1f5bb8a462124445347e21ce254 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 12:34:14 -0800 Subject: [PATCH 11/19] #826 - Updating .gitignore to keep token.txt out of git --- android/java/.gitignore | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/android/java/.gitignore b/android/java/.gitignore index 4c79b6763..ddfa6128e 100644 --- a/android/java/.gitignore +++ b/android/java/.gitignore @@ -2,12 +2,11 @@ .gradle/ # IntelliJ files -.idea +.idea/ *.iml # Build files build/ -*/build/ *.so *.apk @@ -18,4 +17,4 @@ lib/src/main/assets/ local.properties # Token file -app/src/main/res/raw/token.txt +MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt From eadb3646d5678f585029341f154632ed3243dfd9 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 12:41:51 -0800 Subject: [PATCH 12/19] #826 - Updating copy destinations --- android/mapboxgl-app.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/mapboxgl-app.gyp b/android/mapboxgl-app.gyp index 5933db4c1..d16d1dd4a 100644 --- a/android/mapboxgl-app.gyp +++ b/android/mapboxgl-app.gyp @@ -77,7 +77,7 @@ '../common/ca-bundle.crt', '../styles/styles' ], - 'destination': '<(pwd)/java/lib/src/main/assets' + 'destination': '<(pwd)/java/MapboxGLAndroidSDK/src/main/assets' }, ], @@ -85,7 +85,7 @@ { 'action_name': 'Strip dynamic library', 'inputs': [ '<(PRODUCT_DIR)/lib.target/libmapbox-gl.so' ], - 'outputs': [ '<(pwd)/java/lib/src/main/jniLibs/$(JNIDIR)/libmapbox-gl.so' ], + 'outputs': [ '<(pwd)/java/MapboxGLAndroidSDK/src/main/jniLibs/$(JNIDIR)/libmapbox-gl.so' ], 'action': [ '$(STRIP)', '<@(_inputs)', '-o', '<@(_outputs)' ] }, ], From de49ab51d38e40cd0d7c8f0261738f6c3dd0b7cc Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 14:32:16 -0800 Subject: [PATCH 13/19] #826 - Fixing checkstyle exclusions --- android/java/MapboxGLAndroidSDK/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/java/MapboxGLAndroidSDK/build.gradle b/android/java/MapboxGLAndroidSDK/build.gradle index 5b183603a..3e1f4f7ba 100644 --- a/android/java/MapboxGLAndroidSDK/build.gradle +++ b/android/java/MapboxGLAndroidSDK/build.gradle @@ -103,8 +103,7 @@ android.libraryVariants.all { variant -> checkstyle.classpath = project.fileTree(variant.javaCompile.destinationDir) checkstyle.exclude('**/BuildConfig.java') checkstyle.exclude('**/R.java') - checkstyle.exclude('**/uk/co/senab/bitmapcache/*') - checkstyle.exclude('**/com/cocoahero/android/geojson/**') + checkstyle.exclude('**/com/almeros/android/multitouch/**') project.tasks.getByName("check").dependsOn checkstyle } From dd87c34eacaea5376b24c3824dd557ec22aad5da Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 14:45:15 -0800 Subject: [PATCH 14/19] #826 - Fixing rawDir creation functionality --- android/java/MapboxGLAndroidSDKTestApp/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle index 564b94bbf..7427a5b60 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle +++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle @@ -13,8 +13,8 @@ apply plugin: 'com.android.application' apply plugin: 'checkstyle' task accessToken { -// def rawDir = new File("app/src/main/res/raw") -// rawDir.mkdirs() + def rawDir = new File("MapboxGLAndroidSDKTestApp/src/main/res/raw") + rawDir.mkdirs() def tokenFile = new File("MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt") if (!tokenFile.exists()) { String token = System.getenv('MAPBOX_ACCESS_TOKEN') From 83942df08b31ac696c9e857496a022c419789764 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 14:50:18 -0800 Subject: [PATCH 15/19] #826 - Checkstyle issues --- .../java/com/mapbox/mapboxgl/lib/LonLat.java | 9 +- .../com/mapbox/mapboxgl/lib/LonLatZoom.java | 9 +- .../java/com/mapbox/mapboxgl/lib/MapView.java | 341 +++++++++--------- .../src/main/res/raw/token.txt | 1 - 4 files changed, 183 insertions(+), 177 deletions(-) delete mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java index a36548fe3..accc71732 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java @@ -58,12 +58,15 @@ public class LonLat implements Parcelable { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } LonLat other = (LonLat) obj; return Double.doubleToLongBits(lat) == Double.doubleToLongBits(other.lat) && Double.doubleToLongBits(lon) == Double.doubleToLongBits(other.lon); } diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java index fd78e9356..7b379863e 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java @@ -52,12 +52,15 @@ public class LonLatZoom extends LonLat implements Parcelable { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } LonLatZoom other = (LonLatZoom) obj; return super.equals(obj) && Double.doubleToLongBits(zoom) == Double.doubleToLongBits(other.zoom); } diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/MapView.java index 4c51df654..05a24fd64 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/MapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/MapView.java @@ -24,7 +24,6 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.View; import android.view.ViewConfiguration; -import android.widget.ArrayAdapter; import android.widget.ZoomButtonsController; import com.almeros.android.multitouch.gesturedetectors.RotateGestureDetector; @@ -225,7 +224,7 @@ public class MapView extends SurfaceView { } public void setCenterCoordinate(LonLatZoom centerCoordinate, - boolean animated) { + boolean animated) { long duration = animated ? ANIMATION_DURATION : 0; mNativeMapView.setLonLatZoom(centerCoordinate, duration); } @@ -233,10 +232,12 @@ public class MapView extends SurfaceView { public double getDirection() { double direction = -mNativeMapView.getBearing(); - while (direction > 360) + while (direction > 360) { direction -= 360; - while (direction < 0) + } + while (direction < 0) { direction += 360; + } return direction; } @@ -513,7 +514,7 @@ public class MapView extends SurfaceView { // Must handle window resizing here. @Override public void surfaceChanged(SurfaceHolder holder, int format, int width, - int height) { + int height) { Log.v(TAG, "surfaceChanged"); Log.i(TAG, "resize " + format + " " + width + " " + height); mNativeMapView.resize((int) (width / mScreenDensity), (int) (height / mScreenDensity), mScreenDensity, width, height); @@ -588,38 +589,38 @@ public class MapView extends SurfaceView { // Handle two finger tap switch (event.getActionMasked()) { - case MotionEvent.ACTION_DOWN: - // First pointer down - break; + case MotionEvent.ACTION_DOWN: + // First pointer down + break; - case MotionEvent.ACTION_POINTER_DOWN: - // Second pointer down - mTwoTap = event.getPointerCount() == 2; - break; + case MotionEvent.ACTION_POINTER_DOWN: + // Second pointer down + mTwoTap = event.getPointerCount() == 2; + break; - case MotionEvent.ACTION_POINTER_UP: - // Second pointer up - break; + case MotionEvent.ACTION_POINTER_UP: + // Second pointer up + break; - case MotionEvent.ACTION_UP: - // First pointer up - long tapInterval = event.getEventTime() - event.getDownTime(); - boolean isTap = tapInterval <= ViewConfiguration.getTapTimeout(); - boolean inProgress = mRotateGestureDetector.isInProgress() || mScaleGestureDetector.isInProgress(); + case MotionEvent.ACTION_UP: + // First pointer up + long tapInterval = event.getEventTime() - event.getDownTime(); + boolean isTap = tapInterval <= ViewConfiguration.getTapTimeout(); + boolean inProgress = mRotateGestureDetector.isInProgress() || mScaleGestureDetector.isInProgress(); + + if (mTwoTap && isTap && !inProgress) { + PointF focalPoint = TwoFingerGestureDetector.determineFocalPoint(event); + zoom(false, focalPoint.x, focalPoint.y); + mTwoTap = false; + return true; + } - if (mTwoTap && isTap && !inProgress) { - PointF focalPoint = TwoFingerGestureDetector.determineFocalPoint(event); - zoom(false, focalPoint.x, focalPoint.y); mTwoTap = false; - return true; - } + break; - mTwoTap = false; - break; - - case MotionEvent.ACTION_CANCEL: - mTwoTap = false; - break; + case MotionEvent.ACTION_CANCEL: + mTwoTap = false; + break; } boolean retVal = mGestureDetector.onTouchEvent(event); @@ -677,7 +678,7 @@ public class MapView extends SurfaceView { // Called for flings @Override public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, - float velocityY) { + float velocityY) { if (!mScrollEnabled) { return false; } @@ -697,7 +698,7 @@ public class MapView extends SurfaceView { // Cancel any animation mNativeMapView.cancelTransitions(); - mNativeMapView.moveBy(velocityX * duration / 2.0 / mScreenDensity, velocityY * duration / 2.0 / mScreenDensity, (long)(duration * 1000.0f)); + mNativeMapView.moveBy(velocityX * duration / 2.0 / mScreenDensity, velocityY * duration / 2.0 / mScreenDensity, (long) (duration * 1000.0f)); return true; } @@ -712,7 +713,7 @@ public class MapView extends SurfaceView { // Cancel any animation mNativeMapView.cancelTransitions(); // TODO need to test canceling - // transitions with touch + // transitions with touch // Scroll the map mNativeMapView.moveBy(-distanceX / mScreenDensity, -distanceY / mScreenDensity); @@ -885,64 +886,64 @@ public class MapView extends SurfaceView { // Check which key was pressed via hardware/real key code switch (keyCode) { - // Tell the system to track these keys for long presses on - // onKeyLongPress is fired - case KeyEvent.KEYCODE_ENTER: - case KeyEvent.KEYCODE_DPAD_CENTER: - event.startTracking(); - return true; + // Tell the system to track these keys for long presses on + // onKeyLongPress is fired + case KeyEvent.KEYCODE_ENTER: + case KeyEvent.KEYCODE_DPAD_CENTER: + event.startTracking(); + return true; - case KeyEvent.KEYCODE_DPAD_LEFT: - if (!mScrollEnabled) { - return false; - } + case KeyEvent.KEYCODE_DPAD_LEFT: + if (!mScrollEnabled) { + return false; + } - // Cancel any animation - mNativeMapView.cancelTransitions(); + // Cancel any animation + mNativeMapView.cancelTransitions(); - // Move left - mNativeMapView.moveBy(scrollDist / mScreenDensity, 0.0 / mScreenDensity); - return true; + // Move left + mNativeMapView.moveBy(scrollDist / mScreenDensity, 0.0 / mScreenDensity); + return true; - case KeyEvent.KEYCODE_DPAD_RIGHT: - if (!mScrollEnabled) { - return false; - } + case KeyEvent.KEYCODE_DPAD_RIGHT: + if (!mScrollEnabled) { + return false; + } - // Cancel any animation - mNativeMapView.cancelTransitions(); + // Cancel any animation + mNativeMapView.cancelTransitions(); - // Move right - mNativeMapView.moveBy(-scrollDist / mScreenDensity, 0.0 / mScreenDensity); - return true; + // Move right + mNativeMapView.moveBy(-scrollDist / mScreenDensity, 0.0 / mScreenDensity); + return true; - case KeyEvent.KEYCODE_DPAD_UP: - if (!mScrollEnabled) { - return false; - } + case KeyEvent.KEYCODE_DPAD_UP: + if (!mScrollEnabled) { + return false; + } - // Cancel any animation - mNativeMapView.cancelTransitions(); + // Cancel any animation + mNativeMapView.cancelTransitions(); - // Move up - mNativeMapView.moveBy(0.0 / mScreenDensity, scrollDist / mScreenDensity); - return true; + // Move up + mNativeMapView.moveBy(0.0 / mScreenDensity, scrollDist / mScreenDensity); + return true; - case KeyEvent.KEYCODE_DPAD_DOWN: - if (!mScrollEnabled) { - return false; - } + case KeyEvent.KEYCODE_DPAD_DOWN: + if (!mScrollEnabled) { + return false; + } - // Cancel any animation - mNativeMapView.cancelTransitions(); + // Cancel any animation + mNativeMapView.cancelTransitions(); - // Move down - mNativeMapView.moveBy(0.0 / mScreenDensity, -scrollDist / mScreenDensity); - return true; + // Move down + mNativeMapView.moveBy(0.0 / mScreenDensity, -scrollDist / mScreenDensity); + return true; - default: - // We are not interested in this key - return super.onKeyUp(keyCode, event); + default: + // We are not interested in this key + return super.onKeyUp(keyCode, event); } } @@ -951,21 +952,21 @@ public class MapView extends SurfaceView { public boolean onKeyLongPress(int keyCode, KeyEvent event) { // Check which key was pressed via hardware/real key code switch (keyCode) { - // Tell the system to track these keys for long presses on - // onKeyLongPress is fired - case KeyEvent.KEYCODE_ENTER: - case KeyEvent.KEYCODE_DPAD_CENTER: - if (!mZoomEnabled) { - return false; - } + // Tell the system to track these keys for long presses on + // onKeyLongPress is fired + case KeyEvent.KEYCODE_ENTER: + case KeyEvent.KEYCODE_DPAD_CENTER: + if (!mZoomEnabled) { + return false; + } - // Zoom out - zoom(false); - return true; + // Zoom out + zoom(false); + return true; - default: - // We are not interested in this key - return super.onKeyUp(keyCode, event); + default: + // We are not interested in this key + return super.onKeyUp(keyCode, event); } } @@ -983,15 +984,15 @@ public class MapView extends SurfaceView { // Must use the key character map as physical to character is not // fixed/guaranteed switch (keyCode) { - case KeyEvent.KEYCODE_ENTER: - case KeyEvent.KEYCODE_DPAD_CENTER: - if (!mZoomEnabled) { - return false; - } + case KeyEvent.KEYCODE_ENTER: + case KeyEvent.KEYCODE_DPAD_CENTER: + if (!mZoomEnabled) { + return false; + } - // Zoom in - zoom(true); - return true; + // Zoom in + zoom(true); + return true; } // We are not interested in this key @@ -1005,58 +1006,58 @@ public class MapView extends SurfaceView { public boolean onTrackballEvent(MotionEvent event) { // Choose the action switch (event.getActionMasked()) { - // The trackball was rotated - case MotionEvent.ACTION_MOVE: - if (!mScrollEnabled) { - return false; - } + // The trackball was rotated + case MotionEvent.ACTION_MOVE: + if (!mScrollEnabled) { + return false; + } - // Cancel any animation - mNativeMapView.cancelTransitions(); + // Cancel any animation + mNativeMapView.cancelTransitions(); - // Scroll the map - mNativeMapView.moveBy(-10.0 * event.getX() / mScreenDensity, -10.0 * event.getY() / mScreenDensity); - return true; + // Scroll the map + mNativeMapView.moveBy(-10.0 * event.getX() / mScreenDensity, -10.0 * event.getY() / mScreenDensity); + return true; // Trackball was pushed in so start tracking and tell system we are // interested // We will then get the up action - case MotionEvent.ACTION_DOWN: - // Set up a delayed callback to check if trackball is still - // After waiting the system long press time out - if (mCurrentTrackballLongPressTimeOut != null) { - mCurrentTrackballLongPressTimeOut.cancel(); - mCurrentTrackballLongPressTimeOut = null; - } - mCurrentTrackballLongPressTimeOut = new TrackballLongPressTimeOut(); - postDelayed(mCurrentTrackballLongPressTimeOut, - ViewConfiguration.getLongPressTimeout()); - return true; + case MotionEvent.ACTION_DOWN: + // Set up a delayed callback to check if trackball is still + // After waiting the system long press time out + if (mCurrentTrackballLongPressTimeOut != null) { + mCurrentTrackballLongPressTimeOut.cancel(); + mCurrentTrackballLongPressTimeOut = null; + } + mCurrentTrackballLongPressTimeOut = new TrackballLongPressTimeOut(); + postDelayed(mCurrentTrackballLongPressTimeOut, + ViewConfiguration.getLongPressTimeout()); + return true; // Trackball was released - case MotionEvent.ACTION_UP: - if (!mZoomEnabled) { - return false; - } + case MotionEvent.ACTION_UP: + if (!mZoomEnabled) { + return false; + } - // Only handle if we have not already long pressed - if (mCurrentTrackballLongPressTimeOut != null) { - // Zoom in - zoom(true); - } - return true; + // Only handle if we have not already long pressed + if (mCurrentTrackballLongPressTimeOut != null) { + // Zoom in + zoom(true); + } + return true; // Trackball was cancelled - case MotionEvent.ACTION_CANCEL: - if (mCurrentTrackballLongPressTimeOut != null) { - mCurrentTrackballLongPressTimeOut.cancel(); - mCurrentTrackballLongPressTimeOut = null; - } - return true; + case MotionEvent.ACTION_CANCEL: + if (mCurrentTrackballLongPressTimeOut != null) { + mCurrentTrackballLongPressTimeOut.cancel(); + mCurrentTrackballLongPressTimeOut = null; + } + return true; - default: - // We are not interested in this event - return super.onTrackballEvent(event); + default: + // We are not interested in this event + return super.onTrackballEvent(event); } } @@ -1100,26 +1101,26 @@ public class MapView extends SurfaceView { if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) == InputDevice.SOURCE_CLASS_POINTER) { // Choose the action switch (event.getActionMasked()) { - // Mouse scrolls - case MotionEvent.ACTION_SCROLL: - if (!mZoomEnabled) { - return false; - } + // Mouse scrolls + case MotionEvent.ACTION_SCROLL: + if (!mZoomEnabled) { + return false; + } - // Cancel any animation - mNativeMapView.cancelTransitions(); + // Cancel any animation + mNativeMapView.cancelTransitions(); - // Get the vertical scroll amount, one click = 1 - float scrollDist = event.getAxisValue(MotionEvent.AXIS_VSCROLL); + // Get the vertical scroll amount, one click = 1 + float scrollDist = event.getAxisValue(MotionEvent.AXIS_VSCROLL); - // Scale the map by the appropriate power of two factor - mNativeMapView.scaleBy(Math.pow(2.0, scrollDist), event.getX() / mScreenDensity, event.getY() / mScreenDensity); + // Scale the map by the appropriate power of two factor + mNativeMapView.scaleBy(Math.pow(2.0, scrollDist), event.getX() / mScreenDensity, event.getY() / mScreenDensity); - return true; + return true; - default: - // We are not interested in this event - return super.onGenericMotionEvent(event); + default: + // We are not interested in this event + return super.onGenericMotionEvent(event); } } @@ -1132,23 +1133,23 @@ public class MapView extends SurfaceView { @Override public boolean onHoverEvent(@NonNull MotionEvent event) { switch (event.getActionMasked()) { - case MotionEvent.ACTION_HOVER_ENTER: - case MotionEvent.ACTION_HOVER_MOVE: - // Show the zoom controls - if ((mZoomButtonsController != null) && mZoomEnabled) { - mZoomButtonsController.setVisible(true); - } - return true; + case MotionEvent.ACTION_HOVER_ENTER: + case MotionEvent.ACTION_HOVER_MOVE: + // Show the zoom controls + if ((mZoomButtonsController != null) && mZoomEnabled) { + mZoomButtonsController.setVisible(true); + } + return true; - case MotionEvent.ACTION_HOVER_EXIT: - // Hide the zoom controls - if (mZoomButtonsController != null) { - mZoomButtonsController.setVisible(false); - } + case MotionEvent.ACTION_HOVER_EXIT: + // Hide the zoom controls + if (mZoomButtonsController != null) { + mZoomButtonsController.setVisible(false); + } - default: - // We are not interested in this event - return super.onHoverEvent(event); + default: + // We are not interested in this event + return super.onHoverEvent(event); } } diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt deleted file mode 100644 index dd3ef5113..000000000 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt +++ /dev/null @@ -1 +0,0 @@ -pk.eyJ1IjoiYmxlZWdlIiwiYSI6IlhFcHdyMlEifQ.A8U0V-ob2G0RjI_gznrjtg \ No newline at end of file From 8d399895bcdf13cbce57df996ceffd067525534b Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 15:13:32 -0800 Subject: [PATCH 16/19] #826 - Adjusting rawDir path for token so that it gets created in correct location --- android/java/MapboxGLAndroidSDKTestApp/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle index 7427a5b60..c34cd9e56 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle +++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle @@ -13,9 +13,9 @@ apply plugin: 'com.android.application' apply plugin: 'checkstyle' task accessToken { - def rawDir = new File("MapboxGLAndroidSDKTestApp/src/main/res/raw") + def rawDir = new File("src/main/res/raw") rawDir.mkdirs() - def tokenFile = new File("MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt") + def tokenFile = new File("src/main/res/raw/token.txt") if (!tokenFile.exists()) { String token = System.getenv('MAPBOX_ACCESS_TOKEN') if (token == null) { From de5be734f1224208e97a8e6822dec97a2906a248 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 15:33:55 -0800 Subject: [PATCH 17/19] #826 - Adding deploy.sh script --- android/java/MapboxGLAndroidSDK/deploy.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 android/java/MapboxGLAndroidSDK/deploy.sh diff --git a/android/java/MapboxGLAndroidSDK/deploy.sh b/android/java/MapboxGLAndroidSDK/deploy.sh new file mode 100644 index 000000000..c9392201e --- /dev/null +++ b/android/java/MapboxGLAndroidSDK/deploy.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +../gradlew -b build.gradle clean assembleRelease uploadArchives From 4f42183ad0837dd85cbfcb16143dc400ebeec3e2 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 16:26:00 -0800 Subject: [PATCH 18/19] #826 - Using Gradle flavored environment variable access method --- android/java/MapboxGLAndroidSDKTestApp/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle index c34cd9e56..46c3a8d63 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle +++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle @@ -13,11 +13,11 @@ apply plugin: 'com.android.application' apply plugin: 'checkstyle' task accessToken { - def rawDir = new File("src/main/res/raw") + def rawDir = new File("MapboxGLAndroidSDKTestApp/src/main/res/raw") rawDir.mkdirs() - def tokenFile = new File("src/main/res/raw/token.txt") + def tokenFile = new File("MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt") if (!tokenFile.exists()) { - String token = System.getenv('MAPBOX_ACCESS_TOKEN') + String token = "$System.env.MAPBOX_ACCESS_TOKEN" if (token == null) { throw new InvalidUserDataException("You must set the MAPBOX_ACCESS_TOKEN environment variable.") } From 7b4111ef3913f73b8ac33082273d6acb3f426b83 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 10 Feb 2015 16:34:25 -0800 Subject: [PATCH 19/19] #826 - Adding Gradle task cleanJNIBuilds() to clean up previous Mason builds --- android/java/MapboxGLAndroidSDK/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android/java/MapboxGLAndroidSDK/build.gradle b/android/java/MapboxGLAndroidSDK/build.gradle index 3e1f4f7ba..16db9380e 100644 --- a/android/java/MapboxGLAndroidSDK/build.gradle +++ b/android/java/MapboxGLAndroidSDK/build.gradle @@ -95,6 +95,11 @@ checkstyle { showViolations true } +task cleanJNIBuilds { + def jniLibsDir = new File("MapboxGLAndroidSDK/src/main/jniLibs") + delete jniLibsDir.absolutePath +} + android.libraryVariants.all { variant -> def name = variant.buildType.name def checkstyle = project.tasks.create "checkstyle${name.capitalize()}", Checkstyle