summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2019-07-10 20:38:44 +0200
committerTobrun <tobrun.van.nuland@gmail.com>2019-07-10 20:38:44 +0200
commitbe5fb64899b71ee2be6ca3a338bea953fff43ea3 (patch)
tree9271bdb93b719a5675c7ee0147703dadb87cfea0
parenta2115c086f40007aca016cef5f5c99284728fa17 (diff)
downloadqtlocation-mapboxgl-be5fb64899b71ee2be6ca3a338bea953fff43ea3.tar.gz
fixup build
-rw-r--r--mapbox/build.gradle2
-rw-r--r--mapbox/src/main/AndroidManifest.xml2
-rw-r--r--mapbox/src/main/java/com/example/mapbox/MainActivity.kt6
-rw-r--r--mapbox/src/main/java/com/example/mapbox/MainActivityModule.kt2
-rw-r--r--mapbox/src/main/java/com/example/mapbox/MapboxApp.kt2
-rw-r--r--mapbox/src/main/java/com/example/mapbox/breadcrumb/Breadcrumb.kt4
-rw-r--r--mapbox/src/main/java/com/example/mapbox/breadcrumb/ExerciseEngineState.kt2
-rw-r--r--mapbox/src/main/java/com/example/mapbox/compass/WassCompassEngine.kt2
-rw-r--r--mapbox/src/main/java/com/example/mapbox/di/AppComponent.kt4
-rw-r--r--mapbox/src/main/java/com/example/mapbox/extensions/AnnotationsExtensions.kt4
-rw-r--r--mapbox/src/main/java/com/example/mapbox/extensions/LocationExtensions.kt2
-rw-r--r--mapbox/src/main/java/com/example/mapbox/extensions/ResourceExtensions.kt2
-rw-r--r--mapbox/src/main/java/com/example/mapbox/livedata/HeadingSensorLiveData.kt4
-rw-r--r--mapbox/src/main/java/com/example/mapbox/livedata/LocationWithHeadingLiveData.kt2
-rw-r--r--mapbox/src/main/java/com/example/mapbox/livedata/MapViewSensors.kt4
-rw-r--r--mapbox/src/main/java/com/example/mapbox/mockdata/MockHeadingSensor.kt2
-rw-r--r--mapbox/src/main/java/com/example/mapbox/ui/MapboxMapView.kt10
-rw-r--r--mapbox/src/main/java/com/example/mapbox/ui/extensions/ConstraintLayoutExtensions.kt2
-rw-r--r--platform/android/build.gradle3
-rw-r--r--platform/android/gradle/download-schema.gradle8
-rw-r--r--platform/android/gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--platform/android/wearapp/build.gradle22
-rw-r--r--platform/android/wearapp/gradle.properties2
-rw-r--r--platform/android/wearapp/src/main/AndroidManifest.xml2
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MainActivity.kt6
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MainActivityModule.kt2
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MapboxApp.kt2
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/breadcrumb/Breadcrumb.kt4
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/breadcrumb/ExerciseEngineState.kt2
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/compass/WassCompassEngine.kt2
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/di/AppComponent.kt4
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/AnnotationsExtensions.kt4
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/LocationExtensions.kt2
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/ResourceExtensions.kt2
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/HeadingSensorLiveData.kt4
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/LocationWithHeadingLiveData.kt2
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/MapViewSensors.kt4
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/mockdata/MockHeadingSensor.kt2
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/ui/MapboxMapView.kt10
-rw-r--r--platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/ui/extensions/ConstraintLayoutExtensions.kt2
40 files changed, 79 insertions, 72 deletions
diff --git a/mapbox/build.gradle b/mapbox/build.gradle
index 1b6bc62678..34d919a3c4 100644
--- a/mapbox/build.gradle
+++ b/mapbox/build.gradle
@@ -5,7 +5,7 @@ android {
buildToolsVersion "29.0.0"
defaultConfig {
- applicationId "com.example.mapbox"
+ applicationId "com.mapbox.mapboxsdk.wearapp"
minSdkVersion 23
targetSdkVersion 28
versionCode 1
diff --git a/mapbox/src/main/AndroidManifest.xml b/mapbox/src/main/AndroidManifest.xml
index 82f7d7fe8c..1c663a66a9 100644
--- a/mapbox/src/main/AndroidManifest.xml
+++ b/mapbox/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.mapbox">
+ package="com.mapbox.mapboxsdk.wearapp">
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/mapbox/src/main/java/com/example/mapbox/MainActivity.kt b/mapbox/src/main/java/com/example/mapbox/MainActivity.kt
index 90e76a1f48..5c8ae8e22a 100644
--- a/mapbox/src/main/java/com/example/mapbox/MainActivity.kt
+++ b/mapbox/src/main/java/com/example/mapbox/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox
+package com.mapbox.mapboxsdk.wearapp
import android.annotation.SuppressLint
import android.location.Location
@@ -9,8 +9,8 @@ import android.support.wearable.activity.WearableActivity
import android.util.Log
import android.widget.Toast
import androidx.lifecycle.Observer
-import com.example.mapbox.ui.MapboxMapView
-import com.example.mapbox.ui.extensions.addViewAndMatchItToParent
+import com.mapbox.mapboxsdk.wearapp.ui.MapboxMapView
+import com.mapbox.mapboxsdk.wearapp.ui.extensions.addViewAndMatchItToParent
import com.mapbox.android.core.permissions.PermissionsListener
import com.mapbox.android.core.permissions.PermissionsManager
import com.mapbox.mapboxsdk.Mapbox
diff --git a/mapbox/src/main/java/com/example/mapbox/MainActivityModule.kt b/mapbox/src/main/java/com/example/mapbox/MainActivityModule.kt
index eec66ebee3..d10aad04fe 100644
--- a/mapbox/src/main/java/com/example/mapbox/MainActivityModule.kt
+++ b/mapbox/src/main/java/com/example/mapbox/MainActivityModule.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox
+package com.mapbox.mapboxsdk.wearapp
import dagger.Module
import dagger.android.ContributesAndroidInjector
diff --git a/mapbox/src/main/java/com/example/mapbox/MapboxApp.kt b/mapbox/src/main/java/com/example/mapbox/MapboxApp.kt
index ded4931802..901ef91c5e 100644
--- a/mapbox/src/main/java/com/example/mapbox/MapboxApp.kt
+++ b/mapbox/src/main/java/com/example/mapbox/MapboxApp.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox
+package com.mapbox.mapboxsdk.wearapp
import dagger.android.AndroidInjector
import dagger.android.DaggerApplication
diff --git a/mapbox/src/main/java/com/example/mapbox/breadcrumb/Breadcrumb.kt b/mapbox/src/main/java/com/example/mapbox/breadcrumb/Breadcrumb.kt
index af27cc36b6..6625cf94bb 100644
--- a/mapbox/src/main/java/com/example/mapbox/breadcrumb/Breadcrumb.kt
+++ b/mapbox/src/main/java/com/example/mapbox/breadcrumb/Breadcrumb.kt
@@ -1,8 +1,8 @@
package com.soy.android.maps.breadcrumb
import android.content.res.Resources
-import com.example.mapbox.breadcrumb.ExerciseEngineState
-import com.example.mapbox.ui.MapboxMapView
+import com.mapbox.mapboxsdk.wearapp.breadcrumb.ExerciseEngineState
+import com.mapbox.mapboxsdk.wearapp.ui.MapboxMapView
import com.mapbox.mapboxsdk.geometry.LatLng
import com.mapbox.mapboxsdk.location.OnLocationStaleListener
import com.mapbox.mapboxsdk.maps.MapboxMap
diff --git a/mapbox/src/main/java/com/example/mapbox/breadcrumb/ExerciseEngineState.kt b/mapbox/src/main/java/com/example/mapbox/breadcrumb/ExerciseEngineState.kt
index 1d78bb7035..3032504e0a 100644
--- a/mapbox/src/main/java/com/example/mapbox/breadcrumb/ExerciseEngineState.kt
+++ b/mapbox/src/main/java/com/example/mapbox/breadcrumb/ExerciseEngineState.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.breadcrumb
+package com.mapbox.mapboxsdk.wearapp.breadcrumb
enum class ExerciseEngineState {
Paused,
diff --git a/mapbox/src/main/java/com/example/mapbox/compass/WassCompassEngine.kt b/mapbox/src/main/java/com/example/mapbox/compass/WassCompassEngine.kt
index 6795ea68c4..9f29a58e5f 100644
--- a/mapbox/src/main/java/com/example/mapbox/compass/WassCompassEngine.kt
+++ b/mapbox/src/main/java/com/example/mapbox/compass/WassCompassEngine.kt
@@ -2,7 +2,7 @@ package com.soy.android.maps.compass
import android.hardware.SensorManager.SENSOR_STATUS_ACCURACY_HIGH
import androidx.lifecycle.Observer
-import com.example.mapbox.livedata.HeadingSensorLiveData
+import com.mapbox.mapboxsdk.wearapp.livedata.HeadingSensorLiveData
import com.mapbox.mapboxsdk.location.CompassEngine
import com.mapbox.mapboxsdk.location.CompassListener
diff --git a/mapbox/src/main/java/com/example/mapbox/di/AppComponent.kt b/mapbox/src/main/java/com/example/mapbox/di/AppComponent.kt
index 039ca746c0..bde4b73b7d 100644
--- a/mapbox/src/main/java/com/example/mapbox/di/AppComponent.kt
+++ b/mapbox/src/main/java/com/example/mapbox/di/AppComponent.kt
@@ -1,5 +1,5 @@
-import com.example.mapbox.MainActivityModule
-import com.example.mapbox.MapboxApp
+import com.mapbox.mapboxsdk.wearapp.MainActivityModule
+import com.mapbox.mapboxsdk.wearapp.MapboxApp
import dagger.Component
import dagger.android.AndroidInjector
import dagger.android.support.AndroidSupportInjectionModule
diff --git a/mapbox/src/main/java/com/example/mapbox/extensions/AnnotationsExtensions.kt b/mapbox/src/main/java/com/example/mapbox/extensions/AnnotationsExtensions.kt
index be4f09d9ff..ce7c63c920 100644
--- a/mapbox/src/main/java/com/example/mapbox/extensions/AnnotationsExtensions.kt
+++ b/mapbox/src/main/java/com/example/mapbox/extensions/AnnotationsExtensions.kt
@@ -1,7 +1,7 @@
package com.soy.android.maps.breadcrumb
-import com.example.mapbox.ui.PAUSE_LINE_PATTERN
-import com.example.mapbox.ui.START_SYMBOL_ICON_ID
+import com.mapbox.mapboxsdk.wearapp.ui.PAUSE_LINE_PATTERN
+import com.mapbox.mapboxsdk.wearapp.ui.START_SYMBOL_ICON_ID
import com.mapbox.mapboxsdk.geometry.LatLng
import com.mapbox.mapboxsdk.plugins.annotation.*
import com.mapbox.mapboxsdk.style.layers.Property
diff --git a/mapbox/src/main/java/com/example/mapbox/extensions/LocationExtensions.kt b/mapbox/src/main/java/com/example/mapbox/extensions/LocationExtensions.kt
index 67bebf7504..98b7694a35 100644
--- a/mapbox/src/main/java/com/example/mapbox/extensions/LocationExtensions.kt
+++ b/mapbox/src/main/java/com/example/mapbox/extensions/LocationExtensions.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.extensions
+package com.mapbox.mapboxsdk.wearapp.extensions
import android.location.Location
import com.mapbox.mapboxsdk.geometry.LatLng
diff --git a/mapbox/src/main/java/com/example/mapbox/extensions/ResourceExtensions.kt b/mapbox/src/main/java/com/example/mapbox/extensions/ResourceExtensions.kt
index 785ed32840..db014edaf4 100644
--- a/mapbox/src/main/java/com/example/mapbox/extensions/ResourceExtensions.kt
+++ b/mapbox/src/main/java/com/example/mapbox/extensions/ResourceExtensions.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.extensions
+package com.mapbox.mapboxsdk.wearapp.extensions
import android.content.res.Resources
import android.graphics.Bitmap
diff --git a/mapbox/src/main/java/com/example/mapbox/livedata/HeadingSensorLiveData.kt b/mapbox/src/main/java/com/example/mapbox/livedata/HeadingSensorLiveData.kt
index 4acbfb754a..d896db8ac2 100644
--- a/mapbox/src/main/java/com/example/mapbox/livedata/HeadingSensorLiveData.kt
+++ b/mapbox/src/main/java/com/example/mapbox/livedata/HeadingSensorLiveData.kt
@@ -1,7 +1,7 @@
-package com.example.mapbox.livedata
+package com.mapbox.mapboxsdk.wearapp.livedata
import androidx.lifecycle.LiveData
-import com.example.mapbox.mockdata.MockHeadingSensor
+import com.mapbox.mapboxsdk.wearapp.mockdata.MockHeadingSensor
import kotlinx.coroutines.*
import javax.inject.Inject
diff --git a/mapbox/src/main/java/com/example/mapbox/livedata/LocationWithHeadingLiveData.kt b/mapbox/src/main/java/com/example/mapbox/livedata/LocationWithHeadingLiveData.kt
index 2d09e9bfd5..fe72bd56a0 100644
--- a/mapbox/src/main/java/com/example/mapbox/livedata/LocationWithHeadingLiveData.kt
+++ b/mapbox/src/main/java/com/example/mapbox/livedata/LocationWithHeadingLiveData.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.livedata
+package com.mapbox.mapboxsdk.wearapp.livedata
import android.location.Location
import androidx.lifecycle.MediatorLiveData
diff --git a/mapbox/src/main/java/com/example/mapbox/livedata/MapViewSensors.kt b/mapbox/src/main/java/com/example/mapbox/livedata/MapViewSensors.kt
index 8b56fff3f6..854cbb266f 100644
--- a/mapbox/src/main/java/com/example/mapbox/livedata/MapViewSensors.kt
+++ b/mapbox/src/main/java/com/example/mapbox/livedata/MapViewSensors.kt
@@ -2,8 +2,8 @@ package com.soy.android.maps.livedata
import android.location.Location
import androidx.lifecycle.Observer
-import com.example.mapbox.livedata.HeadingSensorLiveData
-import com.example.mapbox.livedata.LocationWithHeadingLiveData
+import com.mapbox.mapboxsdk.wearapp.livedata.HeadingSensorLiveData
+import com.mapbox.mapboxsdk.wearapp.livedata.LocationWithHeadingLiveData
import javax.inject.Inject
class MapViewSensors
diff --git a/mapbox/src/main/java/com/example/mapbox/mockdata/MockHeadingSensor.kt b/mapbox/src/main/java/com/example/mapbox/mockdata/MockHeadingSensor.kt
index 9029d89f29..11a969ae8d 100644
--- a/mapbox/src/main/java/com/example/mapbox/mockdata/MockHeadingSensor.kt
+++ b/mapbox/src/main/java/com/example/mapbox/mockdata/MockHeadingSensor.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.mockdata
+package com.mapbox.mapboxsdk.wearapp.mockdata
import javax.inject.Inject
diff --git a/mapbox/src/main/java/com/example/mapbox/ui/MapboxMapView.kt b/mapbox/src/main/java/com/example/mapbox/ui/MapboxMapView.kt
index 04fe3828cc..056369006e 100644
--- a/mapbox/src/main/java/com/example/mapbox/ui/MapboxMapView.kt
+++ b/mapbox/src/main/java/com/example/mapbox/ui/MapboxMapView.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.ui
+package com.mapbox.mapboxsdk.wearapp.ui
import android.annotation.SuppressLint
import android.content.Context
@@ -7,10 +7,10 @@ import android.location.Location
import android.view.Gravity
import android.view.MotionEvent
import android.view.View
-import com.example.mapbox.R
-import com.example.mapbox.breadcrumb.ExerciseEngineState
-import com.example.mapbox.extensions.getBitmapFromDrawable
-import com.example.mapbox.extensions.latLong
+import com.mapbox.mapboxsdk.wearapp.R
+import com.mapbox.mapboxsdk.wearapp.breadcrumb.ExerciseEngineState
+import com.mapbox.mapboxsdk.wearapp.extensions.getBitmapFromDrawable
+import com.mapbox.mapboxsdk.wearapp.extensions.latLong
import com.mapbox.mapboxsdk.camera.CameraPosition
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
import com.mapbox.mapboxsdk.geometry.LatLng
diff --git a/mapbox/src/main/java/com/example/mapbox/ui/extensions/ConstraintLayoutExtensions.kt b/mapbox/src/main/java/com/example/mapbox/ui/extensions/ConstraintLayoutExtensions.kt
index 84fa569e1b..ecd66ea050 100644
--- a/mapbox/src/main/java/com/example/mapbox/ui/extensions/ConstraintLayoutExtensions.kt
+++ b/mapbox/src/main/java/com/example/mapbox/ui/extensions/ConstraintLayoutExtensions.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.ui.extensions
+package com.mapbox.mapboxsdk.wearapp.ui.extensions
import android.support.constraint.ConstraintLayout
import android.support.constraint.ConstraintSet
diff --git a/platform/android/build.gradle b/platform/android/build.gradle
index 2282cc1fc2..327e5eebec 100644
--- a/platform/android/build.gradle
+++ b/platform/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.4.1'
+ classpath 'com.android.tools.build:gradle:3.4.0'
classpath dependenciesList.licensesPlugin
classpath dependenciesList.kotlinPlugin
classpath dependenciesList.bintrayPlugin
@@ -37,4 +37,3 @@ subprojects {
// Load build system information. If this file does not exist, run
// `make platform/android/gradle/configuration.gradle`
apply from: "${rootDir}/gradle/configuration.gradle"
-apply from: "${rootDir}/gradle/download-schema.gradle"
diff --git a/platform/android/gradle/download-schema.gradle b/platform/android/gradle/download-schema.gradle
deleted file mode 100644
index 3d3beac651..0000000000
--- a/platform/android/gradle/download-schema.gradle
+++ /dev/null
@@ -1,8 +0,0 @@
-task downloadSchema(type: Copy) {
- def address='https://mapbox.s3.amazonaws.com/mapbox-gl-native/event-schema/mobile-event-schemas.jsonl.gz'
- def target='MapboxGLAndroidSDK/src/test/resources/'
-
- new File(target + "${address.tokenize('/')[-1]}").withOutputStream { out ->
- new URL(address).withInputStream { from -> out << from }
- }
-} \ No newline at end of file
diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties
index 588169cdf4..c4af9b9dae 100644
--- a/platform/android/gradle/wrapper/gradle-wrapper.properties
+++ b/platform/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue May 28 09:39:37 CEST 2019
+#Wed Jul 10 20:05:09 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
diff --git a/platform/android/wearapp/build.gradle b/platform/android/wearapp/build.gradle
index 8004b99200..c11ff0cb28 100644
--- a/platform/android/wearapp/build.gradle
+++ b/platform/android/wearapp/build.gradle
@@ -1,6 +1,9 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+
android {
compileSdkVersion 28
buildToolsVersion "29.0.0"
@@ -22,11 +25,26 @@ android {
dependencies {
implementation project(':MapboxGLAndroidSDK')
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
implementation 'com.google.android.support:wearable:2.4.0'
- implementation 'com.google.android.gms:play-services-wearable:17.0.0'
+ implementation 'com.google.android.gms:play-services-wearable:16.0.1'
implementation 'com.android.support:percent:28.0.0'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'com.android.support:wear:28.0.0'
+
+ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v8:0.7.0'
+ compileOnly 'com.google.android.wearable:wearable:2.4.0'
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+ implementation "com.jakewharton.timber:timber:4.7.1"
+ implementation "androidx.lifecycle:lifecycle-livedata:2.0.0"
+ implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1"
+ implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1"
+
+ // Dagger 2
+ kapt "com.google.dagger:dagger-compiler:2.16"
+ kapt "com.google.dagger:dagger-android-processor:2.16"
+ implementation "com.google.dagger:dagger:2.16"
+ implementation "com.google.dagger:dagger-android:2.16"
+ implementation "com.google.dagger:dagger-android-support:2.16"
}
diff --git a/platform/android/wearapp/gradle.properties b/platform/android/wearapp/gradle.properties
index d015431a85..e69de29bb2 100644
--- a/platform/android/wearapp/gradle.properties
+++ b/platform/android/wearapp/gradle.properties
@@ -1,2 +0,0 @@
-android.useAndroidX=true
-android.enableJetifier=true \ No newline at end of file
diff --git a/platform/android/wearapp/src/main/AndroidManifest.xml b/platform/android/wearapp/src/main/AndroidManifest.xml
index 82f7d7fe8c..1c663a66a9 100644
--- a/platform/android/wearapp/src/main/AndroidManifest.xml
+++ b/platform/android/wearapp/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.mapbox">
+ package="com.mapbox.mapboxsdk.wearapp">
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MainActivity.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MainActivity.kt
index 4dd68294e3..5947312fcf 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MainActivity.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox
+package com.mapbox.mapboxsdk.wearapp
import android.annotation.SuppressLint
import android.location.Location
@@ -9,8 +9,8 @@ import android.support.wearable.activity.WearableActivity
import android.util.Log
import android.widget.Toast
import androidx.lifecycle.Observer
-import com.example.mapbox.ui.MapboxMapView
-import com.example.mapbox.ui.extensions.addViewAndMatchItToParent
+import com.mapbox.mapboxsdk.wearapp.ui.MapboxMapView
+import com.mapbox.mapboxsdk.wearapp.ui.extensions.addViewAndMatchItToParent
import com.mapbox.android.core.permissions.PermissionsListener
import com.mapbox.android.core.permissions.PermissionsManager
import com.mapbox.mapboxsdk.Mapbox
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MainActivityModule.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MainActivityModule.kt
index eec66ebee3..d10aad04fe 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MainActivityModule.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MainActivityModule.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox
+package com.mapbox.mapboxsdk.wearapp
import dagger.Module
import dagger.android.ContributesAndroidInjector
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MapboxApp.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MapboxApp.kt
index ded4931802..901ef91c5e 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MapboxApp.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/MapboxApp.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox
+package com.mapbox.mapboxsdk.wearapp
import dagger.android.AndroidInjector
import dagger.android.DaggerApplication
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/breadcrumb/Breadcrumb.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/breadcrumb/Breadcrumb.kt
index af27cc36b6..6625cf94bb 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/breadcrumb/Breadcrumb.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/breadcrumb/Breadcrumb.kt
@@ -1,8 +1,8 @@
package com.soy.android.maps.breadcrumb
import android.content.res.Resources
-import com.example.mapbox.breadcrumb.ExerciseEngineState
-import com.example.mapbox.ui.MapboxMapView
+import com.mapbox.mapboxsdk.wearapp.breadcrumb.ExerciseEngineState
+import com.mapbox.mapboxsdk.wearapp.ui.MapboxMapView
import com.mapbox.mapboxsdk.geometry.LatLng
import com.mapbox.mapboxsdk.location.OnLocationStaleListener
import com.mapbox.mapboxsdk.maps.MapboxMap
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/breadcrumb/ExerciseEngineState.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/breadcrumb/ExerciseEngineState.kt
index 1d78bb7035..3032504e0a 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/breadcrumb/ExerciseEngineState.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/breadcrumb/ExerciseEngineState.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.breadcrumb
+package com.mapbox.mapboxsdk.wearapp.breadcrumb
enum class ExerciseEngineState {
Paused,
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/compass/WassCompassEngine.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/compass/WassCompassEngine.kt
index 6795ea68c4..9f29a58e5f 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/compass/WassCompassEngine.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/compass/WassCompassEngine.kt
@@ -2,7 +2,7 @@ package com.soy.android.maps.compass
import android.hardware.SensorManager.SENSOR_STATUS_ACCURACY_HIGH
import androidx.lifecycle.Observer
-import com.example.mapbox.livedata.HeadingSensorLiveData
+import com.mapbox.mapboxsdk.wearapp.livedata.HeadingSensorLiveData
import com.mapbox.mapboxsdk.location.CompassEngine
import com.mapbox.mapboxsdk.location.CompassListener
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/di/AppComponent.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/di/AppComponent.kt
index 039ca746c0..bde4b73b7d 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/di/AppComponent.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/di/AppComponent.kt
@@ -1,5 +1,5 @@
-import com.example.mapbox.MainActivityModule
-import com.example.mapbox.MapboxApp
+import com.mapbox.mapboxsdk.wearapp.MainActivityModule
+import com.mapbox.mapboxsdk.wearapp.MapboxApp
import dagger.Component
import dagger.android.AndroidInjector
import dagger.android.support.AndroidSupportInjectionModule
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/AnnotationsExtensions.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/AnnotationsExtensions.kt
index be4f09d9ff..ce7c63c920 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/AnnotationsExtensions.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/AnnotationsExtensions.kt
@@ -1,7 +1,7 @@
package com.soy.android.maps.breadcrumb
-import com.example.mapbox.ui.PAUSE_LINE_PATTERN
-import com.example.mapbox.ui.START_SYMBOL_ICON_ID
+import com.mapbox.mapboxsdk.wearapp.ui.PAUSE_LINE_PATTERN
+import com.mapbox.mapboxsdk.wearapp.ui.START_SYMBOL_ICON_ID
import com.mapbox.mapboxsdk.geometry.LatLng
import com.mapbox.mapboxsdk.plugins.annotation.*
import com.mapbox.mapboxsdk.style.layers.Property
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/LocationExtensions.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/LocationExtensions.kt
index 67bebf7504..98b7694a35 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/LocationExtensions.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/LocationExtensions.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.extensions
+package com.mapbox.mapboxsdk.wearapp.extensions
import android.location.Location
import com.mapbox.mapboxsdk.geometry.LatLng
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/ResourceExtensions.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/ResourceExtensions.kt
index 785ed32840..db014edaf4 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/ResourceExtensions.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/extensions/ResourceExtensions.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.extensions
+package com.mapbox.mapboxsdk.wearapp.extensions
import android.content.res.Resources
import android.graphics.Bitmap
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/HeadingSensorLiveData.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/HeadingSensorLiveData.kt
index 4acbfb754a..d896db8ac2 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/HeadingSensorLiveData.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/HeadingSensorLiveData.kt
@@ -1,7 +1,7 @@
-package com.example.mapbox.livedata
+package com.mapbox.mapboxsdk.wearapp.livedata
import androidx.lifecycle.LiveData
-import com.example.mapbox.mockdata.MockHeadingSensor
+import com.mapbox.mapboxsdk.wearapp.mockdata.MockHeadingSensor
import kotlinx.coroutines.*
import javax.inject.Inject
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/LocationWithHeadingLiveData.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/LocationWithHeadingLiveData.kt
index 2d09e9bfd5..fe72bd56a0 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/LocationWithHeadingLiveData.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/LocationWithHeadingLiveData.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.livedata
+package com.mapbox.mapboxsdk.wearapp.livedata
import android.location.Location
import androidx.lifecycle.MediatorLiveData
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/MapViewSensors.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/MapViewSensors.kt
index 8b56fff3f6..854cbb266f 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/MapViewSensors.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/livedata/MapViewSensors.kt
@@ -2,8 +2,8 @@ package com.soy.android.maps.livedata
import android.location.Location
import androidx.lifecycle.Observer
-import com.example.mapbox.livedata.HeadingSensorLiveData
-import com.example.mapbox.livedata.LocationWithHeadingLiveData
+import com.mapbox.mapboxsdk.wearapp.livedata.HeadingSensorLiveData
+import com.mapbox.mapboxsdk.wearapp.livedata.LocationWithHeadingLiveData
import javax.inject.Inject
class MapViewSensors
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/mockdata/MockHeadingSensor.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/mockdata/MockHeadingSensor.kt
index 9029d89f29..11a969ae8d 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/mockdata/MockHeadingSensor.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/mockdata/MockHeadingSensor.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.mockdata
+package com.mapbox.mapboxsdk.wearapp.mockdata
import javax.inject.Inject
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/ui/MapboxMapView.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/ui/MapboxMapView.kt
index 04fe3828cc..056369006e 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/ui/MapboxMapView.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/ui/MapboxMapView.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.ui
+package com.mapbox.mapboxsdk.wearapp.ui
import android.annotation.SuppressLint
import android.content.Context
@@ -7,10 +7,10 @@ import android.location.Location
import android.view.Gravity
import android.view.MotionEvent
import android.view.View
-import com.example.mapbox.R
-import com.example.mapbox.breadcrumb.ExerciseEngineState
-import com.example.mapbox.extensions.getBitmapFromDrawable
-import com.example.mapbox.extensions.latLong
+import com.mapbox.mapboxsdk.wearapp.R
+import com.mapbox.mapboxsdk.wearapp.breadcrumb.ExerciseEngineState
+import com.mapbox.mapboxsdk.wearapp.extensions.getBitmapFromDrawable
+import com.mapbox.mapboxsdk.wearapp.extensions.latLong
import com.mapbox.mapboxsdk.camera.CameraPosition
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
import com.mapbox.mapboxsdk.geometry.LatLng
diff --git a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/ui/extensions/ConstraintLayoutExtensions.kt b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/ui/extensions/ConstraintLayoutExtensions.kt
index 84fa569e1b..ecd66ea050 100644
--- a/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/ui/extensions/ConstraintLayoutExtensions.kt
+++ b/platform/android/wearapp/src/main/java/com/mapbox/mapboxsdk/wearapp/ui/extensions/ConstraintLayoutExtensions.kt
@@ -1,4 +1,4 @@
-package com.example.mapbox.ui.extensions
+package com.mapbox.mapboxsdk.wearapp.ui.extensions
import android.support.constraint.ConstraintLayout
import android.support.constraint.ConstraintSet