[android] - lower amount of external dependencies (#10268)
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
package com.mapbox.mapboxsdk.maps;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.content.ActivityNotFoundException;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.v7.app.AlertDialog;
|
||||
import android.text.Html;
|
||||
import android.text.SpannableStringBuilder;
|
||||
import android.text.TextUtils;
|
||||
@@ -56,7 +56,7 @@ class AttributionDialogManager implements View.OnClickListener, DialogInterface.
|
||||
|
||||
private void showAttributionDialog() {
|
||||
attributionKeys = attributionMap.keySet().toArray(new String[attributionMap.size()]);
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.mapbox_AlertDialogStyle);
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(context);
|
||||
builder.setTitle(R.string.mapbox_attributionsDialogTitle);
|
||||
builder.setAdapter(new ArrayAdapter<>(context, R.layout.mapbox_attribution_list_item, attributionKeys), this);
|
||||
builder.show();
|
||||
@@ -77,7 +77,7 @@ class AttributionDialogManager implements View.OnClickListener, DialogInterface.
|
||||
}
|
||||
|
||||
private void showTelemetryDialog() {
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.mapbox_AlertDialogStyle);
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(context);
|
||||
builder.setTitle(R.string.mapbox_attributionTelemetryTitle);
|
||||
builder.setMessage(R.string.mapbox_attributionTelemetryMessage);
|
||||
builder.setPositiveButton(R.string.mapbox_attributionTelemetryPositive, new DialogInterface.OnClickListener() {
|
||||
|
||||
@@ -6,10 +6,10 @@ import android.support.annotation.NonNull;
|
||||
import android.support.v4.view.ViewCompat;
|
||||
import android.support.v4.view.ViewPropertyAnimatorCompat;
|
||||
import android.support.v4.view.ViewPropertyAnimatorListenerAdapter;
|
||||
import android.support.v7.widget.AppCompatImageView;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import com.mapbox.mapboxsdk.maps.MapboxMap;
|
||||
|
||||
@@ -22,7 +22,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
|
||||
* use {@link com.mapbox.mapboxsdk.maps.UiSettings}.
|
||||
* </p>
|
||||
*/
|
||||
public final class CompassView extends AppCompatImageView implements Runnable {
|
||||
public final class CompassView extends ImageView implements Runnable {
|
||||
|
||||
public static final long TIME_WAIT_IDLE = 500;
|
||||
public static final long TIME_MAP_NORTH_ANIMATION = 150;
|
||||
|
||||
@@ -5,6 +5,7 @@ import android.content.res.ColorStateList;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.Build;
|
||||
import android.support.annotation.ColorInt;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.v4.graphics.drawable.DrawableCompat;
|
||||
@@ -30,10 +31,15 @@ public class ColorUtils {
|
||||
*/
|
||||
@ColorInt
|
||||
public static int getPrimaryColor(@NonNull Context context) {
|
||||
TypedValue typedValue = new TypedValue();
|
||||
Resources.Theme theme = context.getTheme();
|
||||
theme.resolveAttribute(R.attr.colorPrimary, typedValue, true);
|
||||
return typedValue.data;
|
||||
try {
|
||||
TypedValue typedValue = new TypedValue();
|
||||
Resources.Theme theme = context.getTheme();
|
||||
int id = context.getResources().getIdentifier("colorPrimary", "attrs", context.getPackageName());
|
||||
theme.resolveAttribute(id, typedValue, true);
|
||||
return typedValue.data;
|
||||
} catch (Exception exception) {
|
||||
return getColorCompat(context, R.color.mapbox_blue);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -44,10 +50,15 @@ public class ColorUtils {
|
||||
*/
|
||||
@ColorInt
|
||||
public static int getPrimaryDarkColor(@NonNull Context context) {
|
||||
TypedValue typedValue = new TypedValue();
|
||||
Resources.Theme theme = context.getTheme();
|
||||
theme.resolveAttribute(R.attr.colorPrimaryDark, typedValue, true);
|
||||
return typedValue.data;
|
||||
try {
|
||||
TypedValue typedValue = new TypedValue();
|
||||
Resources.Theme theme = context.getTheme();
|
||||
int id = context.getResources().getIdentifier("colorPrimaryDark", "attrs", context.getPackageName());
|
||||
theme.resolveAttribute(id, typedValue, true);
|
||||
return typedValue.data;
|
||||
} catch (Exception exception) {
|
||||
return getColorCompat(context, R.color.mapbox_blue);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -58,10 +69,15 @@ public class ColorUtils {
|
||||
*/
|
||||
@ColorInt
|
||||
public static int getAccentColor(@NonNull Context context) {
|
||||
TypedValue typedValue = new TypedValue();
|
||||
Resources.Theme theme = context.getTheme();
|
||||
theme.resolveAttribute(R.attr.colorAccent, typedValue, true);
|
||||
return typedValue.data;
|
||||
try {
|
||||
TypedValue typedValue = new TypedValue();
|
||||
Resources.Theme theme = context.getTheme();
|
||||
int id = context.getResources().getIdentifier("colorAccent", "attrs", context.getPackageName());
|
||||
theme.resolveAttribute(id, typedValue, true);
|
||||
return typedValue.data;
|
||||
} catch (Exception exception) {
|
||||
return getColorCompat(context, R.color.mapbox_gray);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -122,4 +138,12 @@ public class ColorUtils {
|
||||
throw new ConversionException("Not a valid rgb/rgba value");
|
||||
}
|
||||
}
|
||||
|
||||
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 {
|
||||
return context.getResources().getColor(id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="mapbox_AlertDialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert"/>
|
||||
|
||||
</resources>
|
||||
Reference in New Issue
Block a user