diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils')
5 files changed, 7 insertions, 18 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java index e90c416a2d..34c52c829b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java @@ -35,7 +35,7 @@ public class AnimatorUtils { * @param duration the duration of the animator * @param listener the animator end listener */ - public static void animate(@Nullable final View view, @AnimatorRes int animatorRes, int duration, + public static void animate(final View view, @AnimatorRes int animatorRes, int duration, @Nullable final OnAnimationEndListener listener) { if (view == null) { return; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java index 5584a6eb58..78503f9dfe 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java @@ -7,7 +7,6 @@ import android.graphics.Canvas; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.view.View; import java.io.ByteArrayOutputStream; @@ -59,8 +58,7 @@ public class BitmapUtils { * @param sourceDrawable The source drawable * @return The underlying bitmap */ - @Nullable - public static Bitmap getBitmapFromDrawable(@Nullable Drawable sourceDrawable) { + public static Bitmap getBitmapFromDrawable(Drawable sourceDrawable) { if (sourceDrawable == null) { return null; } @@ -90,8 +88,7 @@ public class BitmapUtils { * @param drawable The source drawable * @return The byte array of source drawable */ - @Nullable - public static byte[] getByteArrayFromDrawable(@Nullable Drawable drawable) { + public static byte[] getByteArrayFromDrawable(Drawable drawable) { if (drawable == null) { return null; } @@ -112,8 +109,7 @@ public class BitmapUtils { * @param array The source byte array * @return The drawable created from source byte array */ - @Nullable - public static Drawable getDrawableFromByteArray(@NonNull Context context, @Nullable byte[] array) { + public static Drawable getDrawableFromByteArray(Context context, byte[] array) { if (array == null) { return null; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java index aa87f8762d..3a53794e50 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java @@ -126,7 +126,7 @@ public class ColorUtils { * @throws ConversionException on illegal input */ @ColorInt - public static int rgbaToColor(@NonNull String value) { + public static int rgbaToColor(String value) { Pattern c = Pattern.compile("rgba?\\s*\\(\\s*(\\d+\\.?\\d*)\\s*,\\s*(\\d+\\.?\\d*)\\s*,\\s*(\\d+\\.?\\d*)\\s*," + "?\\s*(\\d+\\.?\\d*)?\\s*\\)"); Matcher m = c.matcher(value); @@ -193,7 +193,7 @@ public class ColorUtils { }; } - private static int getColorCompat(@NonNull Context context, int id) { + private static int getColorCompat(Context context, int id) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { return context.getResources().getColor(id, context.getTheme()); } else { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java index 52009d20ef..b7d09cda2a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java @@ -1,7 +1,6 @@ package com.mapbox.mapboxsdk.utils; import android.os.AsyncTask; -import android.support.annotation.NonNull; import java.io.File; import java.lang.ref.WeakReference; @@ -12,7 +11,6 @@ public class FileUtils { * Task checking whether app's process can read a file. */ public static class CheckFileReadPermissionTask extends AsyncTask<File, Void, Boolean> { - @NonNull private final WeakReference<OnCheckFileReadPermissionListener> listenerWeakReference; public CheckFileReadPermissionTask(OnCheckFileReadPermissionListener listener) { @@ -69,7 +67,6 @@ public class FileUtils { * Task checking whether app's process can write to a file. */ public static class CheckFileWritePermissionTask extends AsyncTask<File, Void, Boolean> { - @NonNull private final WeakReference<OnCheckFileWritePermissionListener> listenerWeakReference; public CheckFileWritePermissionTask(OnCheckFileWritePermissionListener listener) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java index f3c8fd32cf..08d39d6b3b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java @@ -3,8 +3,6 @@ package com.mapbox.mapboxsdk.utils; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.maps.MapboxMapOptions; @@ -23,7 +21,6 @@ public class MapFragmentUtils { * @param options The MapboxMapOptions to convert * @return a bundle of converted fragment arguments */ - @NonNull public static Bundle createFragmentArgs(MapboxMapOptions options) { Bundle bundle = new Bundle(); bundle.putParcelable(MapboxConstants.FRAG_ARG_MAPBOXMAPOPTIONS, options); @@ -37,8 +34,7 @@ public class MapFragmentUtils { * @param args The fragment arguments * @return converted MapboxMapOptions */ - @Nullable - public static MapboxMapOptions resolveArgs(@NonNull Context context, @Nullable Bundle args) { + public static MapboxMapOptions resolveArgs(Context context, Bundle args) { MapboxMapOptions options; if (args != null && args.containsKey(MapboxConstants.FRAG_ARG_MAPBOXMAPOPTIONS)) { options = args.getParcelable(MapboxConstants.FRAG_ARG_MAPBOXMAPOPTIONS); |