Browse Source

Removed unused resources, satisfied lint warnings, other cleanup.

Aidan Follestad 10 năm trước cách đây
mục cha
commit
d00abc814e
21 tập tin đã thay đổi với 34 bổ sung151 xóa
  1. 3 3
      commons/src/main/java/com/afollestad/materialdialogs/commons/color/CircleView.java
  2. 2 1
      commons/src/main/java/com/afollestad/materialdialogs/commons/prefs/MaterialEditTextPreference.java
  3. 2 2
      commons/src/main/java/com/afollestad/materialdialogs/commons/simplelist/MaterialSimpleListItem.java
  4. 2 0
      core/src/main/java/com/afollestad/materialdialogs/GravityEnum.java
  5. 11 10
      core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java
  6. 1 1
      core/src/main/java/com/afollestad/materialdialogs/internal/MDRootLayout.java
  7. 4 4
      core/src/main/java/com/afollestad/materialdialogs/progress/CircularProgressDrawable.java
  8. 2 1
      core/src/main/java/com/afollestad/materialdialogs/util/DialogUtils.java
  9. 2 0
      sample/src/main/java/com/afollestad/materialdialogssample/ChangelogDialog.java
  10. 2 0
      sample/src/main/java/com/afollestad/materialdialogssample/FolderSelectorDialog.java
  11. 2 2
      sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java
  12. 1 0
      sample/src/main/java/com/afollestad/materialdialogssample/PreferenceActivityCompat.java
  13. BIN
      sample/src/main/res/drawable-hdpi/ic_check.png
  14. BIN
      sample/src/main/res/drawable-mdpi/ic_check.png
  15. BIN
      sample/src/main/res/drawable-xhdpi/ic_check.png
  16. BIN
      sample/src/main/res/drawable-xxhdpi/ic_check.png
  17. 0 89
      sample/src/main/res/layout/preference_list_fragment.xml
  18. 0 6
      sample/src/main/res/values-land/integers.xml
  19. 0 24
      sample/src/main/res/values/arrays.xml
  20. 0 6
      sample/src/main/res/values/integers.xml
  21. 0 2
      sample/src/main/res/values/strings.xml

+ 3 - 3
commons/src/main/java/com/afollestad/materialdialogs/commons/color/CircleView.java

