Merge pull request #97 from mapbox/4.1.0-release

4.1.0 Release
mapbox · Jun 29, 2016 · 550b23a · 550b23a
2 parents e2a5067 + 65effc6
commit 550b23a
Show file tree

Hide file tree

Showing 18 changed files with 7 additions and 196 deletions.
diff --git a/MapboxAndroidDemo/build.gradle b/MapboxAndroidDemo/build.gradle
@@ -27,7 +27,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 24
         versionCode 27
-        versionName "4.1.0-beta.3"
+        versionName "4.1.0"
     }
 
 /*
@@ -58,7 +58,7 @@ dependencies {
     compile "com.android.support:recyclerview-v7:${supportLibVersion}"
     compile 'com.github.javiersantos:MaterialStyledDialogs:1.5.1'
     compile 'com.squareup.picasso:picasso:2.5.2'
-    compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:4.1.0-beta.3@aar'){
+    compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:4.1.0@aar'){
         transitive=true
     }
     compile ('com.mapbox.mapboxsdk:mapbox-android-services:1.1.0@aar'){

diff --git a/MapboxAndroidDemo/src/main/AndroidManifest.xml b/MapboxAndroidDemo/src/main/AndroidManifest.xml
@@ -226,6 +226,5 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".MainActivity" />
         </activity>
-
     </application>
 </manifest>
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/MainActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/MainActivity.java
@@ -33,10 +33,8 @@
 import com.mapbox.mapboxandroiddemo.examples.DrawGeojsonLineActivity;
 import com.mapbox.mapboxandroiddemo.examples.DrawMarkerActivity;
 import com.mapbox.mapboxandroiddemo.examples.DrawPolygonActivity;
-import com.mapbox.mapboxandroiddemo.labs.MarkerFollowingRouteActivity;
 import com.mapbox.mapboxandroiddemo.examples.GeocodingActivity;
 import com.mapbox.mapboxandroiddemo.examples.LocationTrackingActivity;
-import com.mapbox.mapboxandroiddemo.labs.LocationPickerActivity;
 import com.mapbox.mapboxandroiddemo.examples.MapboxMapOptionActivity;
 import com.mapbox.mapboxandroiddemo.examples.MapboxStudioStyleActivity;
 import com.mapbox.mapboxandroiddemo.examples.OfflineManagerActivity;
@@ -45,6 +43,8 @@
 import com.mapbox.mapboxandroiddemo.examples.SimpleOfflineMapActivity;
 import com.mapbox.mapboxandroiddemo.examples.StaticImageActivity;
 import com.mapbox.mapboxandroiddemo.examples.SupportMapFragmentActivity;
+import com.mapbox.mapboxandroiddemo.labs.LocationPickerActivity;
+import com.mapbox.mapboxandroiddemo.labs.MarkerFollowingRouteActivity;
 import com.mapbox.mapboxandroiddemo.model.ExampleItemModel;
 import com.mapbox.mapboxandroiddemo.utils.ItemClickSupport;
 import com.mapbox.mapboxsdk.MapboxAccountManager;

diff --git a/...oidDemo/src/main/java/com/mapbox/mapboxandroiddemo/labs/MarkerFollowingRouteActivity.java b/...oidDemo/src/main/java/com/mapbox/mapboxandroiddemo/labs/MarkerFollowingRouteActivity.java
@@ -244,4 +244,4 @@ public LatLng evaluate(float fraction, LatLng startValue, LatLng endValue) {
         }
     }
 
-}
+}
diff --git a/MapboxAndroidDemo/src/main/res/layout-land/content_main.xml b/MapboxAndroidDemo/src/main/res/layout-land/content_main.xml
@@ -11,7 +11,7 @@
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/details_list"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
         android:paddingEnd="110dp"
         android:paddingLeft="110dp"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_navigation_location_picker.xml b/MapboxAndroidDemo/src/main/res/layout/activity_navigation_location_picker.xml
@@ -14,7 +14,6 @@
         android:id="@+id/clearDisplayViewButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/selectLocationButton"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_marginLeft="8dp"

diff --git a/MapboxAndroidDemo/src/main/res/layout/content_main.xml b/MapboxAndroidDemo/src/main/res/layout/content_main.xml
@@ -11,7 +11,7 @@
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/details_list"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="0.4"
         android:clipToPadding="false"

diff --git a/backdrop.png b/backdrop.png
diff --git a/build/generated/mockable-android-23.jar b/build/generated/mockable-android-23.jar
diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
diff --git a/logo.png b/logo.png
diff --git a/promo.png b/promo.png
diff --git a/screenshots/navigation-drawer.png b/screenshots/navigation-drawer.png
diff --git a/screenshots/custom-marker-example.png → screenshots/phone/custom-marker-example.png b/screenshots/custom-marker-example.png → screenshots/phone/custom-marker-example.png
diff --git a/screenshots/phone/following-route.png b/screenshots/phone/following-route.png
diff --git a/screenshots/main-activity.png → screenshots/phone/main-activity.png b/screenshots/main-activity.png → screenshots/phone/main-activity.png
diff --git a/screenshots/phone/navigation-drawer.png b/screenshots/phone/navigation-drawer.png
diff --git a/screenshots/phone/user-location.png b/screenshots/phone/user-location.png
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
-    }
+    }