diff options
16 files changed, 38 insertions, 42 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index c938268420..75e41035f1 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -68,9 +68,6 @@ android { consumerProguardFiles 'proguard-rules.pro' } } - -// resourcePrefix 'mapbox_' - } configurations { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index af8cfed032..2dbc660890 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -2289,7 +2289,7 @@ public class MapView extends FrameLayout { Context context = v.getContext(); String[] items = context.getResources().getStringArray(R.array.attribution_names); AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.AttributionAlertDialogStyle); - builder.setTitle(R.string.mapbox_attributionsDialogTitle); + builder.setTitle(R.string.attributionsDialogTitle); builder.setAdapter(new ArrayAdapter<>(context, R.layout.attribution_list_item, items), this); builder.show(); } @@ -2306,7 +2306,7 @@ public class MapView extends FrameLayout { } String[] items = context.getResources().getStringArray(array); AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.AttributionAlertDialogStyle); - builder.setTitle(R.string.mapbox_attributionTelemetryTitle); + builder.setTitle(R.string.attributionTelemetryTitle); LayoutInflater factory = LayoutInflater.from(context); View content = factory.inflate(R.layout.attribution_telemetry_view, null); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java index 4d247b442b..794a4f6086 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java @@ -12,7 +12,6 @@ import android.view.ViewGroup; import android.widget.ImageView; import com.mapbox.mapboxsdk.R; -import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import java.lang.ref.WeakReference; @@ -49,7 +48,7 @@ public final class CompassView extends ImageView { // View configuration setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.compass)); - setContentDescription(getResources().getString(R.string.mapbox_compassContentDescription)); + setContentDescription(getResources().getString(R.string.compassContentDescription)); setEnabled(false); // Layout params diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml index be0038e8b8..777d879d48 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml @@ -3,12 +3,12 @@ <!--Add references to exposed resources--> <public name="AttributionAlertDialogStyle" type="style" /> - <public name="mapbox_style_mapbox_streets" type="string" /> - <public name="mapbox_style_emerald" type="string" /> - <public name="mapbox_style_light" type="string" /> - <public name="mapbox_style_dark" type="string" /> - <public name="mapbox_style_satellite" type="string" /> - <public name="mapbox_style_satellite_streets" type="string" /> + <public name="style_mapbox_streets" type="string" /> + <public name="style_emerald" type="string" /> + <public name="style_light" type="string" /> + <public name="style_dark" type="string" /> + <public name="style_satellite" type="string" /> + <public name="style_satellite_streets" type="string" /> <public name="center_longitude" type="attr" /> <public name="center_latitude" type="attr" /> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_telemetry_view.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_telemetry_view.xml index 04c47af90d..b4d2326833 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_telemetry_view.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_telemetry_view.xml @@ -9,7 +9,7 @@ <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" - android:text="@string/mapbox_attributionTelemetryMessage" + android:text="@string/attributionTelemetryMessage" android:gravity="center_horizontal"/> <ListView diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml index a4fcc80681..3e36cbf91a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="2dp" android:maxEms="17" - android:text="@string/mapbox_infoWindowTitle" + android:text="@string/infoWindowTitle" android:textColor="@color/black" android:textSize="18sp" android:textStyle="bold" /> @@ -31,7 +31,7 @@ android:layout_marginTop="2dp" android:lineSpacingExtra="1dp" android:maxEms="17" - android:text="@string/mapbox_infoWindowDescription" + android:text="@string/infoWindowDescription" android:textColor="@color/gray" android:textSize="14sp" /> @@ -40,7 +40,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxEms="17" - android:text="@string/mapbox_infoWindowAddress" + android:text="@string/infoWindowAddress" android:textColor="@color/black" android:textSize="12sp" android:visibility="gone" /> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml index 288fb441ad..04b7033282 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml @@ -15,7 +15,7 @@ android:id="@+id/logoView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:contentDescription="@string/mapbox_mapboxIconContentDescription" + android:contentDescription="@string/mapboxIconContentDescription" android:src="@drawable/attribution_logo" /> <ImageView @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:adjustViewBounds="true" android:clickable="true" - android:contentDescription="@string/mapbox_attributionsIconContentDescription" + android:contentDescription="@string/attributionsIconContentDescription" android:padding="7dp" android:src="@drawable/ic_info_outline_24dp_selector" android:background="@drawable/bg_default_selector"/> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml index f852c305b2..1f3cd8c4e3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="mapbox_compassContentDescription">Map compass. Click to reset the map rotation to North.</string> - <string name="mapbox_attributionsIconContentDescription">Attribution icon. Click to show attribution dialog.</string> - <string name="mapbox_attributionsDialogTitle">Mapbox Android SDK</string> - <string name="mapbox_attributionTelemetryTitle">Make Mapbox Maps Better</string> - <string name="mapbox_attributionTelemetryMessage">You are helping to make OpenStreetMap and Mapbox maps better by contributing anonymous usage data.</string> - <string name="mapbox_mapboxIconContentDescription">The Mapbox logo.</string> - <string name="mapbox_infoWindowTitle">Title</string> - <string name="mapbox_infoWindowDescription">Description</string> - <string name="mapbox_infoWindowAddress">Address</string> + <string name="compassContentDescription">Map compass. Click to reset the map rotation to North.</string> + <string name="attributionsIconContentDescription">Attribution icon. Click to show attribution dialog.</string> + <string name="attributionsDialogTitle">Mapbox Android SDK</string> + <string name="attributionTelemetryTitle">Make Mapbox Maps Better</string> + <string name="attributionTelemetryMessage">You are helping to make OpenStreetMap and Mapbox maps better by contributing anonymous usage data.</string> + <string name="mapboxIconContentDescription">The Mapbox logo.</string> + <string name="infoWindowTitle">Title</string> + <string name="infoWindowDescription">Description</string> + <string name="infoWindowAddress">Address</string> <!-- these are public --> - <string name="mapbox_style_mapbox_streets">mapbox://styles/mapbox/streets-v8</string> - <string name="mapbox_style_emerald">mapbox://styles/mapbox/emerald-v8</string> - <string name="mapbox_style_light">mapbox://styles/mapbox/light-v8</string> - <string name="mapbox_style_dark">mapbox://styles/mapbox/dark-v8</string> - <string name="mapbox_style_satellite">mapbox://styles/mapbox/satellite-v8</string> - <string name="mapbox_style_satellite_streets">mapbox://styles/mapbox/satellite-hybrid-v8</string> + <string name="style_mapbox_streets">mapbox://styles/mapbox/streets-v8</string> + <string name="style_emerald">mapbox://styles/mapbox/emerald-v8</string> + <string name="style_light">mapbox://styles/mapbox/light-v8</string> + <string name="style_dark">mapbox://styles/mapbox/dark-v8</string> + <string name="style_satellite">mapbox://styles/mapbox/satellite-v8</string> + <string name="style_satellite_streets">mapbox://styles/mapbox/satellite-hybrid-v8</string> </resources> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_directions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_directions.xml index 21684ccadb..5de3651272 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_directions.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_directions.xml @@ -16,6 +16,6 @@ android:id="@+id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:style_url="@string/mapbox_style_mapbox_streets" /> + app:style_url="@string/style_mapbox_streets" /> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml index f9e0145356..eccd3ea8eb 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml @@ -16,7 +16,7 @@ android:id="@+id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:style_url="@string/mapbox_style_mapbox_streets" + app:style_url="@string/style_mapbox_streets" app:center_latitude="38.897705003219784" app:center_longitude="-77.03655168667463" app:zoom="15" /> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml index 8cf30a4475..ccced6bbff 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml @@ -16,7 +16,7 @@ android:id="@+id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:style_url="@string/mapbox_style_mapbox_streets" + app:style_url="@string/style_mapbox_streets" app:center_latitude="47.798202" app:center_longitude="7.573781" app:zoom="4" /> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_concurrent.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_concurrent.xml index 69276ad491..062726fcb2 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_concurrent.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_concurrent.xml @@ -16,7 +16,7 @@ android:id="@+id/infoWindowConcurrentMapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:style_url="@string/mapbox_style_mapbox_streets" + app:style_url="@string/style_mapbox_streets" app:center_latitude="38.897705003219784" app:center_longitude="-77.03655168667463" app:zoom="15" /> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapboxmap.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapboxmap.xml index f9e0145356..eccd3ea8eb 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapboxmap.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapboxmap.xml @@ -16,7 +16,7 @@ android:id="@+id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:style_url="@string/mapbox_style_mapbox_streets" + app:style_url="@string/style_mapbox_streets" app:center_latitude="38.897705003219784" app:center_longitude="-77.03655168667463" app:zoom="15" /> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml index 5e9b8e62d7..ce108ba129 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml @@ -25,7 +25,7 @@ android:layout_height="match_parent" app:center_latitude="38.897705003219784" app:center_longitude="-77.03655168667463" - app:style_url="@string/mapbox_style_mapbox_streets" + app:style_url="@string/style_mapbox_streets" app:zoom="15" /> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml index 7b16910953..699fa4be6b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml @@ -42,7 +42,7 @@ android:id="@+id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:style_url="@string/mapbox_style_mapbox_streets" + app:style_url="@string/style_mapbox_streets" app:zoom="15" /> </LinearLayout>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml index 7f4012f74e..7875fc2021 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml @@ -19,7 +19,7 @@ android:layout_below="@+id/toolbar" app:center_latitude="47.798202" app:center_longitude="7.573781" - app:style_url="@string/mapbox_style_mapbox_streets" + app:style_url="@string/style_mapbox_streets" app:zoom="4" /> <android.support.design.widget.FloatingActionButton |