diff options
62 files changed, 640 insertions, 700 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 98cbeab468..a03ef7e6e5 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -10,6 +10,7 @@ dependencies { compile "com.android.support:design:${supportLibVersion}" compile 'com.squareup.okhttp3:okhttp:3.4.1' compile 'com.mapzen.android:lost:1.1.1' + compile 'com.jakewharton.timber:timber:4.3.1' // Mapbox Android Services compile('com.mapbox.mapboxsdk:mapbox-java-services:1.3.1@jar') { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java index 430b37adb8..991bb49ab3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java @@ -5,7 +5,7 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.os.Build; import android.text.TextUtils; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.BuildConfig; import com.mapbox.mapboxsdk.MapboxAccountManager; @@ -32,7 +32,6 @@ import okhttp3.internal.Util; class HTTPRequest implements Callback { private static OkHttpClient mClient = new OkHttpClient(); - private static final String LOG_TAG = HTTPRequest.class.getName(); private String USER_AGENT_STRING = null; private static final int CONNECTION_ERROR = 0; @@ -108,11 +107,11 @@ class HTTPRequest implements Callback { @Override public void onResponse(Call call, Response response) throws IOException { if (response.isSuccessful()) { - Log.v(LOG_TAG, String.format("[HTTP] Request was successful (code = %d).", response.code())); + Timber.v(String.format("[HTTP] Request was successful (code = %d).", response.code())); } else { // We don't want to call this unsuccessful because a 304 isn't really an error String message = !TextUtils.isEmpty(response.message()) ? response.message() : "No additional information"; - Log.d(LOG_TAG, String.format( + Timber.d(String.format( "[HTTP] Request with response code = %d: %s", response.code(), message)); } @@ -158,14 +157,14 @@ class HTTPRequest implements Callback { String errorMessage = e.getMessage() != null ? e.getMessage() : "Error processing the request"; if (type == TEMPORARY_ERROR) { - Log.d(LOG_TAG, String.format(MapboxConstants.MAPBOX_LOCALE, + Timber.d(String.format(MapboxConstants.MAPBOX_LOCALE, "Request failed due to a temporary error: %s", errorMessage)); } else if (type == CONNECTION_ERROR) { - Log.i(LOG_TAG, String.format(MapboxConstants.MAPBOX_LOCALE, + Timber.i(String.format(MapboxConstants.MAPBOX_LOCALE, "Request failed due to a connection error: %s", errorMessage)); } else { // PERMANENT_ERROR - Log.w(LOG_TAG, String.format(MapboxConstants.MAPBOX_LOCALE, + Timber.w(String.format(MapboxConstants.MAPBOX_LOCALE, "Request failed due to a permanent error: %s", errorMessage)); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java index 9991f1d51a..6b8cdd1b76 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java @@ -8,7 +8,7 @@ import android.location.Location; import android.location.LocationManager; import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.telemetry.TelemetryLocationReceiver; import com.mapzen.android.lost.api.LocationRequest; @@ -30,8 +30,6 @@ import java.util.concurrent.CopyOnWriteArrayList; */ public class LocationServices implements com.mapzen.android.lost.api.LocationListener { - private static final String TAG = "LocationServices"; - private static LocationServices instance; private Context context; @@ -73,7 +71,7 @@ public class LocationServices implements com.mapzen.android.lost.api.LocationLis */ public void toggleGPS(boolean enableGPS) { if (!areLocationPermissionsGranted()) { - Log.w(TAG, "Location Permissions Not Granted Yet. Try again after requesting."); + Timber.w("Location Permissions Not Granted Yet. Try again after requesting."); return; } @@ -130,7 +128,7 @@ public class LocationServices implements com.mapzen.android.lost.api.LocationLis */ @Override public void onLocationChanged(Location location) { -// Log.d(TAG, "onLocationChanged()..." + location); +// Timber.d("onLocationChanged()..." + location); this.lastLocation = location; // Update Listeners @@ -181,7 +179,7 @@ public class LocationServices implements com.mapzen.android.lost.api.LocationLis public boolean areLocationPermissionsGranted() { if ((ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) && (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) { - Log.w(TAG, "Location Permissions Not Granted Yet. Try again after requesting."); + Timber.w("Location Permissions Not Granted Yet. Try again after requesting."); return false; } return true; 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 5840e574c8..15543628d2 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 @@ -36,7 +36,7 @@ import android.support.v4.view.ScaleGestureDetectorCompat; import android.support.v7.app.AlertDialog; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Log; +import timber.log.Timber; import android.view.GestureDetector; import android.view.InputDevice; import android.view.KeyEvent; @@ -449,7 +449,7 @@ public class MapView extends FrameLayout { savedInstanceState.getBoolean(MapboxConstants.STATE_MY_BEARING_TRACKING_DISMISS, true)); } else if (savedInstanceState == null) { // Start Telemetry (authorization determined in initial MapboxEventManager constructor) - Log.i(MapView.class.getCanonicalName(), "MapView start Telemetry..."); + Timber.i("MapView start Telemetry..."); MapboxEventManager eventManager = MapboxEventManager.getMapboxEventManager(); eventManager.initialize(getContext(), getAccessToken()); } @@ -1295,12 +1295,12 @@ public class MapView extends FrameLayout { // NaN and Infinite checks to prevent JSON errors at send to server time if (Double.isNaN(tapLatLng.getLatitude()) || Double.isNaN(tapLatLng.getLongitude())) { - Log.d(MapView.class.getSimpleName(), "trackGestureEvent() has a NaN lat or lon. Returning."); + Timber.d("trackGestureEvent() has a NaN lat or lon. Returning."); return; } if (Double.isInfinite(tapLatLng.getLatitude()) || Double.isInfinite(tapLatLng.getLongitude())) { - Log.d(MapView.class.getSimpleName(), "trackGestureEvent() has an Infinite lat or lon. Returning."); + Timber.d("trackGestureEvent() has an Infinite lat or lon. Returning."); return; } @@ -1327,12 +1327,12 @@ public class MapView extends FrameLayout { // NaN and Infinite checks to prevent JSON errors at send to server time if (Double.isNaN(tapLatLng.getLatitude()) || Double.isNaN(tapLatLng.getLongitude())) { - Log.d(MapView.class.getSimpleName(), "trackGestureDragEndEvent() has a NaN lat or lon. Returning."); + Timber.d("trackGestureDragEndEvent() has a NaN lat or lon. Returning."); return; } if (Double.isInfinite(tapLatLng.getLatitude()) || Double.isInfinite(tapLatLng.getLongitude())) { - Log.d(MapView.class.getSimpleName(), "trackGestureDragEndEvent() has an Infinite lat or lon. Returning."); + Timber.d("trackGestureDragEndEvent() has an Infinite lat or lon. Returning."); return; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java index 8e42e794be..fa856a7aa7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java @@ -10,7 +10,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; import android.support.v4.util.Pools; -import android.util.Log; +import timber.log.Timber; import android.view.View; import android.view.ViewGroup; @@ -55,7 +55,6 @@ import java.util.List; * </p> */ public class MapboxMap { - private static final String TAG = MapboxMap.class.getSimpleName(); private MapView mapView; private UiSettings uiSettings; @@ -119,7 +118,7 @@ public class MapboxMap { //noinspection unchecked return (T) getMapView().getNativeMapView().getLayer(layerId); } catch (ClassCastException e) { - Log.e(TAG, String.format("Layer: %s is a different type: %s", layerId, e.getMessage())); + Timber.e(String.format("Layer: %s is a different type: %s", layerId, e.getMessage())); return null; } } @@ -187,7 +186,7 @@ public class MapboxMap { //noinspection unchecked return (T) getMapView().getNativeMapView().getSource(sourceId); } catch (ClassCastException e) { - Log.e(TAG, String.format("Source: %s is a different type: %s", sourceId, e.getMessage())); + Timber.e(String.format("Source: %s is a different type: %s", sourceId, e.getMessage())); return null; } } @@ -260,7 +259,7 @@ public class MapboxMap { public void setMinZoom( @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, to = MapboxConstants.MAXIMUM_ZOOM) double minZoom) { if ((minZoom < MapboxConstants.MINIMUM_ZOOM) || (minZoom > MapboxConstants.MAXIMUM_ZOOM)) { - Log.e(MapboxConstants.TAG, "Not setting minZoom, value is in unsupported range: " + minZoom); + Timber.e("Not setting minZoom, value is in unsupported range: " + minZoom); return; } minZoomLevel = minZoom; @@ -297,7 +296,7 @@ public class MapboxMap { public void setMaxZoom( @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, to = MapboxConstants.MAXIMUM_ZOOM) double maxZoom) { if ((maxZoom < MapboxConstants.MINIMUM_ZOOM) || (maxZoom > MapboxConstants.MAXIMUM_ZOOM)) { - Log.e(MapboxConstants.TAG, "Not setting maxZoom, value is in unsupported range: " + maxZoom); + Timber.e("Not setting maxZoom, value is in unsupported range: " + maxZoom); return; } maxZoomLevel = maxZoom; @@ -1150,7 +1149,7 @@ public class MapboxMap { @UiThread public void selectMarker(@NonNull Marker marker) { if (marker == null) { - Log.w(MapboxConstants.TAG, "marker was null, so just returning"); + Timber.w("marker was null, so just returning"); return; } annotationManager.selectMarker(marker, this); @@ -1476,7 +1475,7 @@ public class MapboxMap { @UiThread public void setMyLocationEnabled(boolean enabled) { if (!mapView.isPermissionsAccepted()) { - Log.e(MapboxConstants.TAG, "Could not activate user location tracking: " + Timber.e("Could not activate user location tracking: " + "user did not accept the permission or permissions were not requested."); return; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java index cdd275ee34..c3d12c4a7a 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java @@ -9,7 +9,7 @@ import android.os.Build; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.util.DisplayMetrics; -import android.util.Log; +import timber.log.Timber; import android.view.Surface; import com.mapbox.mapboxsdk.annotations.Icon; @@ -149,14 +149,14 @@ final class NativeMapView { if (width > 65535) { // we have seen edge cases where devices return incorrect values #6111 - Log.e(MapboxConstants.TAG, "Device returned an out of range width size, " + + Timber.e("Device returned an out of range width size, " + "capping value at 65535 instead of " + width); width = 65535; } if (height > 65535) { // we have seen edge cases where devices return incorrect values #6111 - Log.e(MapboxConstants.TAG, "Device returned an out of range height size, " + + Timber.e("Device returned an out of range height size, " + "capping value at 65535 instead of " + height); height = 65535; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java index 85695ec6c9..7278cdd673 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java @@ -7,7 +7,7 @@ import android.content.IntentFilter; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.support.annotation.NonNull; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.MapboxAccountManager; @@ -19,7 +19,6 @@ import java.util.concurrent.CopyOnWriteArrayList; * Not public api. */ public class ConnectivityReceiver extends BroadcastReceiver { - private static final String TAG = ConnectivityReceiver.class.getSimpleName(); private static ConnectivityReceiver INSTANCE; /** @@ -49,7 +48,7 @@ public class ConnectivityReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { boolean connected = isConnected(context); - Log.v(TAG, "Connected: " + connected); + Timber.v("Connected: " + connected); //Loop over listeners for (ConnectivityListener listener : listeners) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java index 80d5ff7db0..2ecc23a420 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java @@ -7,7 +7,7 @@ import android.os.Environment; import android.os.Handler; import android.os.Looper; import android.support.annotation.NonNull; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.MapboxAccountManager; import com.mapbox.mapboxsdk.constants.MapboxConstants; @@ -20,8 +20,6 @@ import java.io.File; */ public class OfflineManager { - private final static String LOG_TAG = "OfflineManager"; - // // Static methods // @@ -119,9 +117,9 @@ public class OfflineManager { MapboxConstants.KEY_META_DATA_SET_STORAGE_EXTERNAL, MapboxConstants.DEFAULT_SET_STORAGE_EXTERNAL); } catch (PackageManager.NameNotFoundException e) { - Log.e(LOG_TAG, "Failed to read the package metadata: " + e.getMessage()); + Timber.e("Failed to read the package metadata: " + e.getMessage()); } catch (Exception e) { - Log.e(LOG_TAG, "Failed to read the storage key: " + e.getMessage()); + Timber.e("Failed to read the storage key: " + e.getMessage()); } String databasePath = null; @@ -130,7 +128,7 @@ public class OfflineManager { // Try getting the external storage path databasePath = context.getExternalFilesDir(null).getAbsolutePath(); } catch (NullPointerException e) { - Log.e(LOG_TAG, "Failed to obtain the external storage path: " + e.getMessage()); + Timber.e("Failed to obtain the external storage path: " + e.getMessage()); } } @@ -158,7 +156,7 @@ public class OfflineManager { return true; } - Log.w(LOG_TAG, "External storage was requested but it isn't readable. For API level < 18" + Timber.w("External storage was requested but it isn't readable. For API level < 18" + " make sure you've requested READ_EXTERNAL_STORAGE or WRITE_EXTERNAL_STORAGE" + " permissions in your app Manifest (defaulting to internal storage)."); @@ -175,10 +173,10 @@ public class OfflineManager { File file = new File(path); if (file.exists()) { file.delete(); - Log.d(LOG_TAG, "Old ambient cache database deleted to save space: " + path); + Timber.d("Old ambient cache database deleted to save space: " + path); } } catch (Exception e) { - Log.e(LOG_TAG, "Failed to delete old ambient cache database: " + e.getMessage()); + Timber.e("Failed to delete old ambient cache database: " + e.getMessage()); } } }).start(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java index f52f20083a..0dcd34b6e6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java @@ -4,7 +4,7 @@ import android.os.Handler; import android.os.Looper; import android.support.annotation.IntDef; import android.support.annotation.NonNull; -import android.util.Log; +import timber.log.Timber; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -16,8 +16,6 @@ import java.lang.annotation.RetentionPolicy; */ public class OfflineRegion { - private final static String LOG_TAG = "OfflineRegion"; - // // Static methods // @@ -404,7 +402,7 @@ public class OfflineRegion { super.finalize(); destroyOfflineRegion(); } catch (Throwable throwable) { - Log.e(LOG_TAG, "Failed to finalize OfflineRegion: " + throwable.getMessage()); + Timber.e("Failed to finalize OfflineRegion: " + throwable.getMessage()); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java index 204c154743..542ec46e1f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java @@ -1,13 +1,12 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.Nullable; -import android.util.Log; +import timber.log.Timber; /** * Properties for Layer */ public class PropertyValue<T> { - private static final String TAG = PropertyValue.class.getSimpleName(); private final Object value; @@ -33,7 +32,7 @@ public class PropertyValue<T> { //noinspection unchecked return (Function<T>) value; } else { - Log.w(TAG, "not a function, try value"); + Timber.w("not a function, try value"); return null; } } @@ -44,7 +43,7 @@ public class PropertyValue<T> { //noinspection unchecked return (T) value; } else { - Log.w(TAG, "not a value, try function"); + Timber.w("not a value, try function"); return null; } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/GzipRequestInterceptor.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/GzipRequestInterceptor.java index 1b13e9502f..bc7d8fff87 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/GzipRequestInterceptor.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/GzipRequestInterceptor.java @@ -1,6 +1,6 @@ package com.mapbox.mapboxsdk.telemetry; -import android.util.Log; +import timber.log.Timber; import java.io.IOException; import okhttp3.Interceptor; import okhttp3.MediaType; @@ -17,16 +17,14 @@ import okio.Okio; */ public final class GzipRequestInterceptor implements Interceptor { - private static final String TAG = "GzipRequestInterceptor"; - @Override public Response intercept(Interceptor.Chain chain) throws IOException { Request originalRequest = chain.request(); if (originalRequest.body() == null || originalRequest.header("Content-Encoding") != null) { - Log.d(TAG, "Not compressing"); + Timber.d("Not compressing"); return chain.proceed(originalRequest); } - Log.d(TAG, "Compressing"); + Timber.d("Compressing"); Request compressedRequest = originalRequest.newBuilder() .header("Content-Encoding", "gzip") .method(originalRequest.method(), gzip(originalRequest.body())) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java index bedb54ca46..265a522e0a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java @@ -21,7 +21,7 @@ import android.support.annotation.NonNull; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.DisplayMetrics; -import android.util.Log; +import timber.log.Timber; import android.view.WindowManager; import com.mapbox.mapboxsdk.BuildConfig; @@ -60,8 +60,6 @@ import okhttp3.internal.Util; */ public class MapboxEventManager { - private static final String TAG = "MapboxEventManager"; - private static MapboxEventManager mapboxEventManager = null; private boolean initialized = false; @@ -117,10 +115,10 @@ public class MapboxEventManager { */ public void initialize(@NonNull Context context, @NonNull String accessToken) { - Log.i(TAG, "Telemetry initialize() called..."); + Timber.i("Telemetry initialize() called..."); if (initialized) { - Log.i(TAG, "Mapbox Telemetry has already been initialized."); + Timber.i("Mapbox Telemetry has already been initialized."); return; } @@ -133,7 +131,7 @@ public class MapboxEventManager { try { messageDigest = MessageDigest.getInstance("SHA-1"); } catch (NoSuchAlgorithmException e) { - Log.w(TAG, "Error getting Encryption Algorithm: " + e); + Timber.w("Error getting Encryption Algorithm: " + e); } // Create Initial Session Id @@ -142,7 +140,7 @@ public class MapboxEventManager { SharedPreferences prefs = context.getSharedPreferences(MapboxConstants.MAPBOX_SHARED_PREFERENCES_FILE, Context.MODE_PRIVATE); // Determine if Telemetry Should Be Enabled - Log.i(TAG, "Right before Telemetry set enabled in initialized()"); + Timber.i("Right before Telemetry set enabled in initialized()"); setTelemetryEnabled(prefs.getBoolean(MapboxConstants.MAPBOX_SHARED_PREFERENCE_KEY_TELEMETRY_ENABLED, true)); // Load / Create Vendor Id @@ -169,7 +167,7 @@ public class MapboxEventManager { String stagingAccessToken = appInfo.metaData.getString(MapboxConstants.KEY_META_DATA_STAGING_ACCESS_TOKEN); if (TextUtils.isEmpty(stagingURL) || TextUtils.isEmpty(stagingAccessToken)) { - Log.d(TAG, "Looking in SharedPreferences for Staging Credentials"); + Timber.d("Looking in SharedPreferences for Staging Credentials"); stagingURL = prefs.getString(MapboxConstants.MAPBOX_SHARED_PREFERENCE_KEY_TELEMETRY_STAGING_URL, null); stagingAccessToken = prefs.getString(MapboxConstants.MAPBOX_SHARED_PREFERENCE_KEY_TELEMETRY_STAGING_ACCESS_TOKEN, null); } @@ -187,7 +185,7 @@ public class MapboxEventManager { } } catch (Exception e) { - Log.e(TAG, "Error Trying to load Staging Credentials: " + e.toString()); + Timber.e("Error Trying to load Staging Credentials: " + e.toString()); } // Register for battery updates @@ -222,7 +220,7 @@ public class MapboxEventManager { } } } catch (Exception e) { - Log.w(MapboxConstants.TAG, "Error checking for Telemetry Service Config: " + e); + Timber.w("Error checking for Telemetry Service Config: " + e); } throw new TelemetryServiceNotConfiguredException(); } @@ -240,40 +238,40 @@ public class MapboxEventManager { * @param telemetryEnabled True to start telemetry, false to stop it */ public void setTelemetryEnabled(boolean telemetryEnabled) { - Log.i(TAG, "setTelemetryEnabled(); this.telemetryEnabled = " + this.telemetryEnabled + "; telemetryEnabled = " + telemetryEnabled); + Timber.i("setTelemetryEnabled(); this.telemetryEnabled = " + this.telemetryEnabled + "; telemetryEnabled = " + telemetryEnabled); if (this.telemetryEnabled == telemetryEnabled) { - Log.d(TAG, "No need to start / stop telemetry as it's already in that state."); + Timber.d("No need to start / stop telemetry as it's already in that state."); return; } if (telemetryEnabled) { - Log.d(TAG, "Starting Telemetry Up!"); + Timber.d("Starting Telemetry Up!"); // Start It Up context.startService(new Intent(context, TelemetryService.class)); // Make sure Ambient Mode is started at a minimum if (LocationServices.getLocationServices(context).areLocationPermissionsGranted()) { - Log.i(TAG, "Permissions are good, see if GPS is enabled and if not then setup Ambient."); + Timber.i("Permissions are good, see if GPS is enabled and if not then setup Ambient."); if (LocationServices.getLocationServices(context).isGPSEnabled()) { LocationServices.getLocationServices(context).toggleGPS(false); } } else { // Start timer that checks for Permissions - Log.i(TAG, "Permissions are not good. Need to do some looping to check on stuff."); + Timber.i("Permissions are not good. Need to do some looping to check on stuff."); final Handler permsHandler = new Handler(); Runnable runnable = new Runnable() { @Override public void run() { if (LocationServices.getLocationServices(context).areLocationPermissionsGranted()) { - Log.i(TAG, "Permissions finally granted, so starting Ambient if GPS isn't already enabled"); + Timber.i("Permissions finally granted, so starting Ambient if GPS isn't already enabled"); // Start Ambient if (LocationServices.getLocationServices(context).isGPSEnabled()) { LocationServices.getLocationServices(context).toggleGPS(false); } } else { // Restart Handler - Log.i(TAG, "Permissions not granted yet... let's try again in 30 seconds"); + Timber.i("Permissions not granted yet... let's try again in 30 seconds"); permsHandler.postDelayed(this, 1000 * 30); } } @@ -285,7 +283,7 @@ public class MapboxEventManager { timer = new Timer(); timer.schedule(new FlushEventsTimerTask(), flushDelayInitialInMillis, flushDelayInMillis); } else { - Log.d(TAG, "Shutting Telemetry Down"); + Timber.d("Shutting Telemetry Down"); // Shut It Down events.removeAllElements(); context.stopService(new Intent(context, TelemetryService.class)); @@ -311,7 +309,7 @@ public class MapboxEventManager { * NOTE: Permission set to package private to enable only telemetry code to use this. */ void flushEventsQueueImmediately() { - Log.i(TAG, "flushEventsQueueImmediately() called..."); + Timber.i("flushEventsQueueImmediately() called..."); new FlushTheEventsTask().execute(); } @@ -325,7 +323,7 @@ public class MapboxEventManager { } events.add(event); if (events.size() == FLUSH_EVENTS_CAP) { - Log.d(TAG, "eventsSize == flushCap so send data."); + Timber.d("eventsSize == flushCap so send data."); flushEventsQueueImmediately(); } } @@ -419,7 +417,7 @@ public class MapboxEventManager { eventWithAttributes.put(MapboxEvent.ATTRIBUTE_CELLULAR_NETWORK_TYPE, getCellularNetworkType()); eventWithAttributes.put(MapboxEvent.ATTRIBUTE_WIFI, getConnectedToWifi()); } else { - Log.w(TAG, "This is not an event type in the Events Data Model."); + Timber.w("This is not an event type in the Events Data Model."); return; } @@ -441,7 +439,7 @@ public class MapboxEventManager { // Send to Server Immediately flushEventsQueueImmediately(); - Log.d(TAG, "turnstile event pushed."); + Timber.d("turnstile event pushed."); } /** @@ -466,7 +464,7 @@ public class MapboxEventManager { return hex; } } catch (Exception e) { - Log.w(TAG, "Error encoding string, will return in original form." + e); + Timber.w("Error encoding string, will return in original form." + e); } return string; } @@ -602,7 +600,7 @@ public class MapboxEventManager { status = true; } } catch (Exception e) { - Log.w(TAG, "Error getting Wifi Connection Status: " + e); + Timber.w("Error getting Wifi Connection Status: " + e); status = false; } } @@ -620,13 +618,13 @@ public class MapboxEventManager { protected Void doInBackground(Void... voids) { if (events.isEmpty()) { - Log.d(TAG, "No events in the queue to send so returning."); + Timber.d("No events in the queue to send so returning."); return null; } // Check for NetworkConnectivity if (!MapboxAccountManager.getInstance().isConnected()) { - Log.w(TAG, "Not connected to network, so empty events cache and return without attempting to send events"); + Timber.w("Not connected to network, so empty events cache and return without attempting to send events"); // Make sure that events don't pile up when Offline // and thus impact available memory over time. events.removeAllElements(); @@ -747,10 +745,10 @@ public class MapboxEventManager { .post(body) .build(); response = client.newCall(request).execute(); - Log.d(TAG, "response code = " + response.code() + " for events " + events.size()); + Timber.d("response code = " + response.code() + " for events " + events.size()); } catch (Exception e) { - Log.e(TAG, "FlushTheEventsTask borked: " + e); + Timber.e("FlushTheEventsTask borked: " + e); e.printStackTrace(); } finally { if (response != null && response.body() != null) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/TelemetryService.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/TelemetryService.java index 008f355f29..bfa275d5a1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/TelemetryService.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/TelemetryService.java @@ -8,15 +8,13 @@ import android.content.pm.ServiceInfo; import android.os.AsyncTask; import android.os.IBinder; import android.support.annotation.Nullable; -import android.util.Log; +import timber.log.Timber; /** * Manages Startup and Shutdown of Telemetry resources */ public class TelemetryService extends Service { - private static final String TAG = "TelemetryService"; - private TelemetryLocationReceiver telemetryLocationReceiver = null; /** @@ -53,7 +51,7 @@ public class TelemetryService extends Service { public void onCreate() { super.onCreate(); - Log.i(TAG, "onCreate() called"); + Timber.i("onCreate() called"); // Enable Location Listening for lifecycle of app IntentFilter filter = new IntentFilter(TelemetryLocationReceiver.INTENT_STRING); @@ -128,7 +126,7 @@ public class TelemetryService extends Service { @Override public int onStartCommand(Intent intent, int flags, int startId) { - Log.i(TAG, "onStartCommand() called"); + Timber.i("onStartCommand() called"); return START_NOT_STICKY; } @@ -142,13 +140,13 @@ public class TelemetryService extends Service { try { Thread.sleep(1000); } catch (Exception e) { - Log.e(TAG, "Error while trying to sleep for 1 second: " + e); + Timber.e("Error while trying to sleep for 1 second: " + e); } try { unregisterReceiver(telemetryLocationReceiver); } catch (IllegalArgumentException e) { - Log.e(TAG, "Error when unregisterReceiver: " + e); + Timber.e("Error when unregisterReceiver: " + e); } } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseActivityTest.java index b00255a6c7..44a98ad664 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseActivityTest.java @@ -4,9 +4,8 @@ import android.app.Activity; import android.support.test.espresso.Espresso; import android.support.test.espresso.IdlingResourceTimeoutException; import android.support.test.rule.ActivityTestRule; -import android.util.Log; +import timber.log.Timber; -import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.testapp.R; import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource; @@ -31,13 +30,13 @@ public abstract class BaseActivityTest { @Before public void beforeTest() { try { - Log.e(MapboxConstants.TAG, "@Before test: register idle resource"); + Timber.e("@Before test: register idle resource"); idlingResource = new OnMapReadyIdlingResource(rule.getActivity()); Espresso.registerIdlingResources(idlingResource); checkViewIsDisplayed(R.id.mapView); mapboxMap = idlingResource.getMapboxMap(); } catch (IdlingResourceTimeoutException e) { - Log.e(MapboxConstants.TAG, "Idling resource timed out. Couldn't not validate if map is ready."); + Timber.e("Idling resource timed out. Couldn't not validate if map is ready."); throw new RuntimeException("Could not start test for " + getActivityClass().getSimpleName() + ".\n" + "The ViewHierarchy doesn't contain a view with resource id = R.id.mapView or \n" + "the Activity doesn't contain an instance variable with a name equal to mapboxMap.\n" + @@ -64,7 +63,7 @@ public abstract class BaseActivityTest { @After public void afterTest() { - Log.e(MapboxConstants.TAG, "@After test: unregister idle resource"); + Timber.e("@After test: unregister idle resource"); Espresso.unregisterIdlingResources(idlingResource); } } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerStyleTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerStyleTest.java index d4c00c5f05..1b954259f6 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerStyleTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerStyleTest.java @@ -5,7 +5,7 @@ import android.graphics.Color; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.style.layers.BackgroundLayer; @@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; */ @RunWith(AndroidJUnit4.class) public class BackgroundLayerStyleTest extends BaseStyleTest { - private static final String TAG = BackgroundLayerStyleTest.class.getSimpleName(); @Rule public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); @@ -51,9 +50,9 @@ public class BackgroundLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); - Log.i(TAG, "Retrieving layer"); + Timber.i("Retrieving layer"); layer = mapboxMap.getLayerAs("background"); - Log.i(TAG, "visibility"); + Timber.i("visibility"); assertNotNull(layer); //Get initial @@ -70,9 +69,9 @@ public class BackgroundLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); - Log.i(TAG, "Retrieving layer"); + Timber.i("Retrieving layer"); layer = mapboxMap.getLayerAs("background"); - Log.i(TAG, "background-color"); + Timber.i("background-color"); assertNotNull(layer); //Set and Get @@ -86,9 +85,9 @@ public class BackgroundLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); - Log.i(TAG, "Retrieving layer"); + Timber.i("Retrieving layer"); layer = mapboxMap.getLayerAs("background"); - Log.i(TAG, "background-color"); + Timber.i("background-color"); assertNotNull(layer); //Set and Get @@ -102,9 +101,9 @@ public class BackgroundLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); - Log.i(TAG, "Retrieving layer"); + Timber.i("Retrieving layer"); layer = mapboxMap.getLayerAs("background"); - Log.i(TAG, "background-pattern"); + Timber.i("background-pattern"); assertNotNull(layer); //Set and Get @@ -118,9 +117,9 @@ public class BackgroundLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); - Log.i(TAG, "Retrieving layer"); + Timber.i("Retrieving layer"); layer = mapboxMap.getLayerAs("background"); - Log.i(TAG, "background-opacity"); + Timber.i("background-opacity"); assertNotNull(layer); //Set and Get diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java index b56c8f648f..ea4bd839cf 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java @@ -5,7 +5,7 @@ import android.graphics.Color; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.style.layers.BackgroundLayer; @@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; */ @RunWith(AndroidJUnit4.class) public class BackgroundLayerTest extends BaseStyleTest { - private static final String TAG = BackgroundLayerTest.class.getSimpleName(); @Rule public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); @@ -51,9 +50,9 @@ public class BackgroundLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); - Log.i(TAG, "Retrieving layer"); + Timber.i("Retrieving layer"); layer = mapboxMap.getLayerAs("background"); - Log.i(TAG, "visibility"); + Timber.i("visibility"); assertNotNull(layer); //Get initial @@ -70,9 +69,9 @@ public class BackgroundLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); - Log.i(TAG, "Retrieving layer"); + Timber.i("Retrieving layer"); layer = mapboxMap.getLayerAs("background"); - Log.i(TAG, "background-color"); + Timber.i("background-color"); assertNotNull(layer); //Set and Get @@ -86,9 +85,9 @@ public class BackgroundLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); - Log.i(TAG, "Retrieving layer"); + Timber.i("Retrieving layer"); layer = mapboxMap.getLayerAs("background"); - Log.i(TAG, "background-color"); + Timber.i("background-color"); assertNotNull(layer); //Set and Get @@ -102,9 +101,9 @@ public class BackgroundLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); - Log.i(TAG, "Retrieving layer"); + Timber.i("Retrieving layer"); layer = mapboxMap.getLayerAs("background"); - Log.i(TAG, "background-pattern"); + Timber.i("background-pattern"); assertNotNull(layer); //Set and Get @@ -118,9 +117,9 @@ public class BackgroundLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); - Log.i(TAG, "Retrieving layer"); + Timber.i("Retrieving layer"); layer = mapboxMap.getLayerAs("background"); - Log.i(TAG, "background-opacity"); + Timber.i("background-opacity"); assertNotNull(layer); //Set and Get diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerStyleTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerStyleTest.java index a7301962d1..635c88fccf 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerStyleTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerStyleTest.java @@ -5,7 +5,7 @@ import android.graphics.Color; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.style.layers.CircleLayer; @@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; */ @RunWith(AndroidJUnit4.class) public class CircleLayerStyleTest extends BaseStyleTest { - private static final String TAG = CircleLayerStyleTest.class.getSimpleName(); @Rule public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); @@ -52,14 +51,14 @@ public class CircleLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "visibility"); + Timber.i("visibility"); assertNotNull(layer); //Get initial @@ -77,14 +76,14 @@ public class CircleLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-radius"); + Timber.i("circle-radius"); assertNotNull(layer); //Set and Get @@ -99,14 +98,14 @@ public class CircleLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-color"); + Timber.i("circle-color"); assertNotNull(layer); //Set and Get @@ -121,14 +120,14 @@ public class CircleLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-color"); + Timber.i("circle-color"); assertNotNull(layer); //Set and Get @@ -143,14 +142,14 @@ public class CircleLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-blur"); + Timber.i("circle-blur"); assertNotNull(layer); //Set and Get @@ -165,14 +164,14 @@ public class CircleLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-opacity"); + Timber.i("circle-opacity"); assertNotNull(layer); //Set and Get @@ -187,14 +186,14 @@ public class CircleLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-translate"); + Timber.i("circle-translate"); assertNotNull(layer); //Set and Get @@ -209,14 +208,14 @@ public class CircleLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-translate-anchor"); + Timber.i("circle-translate-anchor"); assertNotNull(layer); //Set and Get @@ -231,14 +230,14 @@ public class CircleLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-pitch-scale"); + Timber.i("circle-pitch-scale"); assertNotNull(layer); //Set and Get diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java index 8b0f1af17b..148af08e3c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java @@ -5,7 +5,7 @@ import android.graphics.Color; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.style.layers.CircleLayer; @@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; */ @RunWith(AndroidJUnit4.class) public class CircleLayerTest extends BaseStyleTest { - private static final String TAG = CircleLayerTest.class.getSimpleName(); @Rule public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); @@ -52,14 +51,14 @@ public class CircleLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "visibility"); + Timber.i("visibility"); assertNotNull(layer); //Get initial @@ -77,14 +76,14 @@ public class CircleLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-radius"); + Timber.i("circle-radius"); assertNotNull(layer); //Set and Get @@ -99,14 +98,14 @@ public class CircleLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-color"); + Timber.i("circle-color"); assertNotNull(layer); //Set and Get @@ -121,14 +120,14 @@ public class CircleLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-color"); + Timber.i("circle-color"); assertNotNull(layer); //Set and Get @@ -143,14 +142,14 @@ public class CircleLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-blur"); + Timber.i("circle-blur"); assertNotNull(layer); //Set and Get @@ -165,14 +164,14 @@ public class CircleLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-opacity"); + Timber.i("circle-opacity"); assertNotNull(layer); //Set and Get @@ -187,14 +186,14 @@ public class CircleLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-translate"); + Timber.i("circle-translate"); assertNotNull(layer); //Set and Get @@ -209,14 +208,14 @@ public class CircleLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-translate-anchor"); + Timber.i("circle-translate-anchor"); assertNotNull(layer); //Set and Get @@ -231,14 +230,14 @@ public class CircleLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new CircleLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "circle-pitch-scale"); + Timber.i("circle-pitch-scale"); assertNotNull(layer); //Set and Get diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerStyleTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerStyleTest.java index 46ad1da879..4043b07789 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerStyleTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerStyleTest.java @@ -5,7 +5,7 @@ import android.graphics.Color; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.style.layers.FillLayer; @@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; */ @RunWith(AndroidJUnit4.class) public class FillLayerStyleTest extends BaseStyleTest { - private static final String TAG = FillLayerStyleTest.class.getSimpleName(); @Rule public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); @@ -52,14 +51,14 @@ public class FillLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "visibility"); + Timber.i("visibility"); assertNotNull(layer); //Get initial @@ -77,14 +76,14 @@ public class FillLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-antialias"); + Timber.i("fill-antialias"); assertNotNull(layer); //Set and Get @@ -99,14 +98,14 @@ public class FillLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-opacity"); + Timber.i("fill-opacity"); assertNotNull(layer); //Set and Get @@ -121,14 +120,14 @@ public class FillLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-color"); + Timber.i("fill-color"); assertNotNull(layer); //Set and Get @@ -143,14 +142,14 @@ public class FillLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-color"); + Timber.i("fill-color"); assertNotNull(layer); //Set and Get @@ -165,14 +164,14 @@ public class FillLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-outline-color"); + Timber.i("fill-outline-color"); assertNotNull(layer); //Set and Get @@ -187,14 +186,14 @@ public class FillLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-outline-color"); + Timber.i("fill-outline-color"); assertNotNull(layer); //Set and Get @@ -209,14 +208,14 @@ public class FillLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-translate"); + Timber.i("fill-translate"); assertNotNull(layer); //Set and Get @@ -231,14 +230,14 @@ public class FillLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-translate-anchor"); + Timber.i("fill-translate-anchor"); assertNotNull(layer); //Set and Get @@ -253,14 +252,14 @@ public class FillLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-pattern"); + Timber.i("fill-pattern"); assertNotNull(layer); //Set and Get diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java index 593d444bc4..bbac78c11b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java @@ -5,7 +5,7 @@ import android.graphics.Color; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.style.layers.FillLayer; @@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; */ @RunWith(AndroidJUnit4.class) public class FillLayerTest extends BaseStyleTest { - private static final String TAG = FillLayerTest.class.getSimpleName(); @Rule public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); @@ -52,14 +51,14 @@ public class FillLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "visibility"); + Timber.i("visibility"); assertNotNull(layer); //Get initial @@ -77,14 +76,14 @@ public class FillLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-antialias"); + Timber.i("fill-antialias"); assertNotNull(layer); //Set and Get @@ -99,14 +98,14 @@ public class FillLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-opacity"); + Timber.i("fill-opacity"); assertNotNull(layer); //Set and Get @@ -121,14 +120,14 @@ public class FillLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-color"); + Timber.i("fill-color"); assertNotNull(layer); //Set and Get @@ -143,14 +142,14 @@ public class FillLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-color"); + Timber.i("fill-color"); assertNotNull(layer); //Set and Get @@ -165,14 +164,14 @@ public class FillLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-outline-color"); + Timber.i("fill-outline-color"); assertNotNull(layer); //Set and Get @@ -187,14 +186,14 @@ public class FillLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-outline-color"); + Timber.i("fill-outline-color"); assertNotNull(layer); //Set and Get @@ -209,14 +208,14 @@ public class FillLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-translate"); + Timber.i("fill-translate"); assertNotNull(layer); //Set and Get @@ -231,14 +230,14 @@ public class FillLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-translate-anchor"); + Timber.i("fill-translate-anchor"); assertNotNull(layer); //Set and Get @@ -253,14 +252,14 @@ public class FillLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new FillLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "fill-pattern"); + Timber.i("fill-pattern"); assertNotNull(layer); //Set and Get diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerStyleTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerStyleTest.java index 09c1ae797d..e4401c088a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerStyleTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerStyleTest.java @@ -5,7 +5,7 @@ import android.graphics.Color; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.style.layers.LineLayer; @@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; */ @RunWith(AndroidJUnit4.class) public class LineLayerStyleTest extends BaseStyleTest { - private static final String TAG = LineLayerStyleTest.class.getSimpleName(); @Rule public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); @@ -52,14 +51,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "visibility"); + Timber.i("visibility"); assertNotNull(layer); //Get initial @@ -77,14 +76,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-cap"); + Timber.i("line-cap"); assertNotNull(layer); //Set and Get @@ -99,14 +98,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-join"); + Timber.i("line-join"); assertNotNull(layer); //Set and Get @@ -121,14 +120,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-miter-limit"); + Timber.i("line-miter-limit"); assertNotNull(layer); //Set and Get @@ -143,14 +142,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-round-limit"); + Timber.i("line-round-limit"); assertNotNull(layer); //Set and Get @@ -165,14 +164,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-opacity"); + Timber.i("line-opacity"); assertNotNull(layer); //Set and Get @@ -187,14 +186,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-color"); + Timber.i("line-color"); assertNotNull(layer); //Set and Get @@ -209,14 +208,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-color"); + Timber.i("line-color"); assertNotNull(layer); //Set and Get @@ -231,14 +230,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-translate"); + Timber.i("line-translate"); assertNotNull(layer); //Set and Get @@ -253,14 +252,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-translate-anchor"); + Timber.i("line-translate-anchor"); assertNotNull(layer); //Set and Get @@ -275,14 +274,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-width"); + Timber.i("line-width"); assertNotNull(layer); //Set and Get @@ -297,14 +296,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-gap-width"); + Timber.i("line-gap-width"); assertNotNull(layer); //Set and Get @@ -319,14 +318,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-offset"); + Timber.i("line-offset"); assertNotNull(layer); //Set and Get @@ -341,14 +340,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-blur"); + Timber.i("line-blur"); assertNotNull(layer); //Set and Get @@ -363,14 +362,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-dasharray"); + Timber.i("line-dasharray"); assertNotNull(layer); //Set and Get @@ -385,14 +384,14 @@ public class LineLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-pattern"); + Timber.i("line-pattern"); assertNotNull(layer); //Set and Get diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java index 15fd35f0a8..10b5e5d1b9 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java @@ -5,7 +5,7 @@ import android.graphics.Color; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.style.layers.LineLayer; @@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; */ @RunWith(AndroidJUnit4.class) public class LineLayerTest extends BaseStyleTest { - private static final String TAG = LineLayerTest.class.getSimpleName(); @Rule public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); @@ -52,14 +51,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "visibility"); + Timber.i("visibility"); assertNotNull(layer); //Get initial @@ -77,14 +76,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-cap"); + Timber.i("line-cap"); assertNotNull(layer); //Set and Get @@ -99,14 +98,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-join"); + Timber.i("line-join"); assertNotNull(layer); //Set and Get @@ -121,14 +120,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-miter-limit"); + Timber.i("line-miter-limit"); assertNotNull(layer); //Set and Get @@ -143,14 +142,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-round-limit"); + Timber.i("line-round-limit"); assertNotNull(layer); //Set and Get @@ -165,14 +164,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-opacity"); + Timber.i("line-opacity"); assertNotNull(layer); //Set and Get @@ -187,14 +186,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-color"); + Timber.i("line-color"); assertNotNull(layer); //Set and Get @@ -209,14 +208,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-color"); + Timber.i("line-color"); assertNotNull(layer); //Set and Get @@ -231,14 +230,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-translate"); + Timber.i("line-translate"); assertNotNull(layer); //Set and Get @@ -253,14 +252,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-translate-anchor"); + Timber.i("line-translate-anchor"); assertNotNull(layer); //Set and Get @@ -275,14 +274,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-width"); + Timber.i("line-width"); assertNotNull(layer); //Set and Get @@ -297,14 +296,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-gap-width"); + Timber.i("line-gap-width"); assertNotNull(layer); //Set and Get @@ -319,14 +318,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-offset"); + Timber.i("line-offset"); assertNotNull(layer); //Set and Get @@ -341,14 +340,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-blur"); + Timber.i("line-blur"); assertNotNull(layer); //Set and Get @@ -363,14 +362,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-dasharray"); + Timber.i("line-dasharray"); assertNotNull(layer); //Set and Get @@ -385,14 +384,14 @@ public class LineLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "line-pattern"); + Timber.i("line-pattern"); assertNotNull(layer); //Set and Get diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerStyleTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerStyleTest.java index 2baddd6fa1..589c07c129 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerStyleTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerStyleTest.java @@ -4,7 +4,7 @@ package com.mapbox.mapboxsdk.testapp.style; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.style.layers.RasterLayer; @@ -27,7 +27,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; */ @RunWith(AndroidJUnit4.class) public class RasterLayerStyleTest extends BaseStyleTest { - private static final String TAG = RasterLayerStyleTest.class.getSimpleName(); @Rule public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); @@ -51,14 +50,14 @@ public class RasterLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "visibility"); + Timber.i("visibility"); assertNotNull(layer); //Get initial @@ -76,14 +75,14 @@ public class RasterLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-opacity"); + Timber.i("raster-opacity"); assertNotNull(layer); //Set and Get @@ -98,14 +97,14 @@ public class RasterLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-hue-rotate"); + Timber.i("raster-hue-rotate"); assertNotNull(layer); //Set and Get @@ -120,14 +119,14 @@ public class RasterLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-brightness-min"); + Timber.i("raster-brightness-min"); assertNotNull(layer); //Set and Get @@ -142,14 +141,14 @@ public class RasterLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-brightness-max"); + Timber.i("raster-brightness-max"); assertNotNull(layer); //Set and Get @@ -164,14 +163,14 @@ public class RasterLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-saturation"); + Timber.i("raster-saturation"); assertNotNull(layer); //Set and Get @@ -186,14 +185,14 @@ public class RasterLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-contrast"); + Timber.i("raster-contrast"); assertNotNull(layer); //Set and Get @@ -208,14 +207,14 @@ public class RasterLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-fade-duration"); + Timber.i("raster-fade-duration"); assertNotNull(layer); //Set and Get diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java index b64c9a244c..a746d15bac 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java @@ -1,11 +1,10 @@ // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`. package com.mapbox.mapboxsdk.testapp.style; -import android.graphics.Color; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.style.layers.RasterLayer; @@ -28,7 +27,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; */ @RunWith(AndroidJUnit4.class) public class RasterLayerTest extends BaseStyleTest { - private static final String TAG = RasterLayerTest.class.getSimpleName(); @Rule public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); @@ -52,14 +50,14 @@ public class RasterLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "visibility"); + Timber.i("visibility"); assertNotNull(layer); //Get initial @@ -77,14 +75,14 @@ public class RasterLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-opacity"); + Timber.i("raster-opacity"); assertNotNull(layer); //Set and Get @@ -99,14 +97,14 @@ public class RasterLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-hue-rotate"); + Timber.i("raster-hue-rotate"); assertNotNull(layer); //Set and Get @@ -121,14 +119,14 @@ public class RasterLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-brightness-min"); + Timber.i("raster-brightness-min"); assertNotNull(layer); //Set and Get @@ -143,14 +141,14 @@ public class RasterLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-brightness-max"); + Timber.i("raster-brightness-max"); assertNotNull(layer); //Set and Get @@ -165,14 +163,14 @@ public class RasterLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-saturation"); + Timber.i("raster-saturation"); assertNotNull(layer); //Set and Get @@ -187,14 +185,14 @@ public class RasterLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-contrast"); + Timber.i("raster-contrast"); assertNotNull(layer); //Set and Get @@ -209,14 +207,14 @@ public class RasterLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new RasterLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "raster-fade-duration"); + Timber.i("raster-fade-duration"); assertNotNull(layer); //Set and Get diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleBackgroundLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleBackgroundLayerTest.java index f562a5d8a3..de6e9b5a06 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleBackgroundLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleBackgroundLayerTest.java @@ -3,7 +3,7 @@ package com.mapbox.mapboxsdk.testapp.style; import android.support.test.InstrumentationRegistry; import android.support.test.runner.AndroidJUnit4; import android.test.ActivityInstrumentationTestCase2; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; @@ -23,7 +23,6 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class RuntimeStyleBackgroundLayerTest extends ActivityInstrumentationTestCase2<RuntimeStyleTestActivity> { - private static final String TAG = RuntimeStyleBackgroundLayerTest.class.getSimpleName(); public RuntimeStyleBackgroundLayerTest() { super(RuntimeStyleTestActivity.class); @@ -40,7 +39,7 @@ public class RuntimeStyleBackgroundLayerTest getActivity().mapView.getMapAsync(new OnMapReadyCallback() { @Override public void onMapReady(MapboxMap mapboxMap) { - Log.i(TAG, "visibility"); + Timber.i("visibility"); BackgroundLayer layer = mapboxMap.getLayerAs("background"); assertNotNull(layer); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerStyleTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerStyleTest.java index 7132705ca9..387e200645 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerStyleTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerStyleTest.java @@ -5,7 +5,7 @@ import android.graphics.Color; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.style.layers.SymbolLayer; @@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; */ @RunWith(AndroidJUnit4.class) public class SymbolLayerStyleTest extends BaseStyleTest { - private static final String TAG = SymbolLayerStyleTest.class.getSimpleName(); @Rule public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); @@ -52,14 +51,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "visibility"); + Timber.i("visibility"); assertNotNull(layer); //Get initial @@ -77,14 +76,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "symbol-placement"); + Timber.i("symbol-placement"); assertNotNull(layer); //Set and Get @@ -99,14 +98,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "symbol-spacing"); + Timber.i("symbol-spacing"); assertNotNull(layer); //Set and Get @@ -121,14 +120,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "symbol-avoid-edges"); + Timber.i("symbol-avoid-edges"); assertNotNull(layer); //Set and Get @@ -143,14 +142,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-allow-overlap"); + Timber.i("icon-allow-overlap"); assertNotNull(layer); //Set and Get @@ -165,14 +164,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-ignore-placement"); + Timber.i("icon-ignore-placement"); assertNotNull(layer); //Set and Get @@ -187,14 +186,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-optional"); + Timber.i("icon-optional"); assertNotNull(layer); //Set and Get @@ -209,14 +208,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-rotation-alignment"); + Timber.i("icon-rotation-alignment"); assertNotNull(layer); //Set and Get @@ -231,14 +230,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-size"); + Timber.i("icon-size"); assertNotNull(layer); //Set and Get @@ -253,14 +252,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-text-fit"); + Timber.i("icon-text-fit"); assertNotNull(layer); //Set and Get @@ -275,14 +274,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-text-fit-padding"); + Timber.i("icon-text-fit-padding"); assertNotNull(layer); //Set and Get @@ -297,14 +296,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-image"); + Timber.i("icon-image"); assertNotNull(layer); //Set and Get @@ -319,14 +318,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-rotate"); + Timber.i("icon-rotate"); assertNotNull(layer); //Set and Get @@ -341,14 +340,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-padding"); + Timber.i("icon-padding"); assertNotNull(layer); //Set and Get @@ -363,14 +362,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-keep-upright"); + Timber.i("icon-keep-upright"); assertNotNull(layer); //Set and Get @@ -385,14 +384,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-offset"); + Timber.i("icon-offset"); assertNotNull(layer); //Set and Get @@ -407,14 +406,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-pitch-alignment"); + Timber.i("text-pitch-alignment"); assertNotNull(layer); //Set and Get @@ -429,14 +428,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-rotation-alignment"); + Timber.i("text-rotation-alignment"); assertNotNull(layer); //Set and Get @@ -451,14 +450,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-field"); + Timber.i("text-field"); assertNotNull(layer); //Set and Get @@ -473,14 +472,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-font"); + Timber.i("text-font"); assertNotNull(layer); //Set and Get @@ -495,14 +494,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-size"); + Timber.i("text-size"); assertNotNull(layer); //Set and Get @@ -517,14 +516,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-max-width"); + Timber.i("text-max-width"); assertNotNull(layer); //Set and Get @@ -539,14 +538,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-line-height"); + Timber.i("text-line-height"); assertNotNull(layer); //Set and Get @@ -561,14 +560,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-letter-spacing"); + Timber.i("text-letter-spacing"); assertNotNull(layer); //Set and Get @@ -583,14 +582,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-justify"); + Timber.i("text-justify"); assertNotNull(layer); //Set and Get @@ -605,14 +604,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-anchor"); + Timber.i("text-anchor"); assertNotNull(layer); //Set and Get @@ -627,14 +626,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-max-angle"); + Timber.i("text-max-angle"); assertNotNull(layer); //Set and Get @@ -649,14 +648,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-rotate"); + Timber.i("text-rotate"); assertNotNull(layer); //Set and Get @@ -671,14 +670,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-padding"); + Timber.i("text-padding"); assertNotNull(layer); //Set and Get @@ -693,14 +692,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-keep-upright"); + Timber.i("text-keep-upright"); assertNotNull(layer); //Set and Get @@ -715,14 +714,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-transform"); + Timber.i("text-transform"); assertNotNull(layer); //Set and Get @@ -737,14 +736,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-offset"); + Timber.i("text-offset"); assertNotNull(layer); //Set and Get @@ -759,14 +758,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-allow-overlap"); + Timber.i("text-allow-overlap"); assertNotNull(layer); //Set and Get @@ -781,14 +780,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-ignore-placement"); + Timber.i("text-ignore-placement"); assertNotNull(layer); //Set and Get @@ -803,14 +802,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-optional"); + Timber.i("text-optional"); assertNotNull(layer); //Set and Get @@ -825,14 +824,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-opacity"); + Timber.i("icon-opacity"); assertNotNull(layer); //Set and Get @@ -847,14 +846,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-color"); + Timber.i("icon-color"); assertNotNull(layer); //Set and Get @@ -869,14 +868,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-color"); + Timber.i("icon-color"); assertNotNull(layer); //Set and Get @@ -891,14 +890,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-halo-color"); + Timber.i("icon-halo-color"); assertNotNull(layer); //Set and Get @@ -913,14 +912,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-halo-color"); + Timber.i("icon-halo-color"); assertNotNull(layer); //Set and Get @@ -935,14 +934,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-halo-width"); + Timber.i("icon-halo-width"); assertNotNull(layer); //Set and Get @@ -957,14 +956,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-halo-blur"); + Timber.i("icon-halo-blur"); assertNotNull(layer); //Set and Get @@ -979,14 +978,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-translate"); + Timber.i("icon-translate"); assertNotNull(layer); //Set and Get @@ -1001,14 +1000,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-translate-anchor"); + Timber.i("icon-translate-anchor"); assertNotNull(layer); //Set and Get @@ -1023,14 +1022,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-opacity"); + Timber.i("text-opacity"); assertNotNull(layer); //Set and Get @@ -1045,14 +1044,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-color"); + Timber.i("text-color"); assertNotNull(layer); //Set and Get @@ -1067,14 +1066,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-color"); + Timber.i("text-color"); assertNotNull(layer); //Set and Get @@ -1089,14 +1088,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-halo-color"); + Timber.i("text-halo-color"); assertNotNull(layer); //Set and Get @@ -1111,14 +1110,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-halo-color"); + Timber.i("text-halo-color"); assertNotNull(layer); //Set and Get @@ -1133,14 +1132,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-halo-width"); + Timber.i("text-halo-width"); assertNotNull(layer); //Set and Get @@ -1155,14 +1154,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-halo-blur"); + Timber.i("text-halo-blur"); assertNotNull(layer); //Set and Get @@ -1177,14 +1176,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-translate"); + Timber.i("text-translate"); assertNotNull(layer); //Set and Get @@ -1199,14 +1198,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-translate-anchor"); + Timber.i("text-translate-anchor"); assertNotNull(layer); //Set and Get diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java index 5bc3f597c1..28bcdb7f9e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java @@ -5,7 +5,7 @@ import android.graphics.Color; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.style.layers.SymbolLayer; @@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; */ @RunWith(AndroidJUnit4.class) public class SymbolLayerTest extends BaseStyleTest { - private static final String TAG = SymbolLayerTest.class.getSimpleName(); @Rule public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); @@ -52,14 +51,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "visibility"); + Timber.i("visibility"); assertNotNull(layer); //Get initial @@ -77,14 +76,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "symbol-placement"); + Timber.i("symbol-placement"); assertNotNull(layer); //Set and Get @@ -99,14 +98,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "symbol-spacing"); + Timber.i("symbol-spacing"); assertNotNull(layer); //Set and Get @@ -121,14 +120,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "symbol-avoid-edges"); + Timber.i("symbol-avoid-edges"); assertNotNull(layer); //Set and Get @@ -143,14 +142,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-allow-overlap"); + Timber.i("icon-allow-overlap"); assertNotNull(layer); //Set and Get @@ -165,14 +164,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-ignore-placement"); + Timber.i("icon-ignore-placement"); assertNotNull(layer); //Set and Get @@ -187,14 +186,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-optional"); + Timber.i("icon-optional"); assertNotNull(layer); //Set and Get @@ -209,14 +208,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-rotation-alignment"); + Timber.i("icon-rotation-alignment"); assertNotNull(layer); //Set and Get @@ -231,14 +230,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-size"); + Timber.i("icon-size"); assertNotNull(layer); //Set and Get @@ -253,14 +252,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-text-fit"); + Timber.i("icon-text-fit"); assertNotNull(layer); //Set and Get @@ -275,14 +274,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-text-fit-padding"); + Timber.i("icon-text-fit-padding"); assertNotNull(layer); //Set and Get @@ -297,14 +296,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-image"); + Timber.i("icon-image"); assertNotNull(layer); //Set and Get @@ -319,14 +318,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-rotate"); + Timber.i("icon-rotate"); assertNotNull(layer); //Set and Get @@ -341,14 +340,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-padding"); + Timber.i("icon-padding"); assertNotNull(layer); //Set and Get @@ -363,14 +362,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-keep-upright"); + Timber.i("icon-keep-upright"); assertNotNull(layer); //Set and Get @@ -385,14 +384,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-offset"); + Timber.i("icon-offset"); assertNotNull(layer); //Set and Get @@ -407,14 +406,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-pitch-alignment"); + Timber.i("text-pitch-alignment"); assertNotNull(layer); //Set and Get @@ -429,14 +428,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-rotation-alignment"); + Timber.i("text-rotation-alignment"); assertNotNull(layer); //Set and Get @@ -451,14 +450,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-field"); + Timber.i("text-field"); assertNotNull(layer); //Set and Get @@ -473,14 +472,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-font"); + Timber.i("text-font"); assertNotNull(layer); //Set and Get @@ -495,14 +494,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-size"); + Timber.i("text-size"); assertNotNull(layer); //Set and Get @@ -517,14 +516,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-max-width"); + Timber.i("text-max-width"); assertNotNull(layer); //Set and Get @@ -539,14 +538,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-line-height"); + Timber.i("text-line-height"); assertNotNull(layer); //Set and Get @@ -561,14 +560,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-letter-spacing"); + Timber.i("text-letter-spacing"); assertNotNull(layer); //Set and Get @@ -583,14 +582,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-justify"); + Timber.i("text-justify"); assertNotNull(layer); //Set and Get @@ -605,14 +604,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-anchor"); + Timber.i("text-anchor"); assertNotNull(layer); //Set and Get @@ -627,14 +626,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-max-angle"); + Timber.i("text-max-angle"); assertNotNull(layer); //Set and Get @@ -649,14 +648,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-rotate"); + Timber.i("text-rotate"); assertNotNull(layer); //Set and Get @@ -671,14 +670,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-padding"); + Timber.i("text-padding"); assertNotNull(layer); //Set and Get @@ -693,14 +692,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-keep-upright"); + Timber.i("text-keep-upright"); assertNotNull(layer); //Set and Get @@ -715,14 +714,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-transform"); + Timber.i("text-transform"); assertNotNull(layer); //Set and Get @@ -737,14 +736,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-offset"); + Timber.i("text-offset"); assertNotNull(layer); //Set and Get @@ -759,14 +758,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-allow-overlap"); + Timber.i("text-allow-overlap"); assertNotNull(layer); //Set and Get @@ -781,14 +780,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-ignore-placement"); + Timber.i("text-ignore-placement"); assertNotNull(layer); //Set and Get @@ -803,14 +802,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-optional"); + Timber.i("text-optional"); assertNotNull(layer); //Set and Get @@ -825,14 +824,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-opacity"); + Timber.i("icon-opacity"); assertNotNull(layer); //Set and Get @@ -847,14 +846,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-color"); + Timber.i("icon-color"); assertNotNull(layer); //Set and Get @@ -869,14 +868,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-color"); + Timber.i("icon-color"); assertNotNull(layer); //Set and Get @@ -891,14 +890,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-halo-color"); + Timber.i("icon-halo-color"); assertNotNull(layer); //Set and Get @@ -913,14 +912,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-halo-color"); + Timber.i("icon-halo-color"); assertNotNull(layer); //Set and Get @@ -935,14 +934,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-halo-width"); + Timber.i("icon-halo-width"); assertNotNull(layer); //Set and Get @@ -957,14 +956,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-halo-blur"); + Timber.i("icon-halo-blur"); assertNotNull(layer); //Set and Get @@ -979,14 +978,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-translate"); + Timber.i("icon-translate"); assertNotNull(layer); //Set and Get @@ -1001,14 +1000,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "icon-translate-anchor"); + Timber.i("icon-translate-anchor"); assertNotNull(layer); //Set and Get @@ -1023,14 +1022,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-opacity"); + Timber.i("text-opacity"); assertNotNull(layer); //Set and Get @@ -1045,14 +1044,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-color"); + Timber.i("text-color"); assertNotNull(layer); //Set and Get @@ -1067,14 +1066,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-color"); + Timber.i("text-color"); assertNotNull(layer); //Set and Get @@ -1089,14 +1088,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-halo-color"); + Timber.i("text-halo-color"); assertNotNull(layer); //Set and Get @@ -1111,14 +1110,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-halo-color"); + Timber.i("text-halo-color"); assertNotNull(layer); //Set and Get @@ -1133,14 +1132,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-halo-width"); + Timber.i("text-halo-width"); assertNotNull(layer); //Set and Get @@ -1155,14 +1154,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-halo-blur"); + Timber.i("text-halo-blur"); assertNotNull(layer); //Set and Get @@ -1177,14 +1176,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-translate"); + Timber.i("text-translate"); assertNotNull(layer); //Set and Get @@ -1199,14 +1198,14 @@ public class SymbolLayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new SymbolLayer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); //Layer reference is now stale, get new reference layer = mapboxMap.getLayerAs("my-layer"); } - Log.i(TAG, "text-translate-anchor"); + Timber.i("text-translate-anchor"); assertNotNull(layer); //Set and Get diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs index bc0d22bb25..f2744e9854 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs @@ -9,7 +9,7 @@ import android.graphics.Color; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import timber.log.Timber; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.style.layers.<%- camelize(type) %>Layer; @@ -32,7 +32,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; */ @RunWith(AndroidJUnit4.class) public class <%- camelize(type) %>LayerTest extends BaseStyleTest { - private static final String TAG = <%- camelize(type) %>LayerTest.class.getSimpleName(); @Rule public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); @@ -56,11 +55,11 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); <% if (type === 'background') { -%> - Log.i(TAG, "Retrieving layer"); + Timber.i("Retrieving layer"); layer = mapboxMap.getLayerAs("background"); <% } else { -%> if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new <%- camelize(type) %>Layer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); @@ -68,7 +67,7 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest { layer = mapboxMap.getLayerAs("my-layer"); } <% } -%> - Log.i(TAG, "visibility"); + Timber.i("visibility"); assertNotNull(layer); //Get initial @@ -87,11 +86,11 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); <% if (type === 'background') { -%> - Log.i(TAG, "Retrieving layer"); + Timber.i("Retrieving layer"); layer = mapboxMap.getLayerAs("background"); <% } else { -%> if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new <%- camelize(type) %>Layer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); @@ -99,7 +98,7 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest { layer = mapboxMap.getLayerAs("my-layer"); } <% } -%> - Log.i(TAG, "<%- property.name %>"); + Timber.i("<%- property.name %>"); assertNotNull(layer); //Set and Get @@ -115,11 +114,11 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest { mapboxMap = rule.getActivity().getMapboxMap(); <% if (type === 'background') { -%> - Log.i(TAG, "Retrieving layer"); + Timber.i("Retrieving layer"); layer = mapboxMap.getLayerAs("background"); <% } else { -%> if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { - Log.i(TAG, "Adding layer"); + Timber.i("Adding layer"); layer = new <%- camelize(type) %>Layer("my-layer", "composite"); layer.setSourceLayer("composite"); mapboxMap.addLayer(layer); @@ -127,7 +126,7 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest { layer = mapboxMap.getLayerAs("my-layer"); } <% } -%> - Log.i(TAG, "<%- property.name %>"); + Timber.i("<%- property.name %>"); assertNotNull(layer); //Set and Get diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java index c966f61f8c..f00c76132c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java @@ -2,9 +2,8 @@ package com.mapbox.mapboxsdk.testapp.utils; import android.app.Activity; import android.support.test.espresso.IdlingResource; -import android.util.Log; +import timber.log.Timber; -import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.maps.MapboxMap; import java.lang.reflect.Field; @@ -43,10 +42,10 @@ public class OnMapReadyIdlingResource implements IdlingResource { Field field = activity.getClass().getDeclaredField("mapboxMap"); field.setAccessible(true); mapboxMap = (MapboxMap) field.get(activity); - Log.e(MapboxConstants.TAG, "isMapboxReady called with value " + (mapboxMap != null)); + Timber.e("isMapboxReady called with value " + (mapboxMap != null)); return mapboxMap != null; } catch (Exception e) { - Log.e(MapboxConstants.TAG, "could not reflect", e); + Timber.e("could not reflect", e); return false; } } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java index 8fedf38619..84bfa2c8c3 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java @@ -4,7 +4,7 @@ import android.app.Activity; import android.graphics.Bitmap; import android.graphics.Canvas; import android.os.Environment; -import android.util.Log; +import timber.log.Timber; import android.view.TextureView; import android.view.View; import android.view.ViewGroup; @@ -23,8 +23,6 @@ import java.util.UUID; */ public class ScreenshotUtil { - private static final String LOG_TAG = ScreenshotUtil.class.getName(); - // Where to store the files. This path is required by AWS Device Farm: // http://docs.aws.amazon.com/devicefarm/latest/developerguide/test-types-android-instrumentation.html#test-types-android-instrumentation-screenshots private static final String SCREENSHOT_FOLDER = "test-screenshots"; @@ -38,7 +36,7 @@ public class ScreenshotUtil { // Check if storage is available if (!isExternalStorageWritable()) { - Log.d(LOG_TAG, "External storage is not available."); + Timber.d("External storage is not available."); return; } @@ -129,7 +127,7 @@ public class ScreenshotUtil { File dir = new File(path); dir.mkdirs(); path += File.separator + filename; - Log.d(LOG_TAG, "Screenshot path: " + path); + Timber.d("Screenshot path: " + path); return path; } 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"); } } diff --git a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/FeatureOverviewActivity.java b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/FeatureOverviewActivity.java index 7f2caa4d67..006df19706 100644 --- a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/FeatureOverviewActivity.java +++ b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/FeatureOverviewActivity.java @@ -15,7 +15,6 @@ import java.util.List; public class FeatureOverviewActivity extends WearableActivity implements FeatureAdapter.ItemSelectedListener { - private static final String TAG = "MainActivity"; private WearableRecyclerView wearableRecyclerView; private List<Feature> exampleItemModels; |