summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDKTestApp/src/main/java
diff options
context:
space:
mode:
authorPablo Guardiola <guardiola31337@hotmail.com>2016-11-23 11:48:07 -0500
committerGitHub <noreply@github.com>2016-11-23 11:48:07 -0500
commitac924719e12f6eccacdbdc80b3c887b4db313c8e (patch)
tree965ae13b706d311fe23e1199cf1e3a5cc9202fe7 /platform/android/MapboxGLAndroidSDKTestApp/src/main/java
parent5a4b73f3be07aaceb689f0f50290facdc692e281 (diff)
downloadqtlocation-mapboxgl-ac924719e12f6eccacdbdc80b3c887b4db313c8e.tar.gz
[android] - replace Android logs with Timber (#6372) (#7149)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java')
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java11
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java5
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AddRemoveMarkerActivity.java15
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java5
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewsInRectangleActivity.java6
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java14
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java9
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java7
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java5
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/directions/DirectionsActivity.java12
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java14
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java5
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java7
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java14
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/geocoding/GeocoderActivity.java12
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java6
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/navigation/LocationPickerActivity.java15
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java28
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java6
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java5
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GeoJsonClusteringActivity.java5
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RealTimeGeoJsonActivity.java5
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java25
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTestActivity.java1
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTimingTestActivity.java1
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java7
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java6
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java8
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FontCache.java6
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java4
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java10
31 files changed, 127 insertions, 152 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java
index 5b4c730cfb..23842c5dad 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java
@@ -5,6 +5,9 @@ import android.os.StrictMode;
import com.mapbox.mapboxsdk.MapboxAccountManager;
import com.squareup.leakcanary.LeakCanary;
+import timber.log.Timber;
+
+import static timber.log.Timber.DebugTree;
public class MapboxApplication extends Application {
@@ -19,6 +22,8 @@ public class MapboxApplication extends Application {
}
LeakCanary.install(this);
+ initializeLogger();
+
StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
.detectDiskReads()
.detectDiskWrites()
@@ -33,4 +38,10 @@ public class MapboxApplication extends Application {
MapboxAccountManager.start(getApplicationContext(), getString(R.string.mapbox_access_token));
}
+
+ private void initializeLogger() {
+ if (BuildConfig.DEBUG) {
+ Timber.plant(new DebugTree());
+ }
+ }
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java
index c3ade57986..9a7badf0fa 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java
@@ -19,10 +19,9 @@ import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.View;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.testapp.R;
import com.mapbox.mapboxsdk.testapp.adapter.FeatureAdapter;
import com.mapbox.mapboxsdk.testapp.adapter.FeatureSectionAdapter;
@@ -91,7 +90,7 @@ public class FeatureOverviewActivity extends AppCompatActivity {
getPackageManager().getPackageInfo(getPackageName(),
PackageManager.GET_ACTIVITIES | PackageManager.GET_META_DATA));
} catch (PackageManager.NameNotFoundException exception) {
- Log.e(MapboxConstants.TAG, "Could not resolve package info", exception);
+ Timber.e("Could not resolve package info", exception);
}
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AddRemoveMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AddRemoveMarkerActivity.java
index 770494844f..c20a8aede1 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AddRemoveMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AddRemoveMarkerActivity.java
@@ -4,7 +4,7 @@ import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import com.mapbox.mapboxsdk.annotations.Icon;
@@ -13,7 +13,6 @@ import com.mapbox.mapboxsdk.annotations.Marker;
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
import com.mapbox.mapboxsdk.camera.CameraPosition;
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.maps.MapView;
import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -99,14 +98,14 @@ public class AddRemoveMarkerActivity extends AppCompatActivity {
isShowingHighThresholdMarker = false;
if (activeMarker != null) {
- Log.d(MapboxConstants.TAG, "Remove marker with " + activeMarker.getId());
+ Timber.d("Remove marker with " + activeMarker.getId());
mapboxMap.removeMarker(activeMarker);
} else {
- Log.e(MapboxConstants.TAG, "active marker is null");
+ Timber.e("active marker is null");
}
activeMarker = mapboxMap.addMarker(lowThresholdMarker);
- Log.d(MapboxConstants.TAG, "showLowThresholdMarker() " + activeMarker.getId());
+ Timber.d("showLowThresholdMarker() " + activeMarker.getId());
}
private void showHighThresholdMarker() {
@@ -118,14 +117,14 @@ public class AddRemoveMarkerActivity extends AppCompatActivity {
isShowingHighThresholdMarker = true;
if (activeMarker != null) {
- Log.d(MapboxConstants.TAG, "Remove marker with " + activeMarker.getId());
+ Timber.d("Remove marker with " + activeMarker.getId());
mapboxMap.removeMarker(activeMarker);
} else {
- Log.e(MapboxConstants.TAG, "active marker is null");
+ Timber.e("active marker is null");
}
activeMarker = mapboxMap.addMarker(highThresholdMarker);
- Log.d(MapboxConstants.TAG, "showHighThresholdMarker() " + activeMarker.getId());
+ Timber.d("showHighThresholdMarker() " + activeMarker.getId());
}
@Override
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
index 2b84763dcd..cb799c3d4d 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
@@ -12,7 +12,7 @@ import android.support.v4.content.res.ResourcesCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
@@ -269,7 +269,6 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
private static class LoadLocationTask extends AsyncTask<Void, Integer, List<LatLng>> {
- private static final String TAG = "LoadLocationTask";
private BulkMarkerActivity activity;
private ProgressDialog progressDialog;
private int amount;
@@ -286,7 +285,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
String json = GeoParseUtil.loadStringFromAssets(activity.getApplicationContext(), "points.geojson");
return GeoParseUtil.parseGeoJSONCoordinates(json);
} catch (IOException | JSONException exception) {
- Log.e(TAG, "Could not add markers,", exception);
+ Timber.e("Could not add markers,", exception);
return null;
}
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewsInRectangleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewsInRectangleActivity.java
index a6c3be7afa..78daf47f2b 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewsInRectangleActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewsInRectangleActivity.java
@@ -5,7 +5,7 @@ import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
@@ -25,8 +25,6 @@ import java.util.List;
public class MarkerViewsInRectangleActivity extends AppCompatActivity implements OnMapReadyCallback,
View.OnClickListener {
- private static final String TAG = QueryRenderedFeaturesBoxCountActivity.class.getSimpleName();
-
public MapView mapView;
private MapboxMap mapboxMap;
private View selectionBox;
@@ -59,7 +57,7 @@ public class MarkerViewsInRectangleActivity extends AppCompatActivity implements
int top = selectionBox.getTop() - mapView.getTop();
int left = selectionBox.getLeft() - mapView.getLeft();
RectF box = new RectF(left, top, left + selectionBox.getWidth(), top + selectionBox.getHeight());
- Log.i(TAG, String.format("Querying box %s", box));
+ Timber.i(String.format("Querying box %s", box));
List<MarkerView> markers = mapboxMap.getMarkerViewsInRect(box);
//Show count
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
index 50c61b1ce1..ba192504af 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
@@ -4,14 +4,13 @@ import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
import com.mapbox.mapboxsdk.camera.CameraPosition;
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.maps.MapView;
import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -20,7 +19,6 @@ import com.mapbox.mapboxsdk.testapp.R;
public class CameraAnimationTypeActivity extends AppCompatActivity implements OnMapReadyCallback {
- private static final String TAG = "CameraActivity";
private static final LatLng LAT_LNG_LONDON_EYE = new LatLng(51.50325, -0.11968);
private static final LatLng LAT_LNG_TOWER_BRIDGE = new LatLng(51.50550, -0.07520);
@@ -57,7 +55,7 @@ public class CameraAnimationTypeActivity extends AppCompatActivity implements On
mapboxMap.setOnCameraChangeListener(new MapboxMap.OnCameraChangeListener() {
@Override
public void onCameraChange(CameraPosition position) {
- Log.v(MapboxConstants.TAG, position.toString());
+ Timber.v(position.toString());
}
});
@@ -101,7 +99,7 @@ public class CameraAnimationTypeActivity extends AppCompatActivity implements On
MapboxMap.CancelableCallback callback = new MapboxMap.CancelableCallback() {
@Override
public void onCancel() {
- Log.i(TAG, "Duration onCancel Callback called.");
+ Timber.i("Duration onCancel Callback called.");
Toast.makeText(
CameraAnimationTypeActivity.this,
"Ease onCancel Callback called.",
@@ -110,7 +108,7 @@ public class CameraAnimationTypeActivity extends AppCompatActivity implements On
@Override
public void onFinish() {
- Log.i(TAG, "Duration onFinish Callback called.");
+ Timber.i("Duration onFinish Callback called.");
Toast.makeText(
CameraAnimationTypeActivity.this,
"Ease onFinish Callback called.",
@@ -138,7 +136,7 @@ public class CameraAnimationTypeActivity extends AppCompatActivity implements On
MapboxMap.CancelableCallback callback = new MapboxMap.CancelableCallback() {
@Override
public void onCancel() {
- Log.i(TAG, "Duration onCancel Callback called.");
+ Timber.i("Duration onCancel Callback called.");
Toast.makeText(
CameraAnimationTypeActivity.this,
"Duration onCancel Callback called.",
@@ -147,7 +145,7 @@ public class CameraAnimationTypeActivity extends AppCompatActivity implements On
@Override
public void onFinish() {
- Log.i(TAG, "Duration onFinish Callback called.");
+ Timber.i("Duration onFinish Callback called.");
Toast.makeText(
CameraAnimationTypeActivity.this,
"Duration onFinish Callback called.",
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
index 617288635a..170a3cb436 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
@@ -11,7 +11,7 @@ import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
@@ -20,7 +20,6 @@ import android.widget.TextView;
import com.mapbox.mapboxsdk.camera.CameraPosition;
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.maps.MapView;
import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -98,15 +97,15 @@ public class CameraPositionActivity extends AppCompatActivity implements OnMapRe
mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition), 5000, new MapboxMap.CancelableCallback() {
@Override
public void onCancel() {
- Log.v(MapboxConstants.TAG, "OnCancel called");
+ Timber.v("OnCancel called");
}
@Override
public void onFinish() {
- Log.v(MapboxConstants.TAG, "OnFinish called");
+ Timber.v("OnFinish called");
}
});
- Log.v(MapboxConstants.TAG, cameraPosition.toString());
+ Timber.v(cameraPosition.toString());
}
});
builder.setNegativeButton("Cancel", null);
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java
index ed5f761ab4..8a1e41bb42 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java
@@ -4,12 +4,11 @@ import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.constants.Style;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.geometry.LatLngBounds;
@@ -84,8 +83,8 @@ public class LatLngBoundsActivity extends AppCompatActivity implements OnMapRead
mapboxMap.animateCamera(CameraUpdateFactory.newLatLngBounds(bounds, padding));
// Log data
- Log.e(MapboxConstants.TAG, "Move to bounds: " + bounds.toString());
- Log.e(MapboxConstants.TAG, "Resulting bounds:" + mapboxMap.getProjection().getVisibleRegion().latLngBounds.toString());
+ Timber.e("Move to bounds: " + bounds.toString());
+ Timber.e("Resulting bounds:" + mapboxMap.getProjection().getVisibleRegion().latLngBounds.toString());
}
@Override
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java
index be71133610..804fc95213 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java
@@ -6,7 +6,7 @@ import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -22,7 +22,6 @@ import com.mapbox.mapboxsdk.testapp.R;
import com.mapbox.mapboxsdk.testapp.model.customlayer.ExampleCustomLayer;
public class CustomLayerActivity extends AppCompatActivity {
- private static final String TAG = CustomLayerActivity.class.getSimpleName();
private MapboxMap mapboxMap;
private MapView mapView;
@@ -66,7 +65,7 @@ public class CustomLayerActivity extends AppCompatActivity {
mapboxMap.removeLayer(customLayer.getId());
customLayer = null;
} catch (NoSuchLayerException noSuchLayerException) {
- Log.e(TAG, "No custom layer to remove");
+ Timber.e("No custom layer to remove");
}
fab.setImageResource(R.drawable.ic_layers_24dp);
} else {
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/directions/DirectionsActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/directions/DirectionsActivity.java
index 54b160f93d..64d0a773b4 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/directions/DirectionsActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/directions/DirectionsActivity.java
@@ -6,7 +6,7 @@ import android.support.annotation.NonNull;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
import com.mapbox.mapboxsdk.annotations.PolylineOptions;
@@ -35,8 +35,6 @@ import retrofit2.Response;
public class DirectionsActivity extends AppCompatActivity {
- private static final String LOG_TAG = "DirectionsActivity";
-
private MapView mapView;
private MapboxMap mapboxMap;
@@ -110,17 +108,17 @@ public class DirectionsActivity extends AppCompatActivity {
@Override
public void onFailure(Call<DirectionsResponse> call, Throwable throwable) {
- Log.e(LOG_TAG, "Error: " + throwable.getMessage());
+ Timber.e("Error: " + throwable.getMessage());
}
@Override
public void onResponse(Call<DirectionsResponse> call, Response<DirectionsResponse> response) {
// You can get generic HTTP info about the response
- Log.d(LOG_TAG, "Response code: " + response.code());
+ Timber.d("Response code: " + response.code());
// Print some info about the route
DirectionsRoute currentRoute = response.body().getRoutes().get(0);
- Log.d(LOG_TAG, "Distance: " + currentRoute.getDistance());
+ Timber.d("Distance: " + currentRoute.getDistance());
// Draw the route on the map
drawRoute(currentRoute);
@@ -128,7 +126,7 @@ public class DirectionsActivity extends AppCompatActivity {
});
} catch (ServicesException servicesException) {
- Log.e(LOG_TAG, "Error displaying route: " + servicesException.toString());
+ Timber.e("Error displaying route: " + servicesException.toString());
servicesException.printStackTrace();
}
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java
index a2ac43960f..273695ae92 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java
@@ -5,7 +5,7 @@ import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
@@ -27,7 +27,6 @@ import java.util.Map;
* Demo's query rendered features
*/
public class QueryRenderedFeaturesBoxCountActivity extends AppCompatActivity {
- private static final String TAG = QueryRenderedFeaturesBoxCountActivity.class.getSimpleName();
public MapView mapView;
private MapboxMap mapboxMap;
@@ -59,7 +58,7 @@ public class QueryRenderedFeaturesBoxCountActivity extends AppCompatActivity {
int top = selectionBox.getTop() - mapView.getTop();
int left = selectionBox.getLeft() - mapView.getLeft();
RectF box = new RectF(left, top, left + selectionBox.getWidth(), top + selectionBox.getHeight());
- Log.i(TAG, String.format("Querying box %s", box));
+ Timber.i(String.format("Querying box %s", box));
List<Feature> features = mapboxMap.queryRenderedFeatures(box);
//Show count
@@ -81,21 +80,22 @@ public class QueryRenderedFeaturesBoxCountActivity extends AppCompatActivity {
}
private void debugOutput(List<Feature> features) {
- Log.i(TAG, String.format("Got %s features", features.size()));
+ Timber.i(String.format("Got %s features", features.size()));
for (Feature feature : features) {
if (feature != null) {
- Log.i(TAG, String.format("Got feature %s with %s properties and Geometry %s",
+ Timber.i(String.format("Got feature %s with %s properties and Geometry %s",
feature.getId(),
feature.getProperties() != null ? feature.getProperties().entrySet().size() : "<null>",
feature.getGeometry() != null ? feature.getGeometry().getClass().getSimpleName() : "<null>")
);
if (feature.getProperties() != null) {
for (Map.Entry<String, JsonElement> entry : feature.getProperties().entrySet()) {
- Log.i(TAG, String.format("Prop %s - %s", entry.getKey(), entry.getValue()));
+ Timber.i(String.format("Prop %s - %s", entry.getKey(), entry.getValue()));
}
}
} else {
- Log.i(TAG, "Got NULL feature %s");
+ // TODO Question: Why not formatting here??
+ Timber.i("Got NULL feature %s");
}
}
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java
index 4a24ff964f..1469695e7e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java
@@ -6,7 +6,7 @@ import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
@@ -31,7 +31,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillColor;
* Demo's query rendered features
*/
public class QueryRenderedFeaturesBoxHighlightActivity extends AppCompatActivity {
- private static final String TAG = QueryRenderedFeaturesBoxHighlightActivity.class.getSimpleName();
public MapView mapView;
private MapboxMap mapboxMap;
@@ -62,7 +61,7 @@ public class QueryRenderedFeaturesBoxHighlightActivity extends AppCompatActivity
int top = selectionBox.getTop() - mapView.getTop();
int left = selectionBox.getLeft() - mapView.getLeft();
RectF box = new RectF(left, top, left + selectionBox.getWidth(), top + selectionBox.getHeight());
- Log.i(TAG, String.format("Querying box %s for buildings", box));
+ Timber.i(String.format("Querying box %s for buildings", box));
List<Feature> features = mapboxMap.queryRenderedFeatures(box, "building");
//Show count
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java
index 78fedadda4..1ae382b12c 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java
@@ -7,7 +7,7 @@ import android.support.annotation.RawRes;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
@@ -37,7 +37,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconImage;
* Demo's query rendered features on Symbols
*/
public class QueryRenderedFeaturesBoxSymbolCountActivity extends AppCompatActivity {
- private static final String TAG = QueryRenderedFeaturesBoxSymbolCountActivity.class.getSimpleName();
public MapView mapView;
private MapboxMap mapboxMap;
@@ -67,7 +66,7 @@ public class QueryRenderedFeaturesBoxSymbolCountActivity extends AppCompatActivi
try {
mapboxMap.addSource(new GeoJsonSource("symbols-source", readRawResource(R.raw.test_points_utrecht)));
} catch (IOException e) {
- Log.e(TAG, "Could not load geojson: " + e.getMessage());
+ Timber.e("Could not load geojson: " + e.getMessage());
return;
}
mapboxMap.addImage("test-icon", BitmapFactory.decodeResource(getResources(), R.drawable.mapbox_marker_icon_default));
@@ -81,7 +80,7 @@ public class QueryRenderedFeaturesBoxSymbolCountActivity extends AppCompatActivi
int top = selectionBox.getTop() - mapView.getTop();
int left = selectionBox.getLeft() - mapView.getLeft();
RectF box = new RectF(left, top, left + selectionBox.getWidth(), top + selectionBox.getHeight());
- Log.i(TAG, String.format("Querying box %s", box));
+ Timber.i(String.format("Querying box %s", box));
List<Feature> features = mapboxMap.queryRenderedFeatures(box, "symbols-layer");
//Show count
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java
index 184811f222..acdf224049 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java
@@ -9,7 +9,7 @@ import android.support.annotation.NonNull;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
import android.widget.LinearLayout;
@@ -33,7 +33,6 @@ import java.util.Map;
* Demo's query rendered features
*/
public class QueryRenderedFeaturesPropertiesActivity extends AppCompatActivity {
- private static final String TAG = QueryRenderedFeaturesPropertiesActivity.class.getSimpleName();
public MapView mapView;
private MapboxMap mapboxMap;
@@ -64,7 +63,7 @@ public class QueryRenderedFeaturesPropertiesActivity extends AppCompatActivity {
public void onMapClick(@NonNull LatLng point) {
//Query
final PointF pixel = mapboxMap.getProjection().toScreenLocation(point);
- Log.i(TAG, String.format(
+ Timber.i(String.format(
"Requesting features for %sx%s (%sx%s adjusted for density)",
pixel.x, pixel.y, pixel.x / density, pixel.y / density)
);
@@ -92,21 +91,22 @@ public class QueryRenderedFeaturesPropertiesActivity extends AppCompatActivity {
}
private void debugOutput(List<Feature> features) {
- Log.i(TAG, String.format("Got %s features", features.size()));
+ Timber.i(String.format("Got %s features", features.size()));
for (Feature feature : features) {
if (feature != null) {
- Log.i(TAG, String.format("Got feature %s with %s properties and Geometry %s",
+ Timber.i(String.format("Got feature %s with %s properties and Geometry %s",
feature.getId(),
feature.getProperties() != null ? feature.getProperties().entrySet().size() : "<null>",
feature.getGeometry() != null ? feature.getGeometry().getClass().getSimpleName() : "<null>")
);
if (feature.getProperties() != null) {
for (Map.Entry<String, JsonElement> entry : feature.getProperties().entrySet()) {
- Log.i(TAG, String.format("Prop %s - %s", entry.getKey(), entry.getValue()));
+ Timber.i(String.format("Prop %s - %s", entry.getKey(), entry.getValue()));
}
}
} else {
- Log.i(TAG, "Got NULL feature %s");
+ // TODO Question: Why not formatting here??
+ Timber.i("Got NULL feature %s");
}
}
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/geocoding/GeocoderActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/geocoding/GeocoderActivity.java
index df3f9e0851..c399adec37 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/geocoding/GeocoderActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/geocoding/GeocoderActivity.java
@@ -6,7 +6,7 @@ import android.support.annotation.NonNull;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.Gravity;
import android.view.MenuItem;
import android.view.ViewGroup;
@@ -37,8 +37,6 @@ import retrofit2.Response;
public class GeocoderActivity extends AppCompatActivity implements OnMapReadyCallback {
- private static final String LOG_TAG = "GeocoderActivity";
-
private MapboxMap mapboxMap;
private MapView mapView;
private ImageView dropPinView;
@@ -167,7 +165,7 @@ public class GeocoderActivity extends AppCompatActivity implements OnMapReadyCal
}
});
} catch (ServicesException servicesException) {
- Log.e(LOG_TAG, "Error geocoding: " + servicesException.toString());
+ Timber.e("Error geocoding: " + servicesException.toString());
servicesException.printStackTrace();
setError(servicesException.getMessage());
}
@@ -178,17 +176,17 @@ public class GeocoderActivity extends AppCompatActivity implements OnMapReadyCal
*/
private void setMessage(String message) {
- Log.d(LOG_TAG, "Message: " + message);
+ Timber.d("Message: " + message);
textView.setText(message);
}
private void setSuccess(String placeName) {
- Log.d(LOG_TAG, "Place name: " + placeName);
+ Timber.d("Place name: " + placeName);
textView.setText(placeName);
}
private void setError(String message) {
- Log.e(LOG_TAG, "Error: " + message);
+ Timber.e("Error: " + message);
textView.setText("Error: " + message);
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
index d80a68f68d..ca3fc5ed64 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
@@ -6,7 +6,7 @@ import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
@@ -18,8 +18,6 @@ import com.mapbox.mapboxsdk.testapp.R;
public class DebugModeActivity extends AppCompatActivity {
- private static final String TAG = "DebugModeActivity";
-
private MapView mapView;
private MapboxMap mapboxMap;
@@ -65,7 +63,7 @@ public class DebugModeActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
if (mapboxMap != null) {
- Log.d(TAG, "Debug FAB: isDebug Active? " + mapboxMap.isDebugActive());
+ Timber.d("Debug FAB: isDebug Active? " + mapboxMap.isDebugActive());
mapboxMap.cycleDebugOptions();
}
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/navigation/LocationPickerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/navigation/LocationPickerActivity.java
index 8993c72046..3dbcc24b3b 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/navigation/LocationPickerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/navigation/LocationPickerActivity.java
@@ -14,7 +14,7 @@ import android.support.v4.app.ActivityCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -59,7 +59,6 @@ import retrofit2.Response;
* Sample Activity to show a typical location picker use case
*/
public class LocationPickerActivity extends AppCompatActivity {
- private static final String TAG = "LocationPickerActivity";
private static final int REQUEST_PERMISSIONS = 101;
private MapView mapView;
@@ -199,7 +198,7 @@ public class LocationPickerActivity extends AppCompatActivity {
new View.OnClickListener() {
@Override
public void onClick(View view) {
- Log.i(TAG, "Location Selected!");
+ Timber.i("Location Selected!");
if (mapboxMap != null) {
//Control button's state
clearDisplayViewButton.setVisibility(View.VISIBLE);
@@ -287,7 +286,7 @@ public class LocationPickerActivity extends AppCompatActivity {
if (results.size() > 0) {
CarmenFeature feature = results.get(0);
address = feature.getAddress() + " " + feature.getText();
- Log.i(TAG, "address " + address);
+ Timber.i("address " + address);
} else {
showFeedbackMessage("No results for search.");
}
@@ -297,12 +296,12 @@ public class LocationPickerActivity extends AppCompatActivity {
@Override
public void onFailure(Call<GeocodingResponse> call, Throwable throwable) {
- Log.e(TAG, "Geocoding Failure: " + throwable.getMessage());
+ Timber.e("Geocoding Failure: " + throwable.getMessage());
callbacks.onFailure(throwable);
}
});
} catch (ServicesException servicesException) {
- Log.e(TAG, "Error geocoding: " + servicesException.toString());
+ Timber.e("Error geocoding: " + servicesException.toString());
callbacks.onFailure(servicesException);
}
}
@@ -345,12 +344,12 @@ public class LocationPickerActivity extends AppCompatActivity {
if (Build.VERSION.SDK_INT >= 23
&& checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED
&& checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
- Log.i(TAG, "Requesting permissions");
+ Timber.i("Requesting permissions");
ActivityCompat.requestPermissions(this, new String[]{
Manifest.permission.ACCESS_FINE_LOCATION}, REQUEST_PERMISSIONS);
return false;
}
- Log.i(TAG, "Permissions already granted");
+ Timber.i("Permissions already granted");
return true;
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java
index 78acde38be..366377ca62 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java
@@ -6,7 +6,7 @@ import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.text.TextUtils;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
@@ -38,8 +38,6 @@ import java.util.ArrayList;
public class OfflineActivity extends AppCompatActivity
implements OfflineDownloadRegionDialog.DownloadRegionDialogListener {
- private static final String LOG_TAG = "OfflineActivity";
-
// JSON encoding/decoding
public static final String JSON_CHARSET = "UTF-8";
public static final String JSON_FIELD_REGION_NAME = "FIELD_REGION_NAME";
@@ -79,7 +77,7 @@ public class OfflineActivity extends AppCompatActivity
// state of your app. This will override any checks performed via the ConnectivityManager.
//MapboxAccountManager.getInstance().setConnected(false);
Boolean connected = MapboxAccountManager.getInstance().isConnected();
- Log.d(LOG_TAG, String.format(MapboxConstants.MAPBOX_LOCALE,
+ Timber.d(String.format(MapboxConstants.MAPBOX_LOCALE,
"MapboxAccountManager is connected: %b", connected));
// Set up map
@@ -89,7 +87,7 @@ public class OfflineActivity extends AppCompatActivity
mapView.getMapAsync(new OnMapReadyCallback() {
@Override
public void onMapReady(@NonNull MapboxMap mapboxMap) {
- Log.d(LOG_TAG, "Map is ready");
+ Timber.d("Map is ready");
OfflineActivity.this.mapboxMap = mapboxMap;
// Set initial position to UNHQ in NYC
@@ -185,7 +183,7 @@ public class OfflineActivity extends AppCompatActivity
*/
private void handleDownloadRegion() {
- Log.d(LOG_TAG, "handleDownloadRegion");
+ Timber.d("handleDownloadRegion");
// Show dialog
OfflineDownloadRegionDialog offlineDownloadRegionDialog = new OfflineDownloadRegionDialog();
@@ -193,7 +191,7 @@ public class OfflineActivity extends AppCompatActivity
}
private void handleListRegions() {
- Log.d(LOG_TAG, "handleListRegions");
+ Timber.d("handleListRegions");
// Query the DB asynchronously
offlineManager.listOfflineRegions(new OfflineManager.ListOfflineRegionsCallback() {
@@ -223,7 +221,7 @@ public class OfflineActivity extends AppCompatActivity
@Override
public void onError(String error) {
- Log.e(LOG_TAG, "Error: " + error);
+ Timber.e("Error: " + error);
}
});
}
@@ -240,7 +238,7 @@ public class OfflineActivity extends AppCompatActivity
}
// Start progress bar
- Log.d(LOG_TAG, "Download started: " + regionName);
+ Timber.d("Download started: " + regionName);
startProgress();
// Definition
@@ -259,14 +257,14 @@ public class OfflineActivity extends AppCompatActivity
offlineManager.createOfflineRegion(definition, metadata, new OfflineManager.CreateOfflineRegionCallback() {
@Override
public void onCreate(OfflineRegion offlineRegion) {
- Log.d(LOG_TAG, "Offline region created: " + regionName);
+ Timber.d("Offline region created: " + regionName);
OfflineActivity.this.offlineRegion = offlineRegion;
launchDownload();
}
@Override
public void onError(String error) {
- Log.e(LOG_TAG, "Error: " + error);
+ Timber.e("Error: " + error);
}
});
}
@@ -291,7 +289,7 @@ public class OfflineActivity extends AppCompatActivity
}
// Debug
- Log.d(LOG_TAG, String.format("%s/%s resources; %s bytes downloaded.",
+ Timber.d(String.format("%s/%s resources; %s bytes downloaded.",
String.valueOf(status.getCompletedResourceCount()),
String.valueOf(status.getRequiredResourceCount()),
String.valueOf(status.getCompletedResourceSize())));
@@ -299,13 +297,13 @@ public class OfflineActivity extends AppCompatActivity
@Override
public void onError(OfflineRegionError error) {
- Log.e(LOG_TAG, "onError reason: " + error.getReason());
- Log.e(LOG_TAG, "onError message: " + error.getMessage());
+ Timber.e("onError reason: " + error.getReason());
+ Timber.e("onError message: " + error.getMessage());
}
@Override
public void mapboxTileCountLimitExceeded(long limit) {
- Log.e(LOG_TAG, "Mapbox tile count limit exceeded: " + limit);
+ Timber.e("Mapbox tile count limit exceeded: " + limit);
}
});
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java
index d279a78a47..65af3365ec 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java
@@ -8,11 +8,10 @@ import android.support.v4.content.res.ResourcesCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.maps.MapView;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
@@ -68,8 +67,7 @@ public class CircleLayerActivity extends AppCompatActivity {
try {
mapboxMap.addSource(new GeoJsonSource("point", new URL("https://gist.githubusercontent.com/anonymous/87eca90e80a72b1b42be9d0201ec3c8e/raw/acbb46384fd56044a504f122950d0637d98b4e7a/map.geojson")));
} catch (MalformedURLException malformedUrlException) {
- Log.e(
- MapboxConstants.TAG,
+ Timber.e(
"That's not an url... " + malformedUrlException.getMessage()
);
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java
index ebeaeafcf4..96c74bfcd3 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java
@@ -8,7 +8,7 @@ import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
@@ -32,7 +32,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconImage;
* Example to add a sprite image and use it in a Symbol Layer
*/
public class CustomSpriteActivity extends AppCompatActivity {
- private static final String TAG = CustomSpriteActivity.class.getSimpleName();
private static final String CUSTOM_ICON = "custom-icon";
private MapboxMap mapboxMap;
@@ -69,7 +68,7 @@ public class CustomSpriteActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
if (point == null) {
- Log.i(TAG, "First click -> Car");
+ Timber.i("First click -> Car");
// Add an icon to reference later
mapboxMap.addImage(CUSTOM_ICON, BitmapFactory.decodeResource(getResources(), R.drawable.ic_car_top));
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GeoJsonClusteringActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GeoJsonClusteringActivity.java
index f1f0d82bd1..0c25c91cdc 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GeoJsonClusteringActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GeoJsonClusteringActivity.java
@@ -6,7 +6,7 @@ import android.support.v4.content.res.ResourcesCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
@@ -37,7 +37,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textSize;
* Sample Activity to show off geojson source clustering and filter usage
*/
public class GeoJsonClusteringActivity extends AppCompatActivity {
- private static final String TAG = GeoJsonClusteringActivity.class.getSimpleName();
private MapView mapView;
private MapboxMap mapboxMap;
@@ -132,7 +131,7 @@ public class GeoJsonClusteringActivity extends AppCompatActivity {
)
);
} catch (MalformedURLException malformedUrlException) {
- Log.e(TAG, "That's not an url... " + malformedUrlException.getMessage());
+ Timber.e("That's not an url... " + malformedUrlException.getMessage());
}
//Add unclustered layer
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RealTimeGeoJsonActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RealTimeGeoJsonActivity.java
index 1743b5e8e7..e995613c96 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RealTimeGeoJsonActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RealTimeGeoJsonActivity.java
@@ -6,10 +6,9 @@ import android.support.annotation.NonNull;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.maps.MapView;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
@@ -67,7 +66,7 @@ public class RealTimeGeoJsonActivity extends AppCompatActivity implements OnMapR
try {
mapboxMap.addSource(new GeoJsonSource(ID_GEOJSON_SOURCE, new URL(URL_GEOJSON_SOURCE)));
}catch (MalformedURLException e){
- Log.e(MapboxConstants.TAG, "Invalid URL", e);
+ Timber.e("Invalid URL", e);
}
// add layer
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java
index 47f112489b..8143efb03d 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java
@@ -7,7 +7,7 @@ import android.support.annotation.RawRes;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.Toast;
@@ -74,7 +74,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
* Sample Activity to show off the runtime style api
*/
public class RuntimeStyleActivity extends AppCompatActivity {
- private static final String TAG = RuntimeStyleActivity.class.getSimpleName();
private MapView mapView;
private MapboxMap mapboxMap;
@@ -294,12 +293,12 @@ public class RuntimeStyleActivity extends AppCompatActivity {
layer = mapboxMap.getLayerAs("parksLayer");
//And get some properties
PropertyValue<Boolean> fillAntialias = layer.getFillAntialias();
- Log.d(TAG, "Fill anti alias: " + fillAntialias.getValue());
+ Timber.d("Fill anti alias: " + fillAntialias.getValue());
layer.setProperties(fillTranslateAnchor(FILL_TRANSLATE_ANCHOR_MAP));
PropertyValue<String> fillTranslateAnchor = layer.getFillTranslateAnchor();
- Log.d(TAG, "Fill translate anchor: " + fillTranslateAnchor.getValue());
+ Timber.d("Fill translate anchor: " + fillTranslateAnchor.getValue());
PropertyValue<String> visibility = layer.getVisibility();
- Log.d(TAG, "Visibility: " + visibility.getValue());
+ Timber.d("Visibility: " + visibility.getValue());
//Get a good look at it all
mapboxMap.animateCamera(CameraUpdateFactory.zoomTo(12));
@@ -348,14 +347,14 @@ public class RuntimeStyleActivity extends AppCompatActivity {
return;
}
- Log.d(TAG, "Updating parks source");
+ Timber.d("Updating parks source");
//change the source
int park = counter < parks.getFeatures().size() - 1 ? counter : 0;
GeoJsonSource source = mapboxMap.getSourceAs("dynamic-park-source");
if (source == null) {
- Log.e(TAG, "Source not found");
+ Timber.e("Source not found");
Toast.makeText(RuntimeStyleActivity.this, "Source not found", Toast.LENGTH_SHORT).show();
return;
}
@@ -427,11 +426,11 @@ public class RuntimeStyleActivity extends AppCompatActivity {
PropertyValue<String> fillColor = layer.getFillColor();
Function<String> function = fillColor.getFunction();
if (function != null) {
- Log.d(TAG, "Fill color base: " + function.getBase());
- Log.d(TAG, "Fill color #stops: " + function.getStops().length);
+ Timber.d("Fill color base: " + function.getBase());
+ Timber.d("Fill color #stops: " + function.getStops().length);
if (function.getStops() != null) {
for (Stop stop : function.getStops()) {
- Log.d(TAG, "Fill color #stops: " + stop);
+ Timber.d("Fill color #stops: " + stop);
}
}
}
@@ -489,7 +488,7 @@ public class RuntimeStyleActivity extends AppCompatActivity {
return;
}
- Log.d(TAG, "Styling filtered fill layer");
+ Timber.d("Styling filtered fill layer");
FillLayer states = (FillLayer) mapboxMap.getLayer("states");
@@ -519,7 +518,7 @@ public class RuntimeStyleActivity extends AppCompatActivity {
return;
}
- Log.d(TAG, "Styling filtered line layer");
+ Timber.d("Styling filtered line layer");
LineLayer counties = (LineLayer) mapboxMap.getLayer("counties");
@@ -550,7 +549,7 @@ public class RuntimeStyleActivity extends AppCompatActivity {
return;
}
- Log.d(TAG, "Styling numeric fill layer");
+ Timber.d("Styling numeric fill layer");
FillLayer regions = (FillLayer) mapboxMap.getLayer("regions");
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTestActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTestActivity.java
index 879945d290..841bf12ed8 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTestActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTestActivity.java
@@ -12,7 +12,6 @@ import com.mapbox.mapboxsdk.testapp.R;
* Test activity for unit test execution
*/
public class RuntimeStyleTestActivity extends AppCompatActivity {
- private static final String TAG = RuntimeStyleTestActivity.class.getSimpleName();
public MapView mapView;
private MapboxMap mapboxMap;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTimingTestActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTimingTestActivity.java
index 711ccab257..b633698cc1 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTimingTestActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTimingTestActivity.java
@@ -20,7 +20,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
* Test activity for unit test execution
*/
public class RuntimeStyleTimingTestActivity extends AppCompatActivity {
- private static final String TAG = RuntimeStyleTimingTestActivity.class.getSimpleName();
public MapView mapView;
private MapboxMap mapboxMap;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java
index d4cecf4db4..2634401407 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java
@@ -9,7 +9,7 @@ import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
@@ -37,7 +37,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleRadius;
* Example on how to use a file:// resource for the style.json
*/
public class StyleFileActivity extends AppCompatActivity {
- private static final String TAG = StyleFileActivity.class.getSimpleName();
private MapboxMap mapboxMap;
private MapView mapView;
@@ -68,7 +67,7 @@ public class StyleFileActivity extends AppCompatActivity {
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- Log.i(TAG, "Loading style file");
+ Timber.i("Loading style file");
new CreateStyleFileTask().execute();
}
});
@@ -87,7 +86,7 @@ public class StyleFileActivity extends AppCompatActivity {
try {
cacheStyleFile = File.createTempFile("my-", ".style.json");
cacheStyleFile.createNewFile();
- Log.i(TAG, "Writing style file to: " + cacheStyleFile.getAbsolutePath());
+ Timber.i("Writing style file to: " + cacheStyleFile.getAbsolutePath());
writeToFile(cacheStyleFile, readRawResource(R.raw.local_style));
} catch (Exception e) {
Toast.makeText(StyleFileActivity.this, "Could not create style file in cache dir", Toast.LENGTH_SHORT).show();
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java
index 493153d1c1..aee55ed712 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java
@@ -7,15 +7,13 @@ import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
-import android.util.Log;
+import timber.log.Timber;
import android.widget.EditText;
import com.mapbox.mapboxsdk.testapp.R;
public class OfflineDownloadRegionDialog extends DialogFragment {
- private static final String LOG_TAG = "OfflineDownloadRegionDialog";
-
public interface DownloadRegionDialogListener {
void onDownloadRegionDialogPositiveClick(String regionName);
}
@@ -48,7 +46,7 @@ public class OfflineDownloadRegionDialog extends DialogFragment {
}).setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- Log.d(LOG_TAG, "Download cancelled.");
+ Timber.d("Download cancelled.");
}
});
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java
index 2a5de869a5..9b4134f479 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java
@@ -6,7 +6,7 @@ import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
-import android.util.Log;
+import timber.log.Timber;
import com.mapbox.mapboxsdk.testapp.R;
@@ -14,8 +14,6 @@ import java.util.ArrayList;
public class OfflineListRegionsDialog extends DialogFragment {
- private static final String LOG_TAG = "OfflineListRegionsDialog";
-
public static final String ITEMS = "ITEMS";
@NonNull
@@ -33,13 +31,13 @@ public class OfflineListRegionsDialog extends DialogFragment {
.setItems(items, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- Log.d(LOG_TAG, "Selected item: " + which);
+ Timber.d("Selected item: " + which);
}
})
.setPositiveButton("Accept", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- Log.d(LOG_TAG, "Dialog dismissed");
+ Timber.d("Dialog dismissed");
}
});
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FontCache.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FontCache.java
index 97bfb90d41..3d885dba18 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FontCache.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FontCache.java
@@ -2,9 +2,7 @@ package com.mapbox.mapboxsdk.testapp.utils;
import android.content.Context;
import android.graphics.Typeface;
-import android.util.Log;
-
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
+import timber.log.Timber;
import java.util.Hashtable;
@@ -19,7 +17,7 @@ public class FontCache {
tf = Typeface.createFromAsset(context.getAssets(), name);
fontCache.put(name, tf);
} catch (Exception exception) {
- Log.e(MapboxConstants.TAG, "Font not found");
+ Timber.e("Font not found");
}
}
return tf;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java
index ee4ae039ee..a00cb230c9 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java
@@ -1,7 +1,7 @@
package com.mapbox.mapboxsdk.testapp.utils;
import android.support.annotation.NonNull;
-import android.util.Log;
+import timber.log.Timber;
import org.json.JSONObject;
@@ -28,7 +28,7 @@ public class OfflineUtils {
String json = jsonObject.toString();
metadata = json.getBytes(JSON_CHARSET);
} catch (Exception exception) {
- Log.e("OfflineUtils", "Failed to encode metadata: " + exception.getMessage());
+ Timber.e("Failed to encode metadata: " + exception.getMessage());
}
return metadata;
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java
index 544e737780..9d1fee4990 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java
@@ -18,7 +18,7 @@ package com.mapbox.mapboxsdk.testapp.utils;
import java.util.ArrayList;
import android.os.SystemClock;
-import android.util.Log;
+import timber.log.Timber;
/**
* A utility class to help log timings splits throughout a method call.
@@ -133,21 +133,21 @@ public class TimingLogger {
}
/**
- * Dumps the timings to the log using Log.d(). If Log.isLoggable was
+ * Dumps the timings to the log using Timber.d(). If Log.isLoggable was
* not enabled to at least the Log.VERBOSE for the specified tag at
* construction or reset() time then this call does nothing.
*/
public void dumpToLog() {
if (mDisabled) return;
- Log.d(mTag, mLabel + ": begin");
+ Timber.d(mLabel + ": begin");
final long first = mSplits.get(0);
long now = first;
for (int i = 1; i < mSplits.size(); i++) {
now = mSplits.get(i);
final String splitLabel = mSplitLabels.get(i);
final long prev = mSplits.get(i - 1);
- Log.d(mTag, mLabel + ": " + (now - prev) + " ms, " + splitLabel);
+ Timber.d(mLabel + ": " + (now - prev) + " ms, " + splitLabel);
}
- Log.d(mTag, mLabel + ": end, " + (now - first) + " ms");
+ Timber.d(mLabel + ": end, " + (now - first) + " ms");
}
}