diff options
author | Leith Bade <leith@mapbox.com> | 2015-02-16 16:46:15 -0800 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2015-02-19 14:28:49 -0800 |
commit | 921309730b4e6cfbafb70d850b85f3010b5b265c (patch) | |
tree | 1ee2af3b8a588cc6c45979d21bd6b89d87f897b1 /android/java | |
parent | 5c79baedf933e7a3d90cbad541deee294f5ed6ed (diff) | |
download | qtlocation-mapboxgl-921309730b4e6cfbafb70d850b85f3010b5b265c.tar.gz |
Rename packages. Add GPS arrow.
Diffstat (limited to 'android/java')
31 files changed, 34 insertions, 34 deletions
diff --git a/android/java/MapboxGLAndroidSDK/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDK/src/main/AndroidManifest.xml index 7c7dac9a01..dea0f1e763 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/AndroidManifest.xml +++ b/android/java/MapboxGLAndroidSDK/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.mapbox.mapboxgl.lib"> + package="com.mapbox.mapboxgl.views"> <uses-feature android:glEsVersion="0x00020000" android:required="true" /> diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/constants/GeoConstants.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/GeoConstants.java index fff665b5a1..4c899d2d8b 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/constants/GeoConstants.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/GeoConstants.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.lib.constants; +package com.mapbox.mapboxgl.constants; public class GeoConstants { // http://en.wikipedia.org/wiki/Earth_radius#Equatorial_radius diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/constants/MathConstants.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/MathConstants.java index cd11523605..71e235c918 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/constants/MathConstants.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/MathConstants.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.lib.constants; +package com.mapbox.mapboxgl.constants; public class MathConstants { public static final double DEG2RAD = (Math.PI / 180.0); diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/BoundingBox.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/BoundingBox.java index ba60701b82..cb0409d3e9 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/BoundingBox.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/BoundingBox.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.lib.geometry; +package com.mapbox.mapboxgl.geometry; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/CoordinateRegion.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/CoordinateRegion.java index b5c5f66ba8..c7f63e7902 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/CoordinateRegion.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/CoordinateRegion.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.lib.geometry; +package com.mapbox.mapboxgl.geometry; /** * Implementation of iOS MKCoordinateRegion diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/CoordinateSpan.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/CoordinateSpan.java index b79fb7c42d..b673f83f72 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/CoordinateSpan.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/CoordinateSpan.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.lib.geometry; +package com.mapbox.mapboxgl.geometry; /** * Implementation of iOS MKCoordinateSpan diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/ILatLng.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/ILatLng.java index c22a8ae396..620676d83b 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/ILatLng.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/ILatLng.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.lib.geometry; +package com.mapbox.mapboxgl.geometry; /** * A Latitude, Longitude point. diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/IProjectedMeters.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/IProjectedMeters.java index 398f368b3f..99f4fdec3b 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/IProjectedMeters.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/IProjectedMeters.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.lib.geometry; +package com.mapbox.mapboxgl.geometry; public interface IProjectedMeters { double getNorthing(); diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/LatLng.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLng.java index de97b57515..9b0991b082 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/LatLng.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLng.java @@ -1,11 +1,11 @@ -package com.mapbox.mapboxgl.lib.geometry; +package com.mapbox.mapboxgl.geometry; import android.location.Location; import android.os.Parcel; import android.os.Parcelable; -import com.mapbox.mapboxgl.lib.constants.GeoConstants; -import com.mapbox.mapboxgl.lib.constants.MathConstants; +import com.mapbox.mapboxgl.constants.GeoConstants; +import com.mapbox.mapboxgl.constants.MathConstants; import java.io.Serializable; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/LatLngZoom.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLngZoom.java index bd8a214e2b..f1d2862b24 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/LatLngZoom.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLngZoom.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.lib.geometry; +package com.mapbox.mapboxgl.geometry; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/ProjectedMeters.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/ProjectedMeters.java index 9bab088d12..d28d868876 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/geometry/ProjectedMeters.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/ProjectedMeters.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.lib.geometry; +package com.mapbox.mapboxgl.geometry; import android.os.Parcel; import android.os.Parcelable; 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/views/MapView.java index b9545dc33e..2fc3022236 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/MapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.lib; +package com.mapbox.mapboxgl.views; import android.annotation.TargetApi; import android.content.BroadcastReceiver; @@ -29,8 +29,8 @@ import android.widget.ZoomButtonsController; import com.almeros.android.multitouch.gesturedetectors.RotateGestureDetector; import com.almeros.android.multitouch.gesturedetectors.TwoFingerGestureDetector; -import com.mapbox.mapboxgl.lib.geometry.LatLng; -import com.mapbox.mapboxgl.lib.geometry.LatLngZoom; +import com.mapbox.mapboxgl.geometry.LatLng; +import com.mapbox.mapboxgl.geometry.LatLngZoom; import org.apache.commons.validator.routines.UrlValidator; @@ -777,7 +777,7 @@ public class MapView extends SurfaceView { } // TODO complex decision between rotate or scale or both (see Google - // Maps app) + // Maps testapp) // Cancel any animation mNativeMapView.cancelTransitions(); @@ -842,7 +842,7 @@ public class MapView extends SurfaceView { } // TODO complex decision between rotate or scale or both (see Google - // Maps app). It seems if you start one or the other it takes more + // Maps testapp). It seems if you start one or the other it takes more // to start the other too. Haven't figured out what it uses to // decide when to transition to both at the same time. diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java index 3059c0bfa4..96321d8432 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java @@ -1,11 +1,11 @@ -package com.mapbox.mapboxgl.lib; +package com.mapbox.mapboxgl.views; import android.graphics.PointF; import android.view.Surface; -import com.mapbox.mapboxgl.lib.geometry.LatLng; -import com.mapbox.mapboxgl.lib.geometry.LatLngZoom; -import com.mapbox.mapboxgl.lib.geometry.ProjectedMeters; +import com.mapbox.mapboxgl.geometry.LatLng; +import com.mapbox.mapboxgl.geometry.LatLngZoom; +import com.mapbox.mapboxgl.geometry.ProjectedMeters; import java.util.List; diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle index 46c3a8d632..2006dc1ff3 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle +++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle @@ -38,7 +38,7 @@ android { } defaultConfig { - applicationId "com.mapbox.mapboxgl.app" + applicationId "com.mapbox.mapboxgl.testapp" minSdkVersion 14 targetSdkVersion 21 versionCode 4 diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml index deee959d77..92c69783ab 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/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.mapbox.mapboxgl.app"> + package="com.mapbox.mapboxgl.testapp"> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> @@ -12,7 +12,7 @@ android:theme="@style/AppTheme" android:supportsRtl="true"> <activity - android:name="com.mapbox.mapboxgl.app.MainActivity" + android:name="com.mapbox.mapboxgl.testapp.MainActivity" android:label="@string/app_name"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java index bb8a6bacc6..5e33665197 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.app; +package com.mapbox.mapboxgl.testapp; import android.location.Location; import android.os.Bundle; @@ -15,8 +15,8 @@ import android.widget.ImageView; import android.widget.Spinner; import android.widget.TextView; -import com.mapbox.mapboxgl.lib.geometry.LatLngZoom; -import com.mapbox.mapboxgl.lib.MapView; +import com.mapbox.mapboxgl.geometry.LatLngZoom; +import com.mapbox.mapboxgl.views.MapView; import com.mapzen.android.lost.LocationClient; import com.mapzen.android.lost.LocationListener; import com.mapzen.android.lost.LocationRequest; @@ -125,7 +125,7 @@ public class MainActivity extends ActionBarActivity { }); } - // Called when our app goes into the background + // Called when our testapp goes into the background @Override public void onPause() { super.onPause(); @@ -137,7 +137,7 @@ public class MainActivity extends ActionBarActivity { } } - // Called when our app comes into the foreground + // Called when our testapp comes into the foreground @Override public void onResume() { super.onResume(); diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MapFragment.java index 0249dab293..b78926b9e1 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MapFragment.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.app; +package com.mapbox.mapboxgl.testapp; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -7,7 +7,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.mapbox.mapboxgl.lib.MapView; +import com.mapbox.mapboxgl.views.MapView; import java.io.BufferedReader; import java.io.IOException; diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/direction_arrow.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/direction_arrow.png Binary files differnew file mode 100644 index 0000000000..379ac4fb16 --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/direction_arrow.png diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/location_marker.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/location_marker.png Binary files differnew file mode 100644 index 0000000000..f3a57845b7 --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/location_marker.png diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-ldpi/direction_arrow.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-ldpi/direction_arrow.png Binary files differnew file mode 100644 index 0000000000..292d2c5dfa --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-ldpi/direction_arrow.png diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-ldpi/location_marker.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-ldpi/location_marker.png Binary files differnew file mode 100644 index 0000000000..94a7837817 --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-ldpi/location_marker.png diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/direction_arrow.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/direction_arrow.png Binary files differnew file mode 100644 index 0000000000..c0101b8a69 --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/direction_arrow.png diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/location_marker.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/location_marker.png Binary files differnew file mode 100644 index 0000000000..d8c1563880 --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/location_marker.png diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/direction_arrow.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/direction_arrow.png Binary files differnew file mode 100644 index 0000000000..5227caf44b --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/direction_arrow.png diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/location_marker.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/location_marker.png Binary files differnew file mode 100644 index 0000000000..157c48adea --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/location_marker.png diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/direction_arrow.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/direction_arrow.png Binary files differnew file mode 100644 index 0000000000..760edd4390 --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/direction_arrow.png diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/location_marker.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/location_marker.png Binary files differnew file mode 100644 index 0000000000..ccc56f6601 --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/location_marker.png diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/direction_arrow.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/direction_arrow.png Binary files differnew file mode 100644 index 0000000000..8e3c598195 --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/direction_arrow.png diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/location_marker.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/location_marker.png Binary files differnew file mode 100644 index 0000000000..2318f1b7cc --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/location_marker.png diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml index 5376ee2d24..49eb6fdeab 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml @@ -29,7 +29,7 @@ android:orientation="vertical"> <fragment - android:name="com.mapbox.mapboxgl.app.MapFragment" + android:name="com.mapbox.mapboxgl.testapp.MapFragment" android:id="@+id/fragment_map" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml index 311242472a..8745bd68e2 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<com.mapbox.mapboxgl.lib.MapView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" +<com.mapbox.mapboxgl.views.MapView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" /> |