@@ -25,9 +25,9 @@ public class CircleView extends FrameLayout {
     private final int borderWidthSmall;
     private final int borderWidthLarge;
 
-    private Paint outerPaint;
-    private Paint whitePaint;
-    private Paint innerPaint;
+    private final Paint outerPaint;
+    private final Paint whitePaint;
+    private final Paint innerPaint;
     private boolean mSelected;
 
     public CircleView(Context context) {

+ 2 - 1
commons/src/main/java/com/afollestad/materialdialogs/commons/prefs/MaterialEditTextPreference.java

@@ -39,7 +39,7 @@ public class MaterialEditTextPreference extends EditTextPreference {
 
     private int mColor = 0;
     private MaterialDialog mDialog;
-    private EditText mEditText;
+    private final EditText mEditText;
 
     public MaterialEditTextPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -112,6 +112,7 @@ public class MaterialEditTextPreference extends EditTextPreference {
                 .callback(callback)
                 .dismissListener(this);
 
+        @SuppressLint("InflateParams")
         View layout = LayoutInflater.from(getContext()).inflate(R.layout.md_stub_inputpref, null);
         onBindDialogView(layout);
 

+ 2 - 2
commons/src/main/java/com/afollestad/materialdialogs/commons/simplelist/MaterialSimpleListItem.java

@@ -11,7 +11,7 @@ import android.support.v4.content.ContextCompat;
  */
 public class MaterialSimpleListItem {
 
-    private Builder mBuilder;
+    private final Builder mBuilder;
 
     private MaterialSimpleListItem(Builder builder) {
         mBuilder = builder;
@@ -27,7 +27,7 @@ public class MaterialSimpleListItem {
 
     public static class Builder {
 
-        private Context mContext;
+        private final Context mContext;
         protected Drawable mIcon;
         protected CharSequence mContent;
 

+ 2 - 0
core/src/main/java/com/afollestad/materialdialogs/GravityEnum.java

@@ -1,5 +1,6 @@
 package com.afollestad.materialdialogs;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.view.Gravity;
@@ -10,6 +11,7 @@ public enum GravityEnum {
 
     private static final boolean HAS_RTL = Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1;
 
+    @SuppressLint("RtlHardcoded")
     public int getGravityInt() {
         switch (this) {
             case START:

+ 11 - 10
core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java

@@ -20,6 +20,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.annotation.UiThread;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.content.res.ResourcesCompat;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -466,7 +467,7 @@ public class MaterialDialog extends DialogBase implements
 
         public Builder(@NonNull Context context) {
             this.context = context;
-            final int materialBlue = context.getResources().getColor(R.color.md_material_blue_600);
+            final int materialBlue = ContextCompat.getColor(context, R.color.md_material_blue_600);
 
             // Retrieve default accent colors, which are used on the action buttons and progress bars
             this.widgetColor = DialogUtils.resolveColor(context, R.attr.colorAccent, materialBlue);
@@ -580,7 +581,7 @@ public class MaterialDialog extends DialogBase implements
         }
 
         public Builder titleColorRes(@ColorRes int colorRes) {
-            titleColor(this.context.getResources().getColor(colorRes));
+            titleColor(ContextCompat.getColor(this.context, colorRes));
             return this;
         }
 
@@ -664,7 +665,7 @@ public class MaterialDialog extends DialogBase implements
         }
 
         public Builder contentColorRes(@ColorRes int colorRes) {
-            contentColor(this.context.getResources().getColor(colorRes));
+            contentColor(ContextCompat.getColor(this.context, colorRes));
             return this;
         }
 
@@ -709,7 +710,7 @@ public class MaterialDialog extends DialogBase implements
         }
 
         public Builder itemColorRes(@ColorRes int colorRes) {
-            return itemColor(this.context.getResources().getColor(colorRes));
+            return itemColor(ContextCompat.getColor(this.context, colorRes));
         }
 
         public Builder itemColorAttr(@AttrRes int colorAttr) {
@@ -996,7 +997,7 @@ public class MaterialDialog extends DialogBase implements
         }
 
         public Builder widgetColorRes(@ColorRes int colorRes) {
-            return widgetColor(this.context.getResources().getColor(colorRes));
+            return widgetColor(ContextCompat.getColor(this.context, colorRes));
         }
 
         public Builder widgetColorAttr(@AttrRes int colorAttr) {
@@ -1010,7 +1011,7 @@ public class MaterialDialog extends DialogBase implements
         }
 
         public Builder dividerColorRes(@ColorRes int colorRes) {
-            return dividerColor(this.context.getResources().getColor(colorRes));
+            return dividerColor(ContextCompat.getColor(this.context, colorRes));
         }
 
         public Builder dividerColorAttr(@AttrRes int colorAttr) {
@@ -1023,7 +1024,7 @@ public class MaterialDialog extends DialogBase implements
         }
 
         public Builder backgroundColorRes(@ColorRes int colorRes) {
-            return backgroundColor(this.context.getResources().getColor(colorRes));
+            return backgroundColor(ContextCompat.getColor(this.context, colorRes));
         }
 
         public Builder backgroundColorAttr(@AttrRes int colorAttr) {
@@ -1154,7 +1155,7 @@ public class MaterialDialog extends DialogBase implements
                 throw new IllegalArgumentException("Max length for input dialogs cannot be less than 1.");
             this.inputMaxLength = maxLength;
             if (errorColor == 0) {
-                inputMaxLengthErrorColor = context.getResources().getColor(R.color.md_edittext_error);
+                inputMaxLengthErrorColor = ContextCompat.getColor(context, R.color.md_edittext_error);
             } else {
                 this.inputMaxLengthErrorColor = errorColor;
             }
@@ -1165,7 +1166,7 @@ public class MaterialDialog extends DialogBase implements
          * Same as #{@link #inputMaxLength(int, int)}, but it takes a color resource ID for the error color.
          */
         public Builder inputMaxLengthRes(int maxLength, @ColorRes int errorColor) {
-            return inputMaxLength(maxLength, context.getResources().getColor(errorColor));
+            return inputMaxLength(maxLength, ContextCompat.getColor(context, errorColor));
         }
 
         public Builder alwaysCallInputCallback() {
@@ -1407,7 +1408,7 @@ public class MaterialDialog extends DialogBase implements
         setProgress(getCurrentProgress() + by);
     }
 
-    private Handler mHandler;
+    private final Handler mHandler;
 
     public final void setProgress(final int progress) {
         if (mBuilder.progress <= -2)

+ 1 - 1
core/src/main/java/com/afollestad/materialdialogs/internal/MDRootLayout.java

@@ -42,7 +42,7 @@ public class MDRootLayout extends ViewGroup {
     private static final int INDEX_POSITIVE = 2;
     private boolean mDrawTopDivider = false;
     private boolean mDrawBottomDivider = false;
-    private MDButton[] mButtons = new MDButton[3];
+    private final MDButton[] mButtons = new MDButton[3];
     private boolean mForceStack = false;
     private boolean mIsStacked = false;
     private boolean mUseFullPadding = true;

+ 4 - 4
core/src/main/java/com/afollestad/materialdialogs/progress/CircularProgressDrawable.java

@@ -32,11 +32,11 @@ public class CircularProgressDrawable extends Drawable
     private ObjectAnimator mObjectAnimatorSweep;
     private ObjectAnimator mObjectAnimatorAngle;
     private boolean mModeAppearing;
-    private Paint mPaint;
+    private final Paint mPaint;
     private float mCurrentGlobalAngleOffset;
     private float mCurrentGlobalAngle;
     private float mCurrentSweepAngle;
-    private float mBorderWidth;
+    private final float mBorderWidth;
     private boolean mRunning;
 
     public CircularProgressDrawable(int color, float borderWidth) {
@@ -143,7 +143,7 @@ public class CircularProgressDrawable extends Drawable
     //////////////////////////////////////////////////////////////////////////////
     ////////////////            Animation
 
-    private Property<CircularProgressDrawable, Float> mAngleProperty
+    private final Property<CircularProgressDrawable, Float> mAngleProperty
             = new Property<CircularProgressDrawable, Float>(Float.class, "angle") {
         @Override
         public Float get(CircularProgressDrawable object) {
@@ -156,7 +156,7 @@ public class CircularProgressDrawable extends Drawable
         }
     };
 
-    private Property<CircularProgressDrawable, Float> mSweepProperty
+    private final Property<CircularProgressDrawable, Float> mSweepProperty
             = new Property<CircularProgressDrawable, Float>(Float.class, "arc") {
         @Override
         public Float get(CircularProgressDrawable object) {

+ 2 - 1
core/src/main/java/com/afollestad/materialdialogs/util/DialogUtils.java

@@ -9,6 +9,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.annotation.AttrRes;
 import android.support.annotation.ColorRes;
+import android.support.v4.content.ContextCompat;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -73,7 +74,7 @@ public class DialogUtils {
         if (value.type >= TypedValue.TYPE_FIRST_COLOR_INT && value.type <= TypedValue.TYPE_LAST_COLOR_INT) {
             return getActionTextStateList(context, value.data);
         } else {
-            return context.getResources().getColorStateList(colorId);
+            return ContextCompat.getColorStateList(context, colorId);
         }
     }
 

+ 2 - 0
sample/src/main/java/com/afollestad/materialdialogssample/ChangelogDialog.java

@@ -1,5 +1,6 @@
 package com.afollestad.materialdialogssample;
 
+import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.graphics.Color;
 import android.os.Bundle;
@@ -31,6 +32,7 @@ public class ChangelogDialog extends DialogFragment {
         return dialog;
     }
 
+    @SuppressLint("InflateParams")
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {

+ 2 - 0
sample/src/main/java/com/afollestad/materialdialogssample/FolderSelectorDialog.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
@@ -66,6 +67,7 @@ public class FolderSelectorDialog extends DialogFragment implements MaterialDial
         return results.toArray(new File[results.size()]);
     }
 
+    @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         return new MaterialDialog.Builder(getActivity())

+ 2 - 2
sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java

@@ -558,10 +558,10 @@ public class MainActivity extends AppCompatActivity implements
 
         int widgetColor = ThemeSingleton.get().widgetColor;
         MDTintHelper.setTint(checkbox,
-                widgetColor == 0 ? getResources().getColor(R.color.material_teal_500) : widgetColor);
+                widgetColor == 0 ? ContextCompat.getColor(this, R.color.material_teal_500) : widgetColor);
 
         MDTintHelper.setTint(passwordInput,
-                widgetColor == 0 ? getResources().getColor(R.color.material_teal_500) : widgetColor);
+                widgetColor == 0 ? ContextCompat.getColor(this, R.color.material_teal_500) : widgetColor);
 
         dialog.show();
         positiveAction.setEnabled(false); // disabled by default

+ 1 - 0
sample/src/main/java/com/afollestad/materialdialogssample/PreferenceActivityCompat.java

@@ -8,6 +8,7 @@ import android.view.MenuItem;
 @TargetApi(Build.VERSION_CODES.GINGERBREAD_MR1)
 public class PreferenceActivityCompat extends android.preference.PreferenceActivity {
 
+    @SuppressWarnings("deprecation")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

BIN
sample/src/main/res/drawable-hdpi/ic_check.png


BIN
sample/src/main/res/drawable-mdpi/ic_check.png


BIN
sample/src/main/res/drawable-xhdpi/ic_check.png


BIN
sample/src/main/res/drawable-xxhdpi/ic_check.png


+ 0 - 89
sample/src/main/res/layout/preference_list_fragment.xml

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-/*
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_height="fill_parent"
-    android:layout_width="fill_parent"
-    android:background="@android:color/transparent">
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="0px"
-        android:layout_weight="1"
-        android:paddingTop="0dip"
-        android:paddingBottom="@dimen/preference_fragment_padding_bottom"
-        android:paddingLeft="@dimen/preference_fragment_padding_side"
-        android:paddingRight="@dimen/preference_fragment_padding_side"
-        android:scrollbarStyle="@integer/preference_fragment_scrollbarStyle"
-        android:clipToPadding="false"
-        android:drawSelectorOnTop="false"
-        android:cacheColorHint="@android:color/transparent"
-        android:scrollbarAlwaysDrawVerticalTrack="true" />
-
-    <TextView
-        android:id="@android:id/empty"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:padding="@dimen/preference_fragment_padding_side"
-        android:gravity="center"
-        android:visibility="gone" />
-
-    <RelativeLayout
-        android:id="@+id/button_bar"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:layout_weight="0"
-        android:visibility="gone">
-
-        <Button
-            android:id="@+id/back_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:text="@string/back_button_label" />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true">
-
-            <Button
-                android:id="@+id/skip_button"
-                android:layout_width="150dip"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dip"
-                android:text="@string/skip_button_label"
-                android:visibility="gone" />
-
-            <Button
-                android:id="@+id/next_button"
-                android:layout_width="150dip"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dip"
-                android:text="@string/next_button_label" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</LinearLayout>

+ 0 - 6
sample/src/main/res/values-land/integers.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <integer name="color_chooser_columns">5</integer>
-
-</resources>

+ 0 - 24
sample/src/main/res/values/arrays.xml

@@ -1,30 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <array name="colors">
-        <item>#3F51B5</item>
-        <item>#9E9E9E</item>
-        <item>#424242</item>
-        <item>#1F1F1F</item>
-        <item>#607D8B</item>
-        <item>#795548</item>
-        <item>#D32F2F</item>
-        <item>#E91E63</item>
-        <item>#9C27B0</item>
-        <item>#5E35B1</item>
-        <item>#1E88E5</item>
-        <item>#03A9F4</item>
-        <item>#00BCD4</item>
-        <item>#009688</item>
-        <item>#4CAF50</item>
-        <item>#8BC34A</item>
-        <item>#CDDC39</item>
-        <item>#FFEB3B</item>
-        <item>#FFC107</item>
-        <item>#FF9800</item>
-        <item>#FF5722</item>
-    </array>
-
     <string-array name="preference_values">
         <item>Twitter</item>
         <item>Google</item>

+ 0 - 6
sample/src/main/res/values/integers.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <integer name="color_chooser_columns">4</integer>
-
-</resources>

+ 0 - 2
sample/src/main/res/values/strings.xml

@@ -138,7 +138,6 @@
     <string name="progress_dialog_indeterminate_horizontal">Progress Dialog (Horizontal Indeterminate)</string>
     <string name="progress_dialog">Progress Dialog</string>
     <string name="please_wait">Please wait…</string>
-    <string name="done">Done</string>
     <string name="optional_dialog_message">This is an optional dialog message.</string>
     <string name="multiChoiceLimited">Multi Choice (Limit Selections)</string>
     <string name="selection_limit_reached">Selection limit reached!</string>
@@ -163,7 +162,6 @@
     <string name="material_dialog_pref_summary">This is an example of a basic dialog preference that automatically uses Material Dialogs to show the dialog.</string>
     <string name="input_content_custominvalidation">Do not type hello, or else!</string>
     <string name="clear_selection">Clear</string>
-    <string name="back">Back</string>
     <string name="color_palette">Color Palette</string>
     <string name="colors">Colors</string>