address lint warnings

fractalwrench · fractalwrench · commit a57aae33d5be · 2016-04-09T11:35:47.000+01:00
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapAlert.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapAlert.java
@@ -20,6 +20,7 @@
 import com.beardedhen.androidbootstrap.api.attributes.BootstrapBrand;
 import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapBrand;
 import com.beardedhen.androidbootstrap.utils.DimenUtils;
+import com.beardedhen.androidbootstrap.utils.ViewUtils;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -29,7 +30,6 @@
 public class BootstrapAlert extends RelativeLayout {
 
     private ImageView closeButton;
-    private TextView alertText;
 
     private BootstrapBrand bootstrapBrand;
 
@@ -95,7 +95,7 @@ private void initialise(AttributeSet attrs) {
     }
 
     private void updateBootstrapState() {
-        alertText = new TextView(getContext());
+        TextView alertText = new TextView(getContext());
         closeButton = new ImageView(getContext());
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
             alertText.setId(generateViewUniqueId());
@@ -146,7 +146,7 @@ public void onAnimationRepeat(Animation animation) {}
 
         alertText.setLayoutParams(textParams);
         alertText.setTextSize(baselineFontSize);
-        alertText.setGravity(Gravity.LEFT);
+        alertText.setGravity(Gravity.START);
         alertText.setTextColor(
                 BootstrapDrawableFactory.bootstrapButtonText(getContext(), true, bootstrapBrand));
         alertText.setText(Html.fromHtml(String.format("<b>%s</b>%s", strongText,
@@ -155,20 +155,15 @@ public void onAnimationRepeat(Animation animation) {}
                                                               messageText))));
 
         closeButton.setLayoutParams(closeParams);
-        closeButton.setBackgroundDrawable(
-                BootstrapDrawableFactory.bootstrapAlertCloseIcon(getContext(),
-                                                                 (int) baselineFontSize,
-                                                                 (int) baselineFontSize,
-                                                                 DimenUtils.dpToPixels(6)));
+        Drawable buttonBg = BootstrapDrawableFactory.bootstrapAlertCloseIcon(
+                getContext(), (int) baselineFontSize, (int) baselineFontSize,
+                DimenUtils.dpToPixels(6));
+
+        ViewUtils.setBackgroundDrawable(closeButton, buttonBg);
 
         Drawable bg = BootstrapDrawableFactory.bootstrapAlert(getContext(), bootstrapBrand);
+        ViewUtils.setBackgroundDrawable(this, bg);
 
-        if (Build.VERSION.SDK_INT >= 16) {
-            setBackground(bg);
-        }
-        else {
-            setBackgroundDrawable(bg);
-        }
         addView(alertText);
         if (dismissible) {
             addView(closeButton);
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapBadge.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapBadge.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.ImageView;
@@ -14,6 +13,7 @@
 import com.beardedhen.androidbootstrap.api.view.BootstrapBrandView;
 import com.beardedhen.androidbootstrap.api.view.BootstrapSizeView;
 import com.beardedhen.androidbootstrap.utils.DimenUtils;
+import com.beardedhen.androidbootstrap.utils.ViewUtils;
 
 /**
  * See <a href="http://getbootstrap.com/components/#badges>http://getbootstrap.com/components/#badges</a>
@@ -69,12 +69,7 @@ private void updateBootstrapState() {
                                                                      badgeCount, allowZeroValue,
                                                                      insideContainer);
 
-        if (Build.VERSION.SDK_INT >= 16) {
-            setBackground(badgeDrawable);
-        }
-        else {
-            setBackgroundDrawable(badgeDrawable);
-        }
+        ViewUtils.setBackgroundDrawable(this, badgeDrawable);
     }
 
     public void setBadgeCount(int badgeCount) {
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapButton.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapButton.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.annotation.NonNull;
@@ -21,6 +20,7 @@
 import com.beardedhen.androidbootstrap.api.view.OutlineableView;
 import com.beardedhen.androidbootstrap.api.view.RoundableView;
 import com.beardedhen.androidbootstrap.utils.DimenUtils;
+import com.beardedhen.androidbootstrap.utils.ViewUtils;
 
 import java.io.Serializable;
 
@@ -158,12 +158,7 @@ private void initialise(AttributeSet attrs) {
                 showOutline,
                 roundedCorners);
 
-        if (Build.VERSION.SDK_INT >= 16) {
-            setBackground(bg);
-        }
-        else {
-            setBackgroundDrawable(bg);
-        }
+        ViewUtils.setBackgroundDrawable(this, bg);
 
         int vert = (int) (baselineVertPadding * bootstrapSize);
         int hori = (int) (baselineHoriPadding * bootstrapSize);
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapCircleThumbnail.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapCircleThumbnail.java
@@ -9,14 +9,14 @@
 import android.graphics.RectF;
 import android.graphics.Shader;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 
 import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapBrand;
 import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapSize;
 import com.beardedhen.androidbootstrap.utils.ColorUtils;
 import com.beardedhen.androidbootstrap.utils.DimenUtils;
+import com.beardedhen.androidbootstrap.utils.ViewUtils;
 
 /**
  * BootstrapCircleThumbnails display a circular image with an optional border, that can be themed
@@ -176,12 +176,7 @@ private void updateBackground() {
                     (int) (baselineOuterBorderWidth * bootstrapSize),
                     ColorUtils.resolveColor(R.color.bootstrap_thumbnail_background, getContext()));
         }
-        if (Build.VERSION.SDK_INT >= 16) {
-            setBackground(bg);
-        }
-        else {
-            setBackgroundDrawable(bg);
-        }
+        ViewUtils.setBackgroundDrawable(this, bg);
     }
 
 }
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapDrawableFactory.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapDrawableFactory.java
@@ -484,9 +484,9 @@ public static Drawable createBadgeDrawable(Context context, BootstrapBrand brand
 
     static ColorStateList bootstrapDropDownViewText(Context context) {
 
-        int defaultColor = context.getResources().getColor(R.color.bootstrap_gray_dark);
-        int activeColor = context.getResources().getColor(android.R.color.black);
-        int disabledColor = context.getResources().getColor(R.color.bootstrap_gray_light);
+        int defaultColor = ColorUtils.resolveColor(R.color.bootstrap_gray_dark, context);
+        int activeColor = ColorUtils.resolveColor(android.R.color.black, context);
+        int disabledColor = ColorUtils.resolveColor(R.color.bootstrap_gray_light, context);
 
         return new ColorStateList(getStateList(), getColorList(defaultColor, activeColor, disabledColor));
     }
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapDropDown.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapDropDown.java
@@ -5,7 +5,6 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.v4.widget.PopupWindowCompat;
@@ -28,7 +27,9 @@
 import com.beardedhen.androidbootstrap.api.view.BootstrapSizeView;
 import com.beardedhen.androidbootstrap.api.view.OutlineableView;
 import com.beardedhen.androidbootstrap.api.view.RoundableView;
+import com.beardedhen.androidbootstrap.utils.ColorUtils;
 import com.beardedhen.androidbootstrap.utils.DimenUtils;
+import com.beardedhen.androidbootstrap.utils.ViewUtils;
 
 import java.io.Serializable;
 import java.util.regex.Pattern;
@@ -160,10 +161,13 @@ private ScrollView createDropDownView() {
             childView.setPadding(DimenUtils.dpToPixels(baselineItemLeftPadding * bootstrapSize), 0,
                     DimenUtils.dpToPixels(baselineItemRightPadding * bootstrapSize), 0);
             childView.setTextSize(baselineDropDownViewFontSize * bootstrapSize);
-            childView.setTextColor(getResources().getColor(android.R.color.black));
-            childView.setBackgroundDrawable(getContext()
-                    .obtainStyledAttributes(null, new int[]{android.R.attr.selectableItemBackground}, 0, 0)
-                    .getDrawable(0));
+            childView.setTextColor(ColorUtils.resolveColor(android.R.color.black, getContext()));
+
+            Drawable background = getContext().obtainStyledAttributes(null, new int[]{
+                    android.R.attr.selectableItemBackground}, 0, 0)
+                                            .getDrawable(0);
+            ViewUtils.setBackgroundDrawable(childView, background);
+
             childView.setTextColor(BootstrapDrawableFactory.bootstrapDropDownViewText(getContext()));
             childView.setOnClickListener(new OnClickListener() {
                 @Override
@@ -179,7 +183,8 @@ public void onClick(View v) {
                 childView.setText(text.replaceFirst(REPLACE_REGEX_HEADER, ""));
                 childView.setTextSize((baselineDropDownViewFontSize - 2F) * bootstrapSize);
                 childView.setClickable(false);
-                childView.setTextColor(getResources().getColor(R.color.bootstrap_gray_light));
+                childView.setTextColor(ColorUtils.resolveColor(R.color.bootstrap_gray_light,
+                                                               getContext()));
             }
             else if (Pattern.matches(SEARCH_REGEX_SEPARATOR, text)) {
                 childView = new DividerView(getContext());
@@ -248,12 +253,7 @@ private void updateDropDownState() {
                 showOutline,
                 roundedCorners);
 
-        if (Build.VERSION.SDK_INT >= 16) {
-            setBackground(bg);
-        }
-        else {
-            setBackgroundDrawable(bg);
-        }
+        ViewUtils.setBackgroundDrawable(this, bg);
 
         int vert = (int) (baselineVertPadding * bootstrapSize);
         int hori = (int) (baselineHoriPadding * bootstrapSize);
@@ -462,7 +462,7 @@ private static class DividerView extends TextView {
         public DividerView(Context context) {
             super(context);
             paint = new Paint();
-            paint.setColor(getResources().getColor(R.color.bootstrap_dropdown_divider));
+            paint.setColor(ColorUtils.resolveColor(R.color.bootstrap_dropdown_divider, context));
         }
 
         @Override protected void onDraw(Canvas canvas) {
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapEditText.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapEditText.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.annotation.NonNull;
@@ -18,6 +17,7 @@
 import com.beardedhen.androidbootstrap.api.view.BootstrapSizeView;
 import com.beardedhen.androidbootstrap.api.view.RoundableView;
 import com.beardedhen.androidbootstrap.utils.DimenUtils;
+import com.beardedhen.androidbootstrap.utils.ViewUtils;
 
 import java.io.Serializable;
 
@@ -131,12 +131,7 @@ private void updateBootstrapState() {
                 cornerRadius,
                 rounded);
 
-        if (Build.VERSION.SDK_INT >= 16) {
-            setBackground(bg);
-        }
-        else {
-            setBackgroundDrawable(bg);
-        }
+        ViewUtils.setBackgroundDrawable(this, bg);
     }
 
     /*
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapLabel.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapLabel.java
@@ -4,7 +4,6 @@
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.annotation.NonNull;
@@ -14,6 +13,7 @@
 import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapHeading;
 import com.beardedhen.androidbootstrap.api.view.BootstrapHeadingView;
 import com.beardedhen.androidbootstrap.api.view.RoundableView;
+import com.beardedhen.androidbootstrap.utils.ViewUtils;
 
 import java.io.Serializable;
 
@@ -105,12 +105,7 @@ private void initialise(AttributeSet attrs) {
                 roundable,
                 getHeight());
 
-        if (Build.VERSION.SDK_INT >= 16) {
-            setBackground(bg);
-        }
-        else {
-            setBackgroundDrawable(bg);
-        }
+        ViewUtils.setBackgroundDrawable(this, bg);
     }
 
     @Override protected void onSizeChanged(int w, int h, int oldw, int oldh) {
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapThumbnail.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapThumbnail.java
@@ -15,6 +15,7 @@
 import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapSize;
 import com.beardedhen.androidbootstrap.api.view.RoundableView;
 import com.beardedhen.androidbootstrap.utils.ColorUtils;
+import com.beardedhen.androidbootstrap.utils.ViewUtils;
 
 /**
  * BootstrapThumbnail displays a rectangular image with an optional border, that can be
@@ -112,12 +113,7 @@ private void updateBackground() {
                     ColorUtils.resolveColor(R.color.bootstrap_thumbnail_background, getContext()),
                     roundedCorners);
         }
-        if (Build.VERSION.SDK_INT >= 16) {
-            setBackground(bg);
-        }
-        else {
-            setBackgroundDrawable(bg);
-        }
+        ViewUtils.setBackgroundDrawable(this, bg);
     }
 
     private void updatePadding() {
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapWell.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapWell.java
@@ -3,13 +3,13 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
 import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapSize;
 import com.beardedhen.androidbootstrap.utils.ColorUtils;
 import com.beardedhen.androidbootstrap.utils.DimenUtils;
+import com.beardedhen.androidbootstrap.utils.ViewUtils;
 
 /**
  * BootstrapWells are used as a container layout for other views, typically text.
@@ -52,12 +52,7 @@ private void updateBootstrapState() {
                 (int) DimenUtils.pixelsFromDpResource(getContext(), R.dimen.bootstrap_well_stroke_width),
                 ColorUtils.resolveColor(R.color.bootstrap_well_border_color, getContext()));
 
-        if (Build.VERSION.SDK_INT >= 16) {
-            setBackground(bg);
-        }
-        else {
-            setBackgroundDrawable(bg);
-        }
+        ViewUtils.setBackgroundDrawable(this, bg);
 
         int padding = (int) (DimenUtils.pixelsFromDpResource(getContext(), R.dimen.bootstrap_well_default_padding) * bootstrapSize * 2.5);
         setPadding(padding, padding, padding, padding);
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/utils/ColorUtils.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/utils/ColorUtils.java
@@ -23,6 +23,7 @@ public class ColorUtils {
      * @param context the current context
      * @return a color int
      */
+    @SuppressWarnings("deprecation")
     public static @ColorInt int resolveColor(@ColorRes int color, Context context) {
         if (Build.VERSION.SDK_INT >= 23) {
             return context.getResources().getColor(color, context.getTheme());
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/utils/DimenUtils.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/utils/DimenUtils.java
@@ -34,7 +34,7 @@ public static float pixelsFromDpResource(Context context, @DimenRes int res) {
 
     /**
      * Converts density-independent pixels to pixels
-     * @param dip
+     * @param dip the dips
      * @return size in pixels
      */
     public static int dpToPixels(float dip) {
@@ -43,7 +43,7 @@ public static int dpToPixels(float dip) {
 
     /**
      * Converts pixels to density-independent pixels
-     * @param pixels
+     * @param pixels the pixels
      * @return size in dp
      */
     public static int pixelsToDp(float pixels) {
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/utils/DrawableUtils.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/utils/DrawableUtils.java
@@ -0,0 +1,24 @@
+package com.beardedhen.androidbootstrap.utils;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.support.annotation.DrawableRes;
+
+public class DrawableUtils {
+
+    @SuppressWarnings("deprecation")
+    public static Drawable resolveDrawable(@DrawableRes int resId, Context context) {
+        Resources resources = context.getResources();
+        Resources.Theme theme = context.getTheme();
+
+        if (Build.VERSION.SDK_INT >= 22) {
+            return resources.getDrawable(resId, theme);
+        }
+        else {
+            return resources.getDrawable(resId);
+        }
+    }
+
+}
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/utils/ViewUtils.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/utils/ViewUtils.java
diff --git a/sample/src/main/java/com/fractalwrench/androidbootstrap/sample/BaseActivity.java b/sample/src/main/java/com/fractalwrench/androidbootstrap/sample/BaseActivity.java
diff --git a/sample/src/main/java/com/fractalwrench/androidbootstrap/sample/BootstrapAlertExample.java b/sample/src/main/java/com/fractalwrench/androidbootstrap/sample/BootstrapAlertExample.java
diff --git a/sample/src/main/java/com/fractalwrench/androidbootstrap/sample/BootstrapCircleThumbnailExample.java b/sample/src/main/java/com/fractalwrench/androidbootstrap/sample/BootstrapCircleThumbnailExample.java
diff --git a/sample/src/main/java/com/fractalwrench/androidbootstrap/sample/BootstrapThumbnailExample.java b/sample/src/main/java/com/fractalwrench/androidbootstrap/sample/BootstrapThumbnailExample.java
