ソースを参照

Use Enum for gravity

Unfortunately AAR is too limiting by the fact that it can't include source, which means that IntDef's are out of the question
Henri Sweers 10 年 前
コミット
c97c6c0f3e

+ 10 - 24
library/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java

@@ -16,13 +16,10 @@ import android.support.annotation.ArrayRes;
 import android.support.annotation.AttrRes;
 import android.support.annotation.ColorRes;
 import android.support.annotation.DrawableRes;
-import android.support.annotation.IntDef;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.method.LinkMovementMethod;
 import android.view.ContextThemeWrapper;
@@ -57,17 +54,6 @@ import java.util.List;
  */
 public class MaterialDialog extends DialogBase implements View.OnClickListener {
 
-    @IntDef({START, CENTER, END})
-    public @interface GravityInt {
-    }
-
-    @SuppressWarnings("WeakerAccess")
-    public static final int START = 0;
-    @SuppressWarnings("WeakerAccess")
-    public static final int CENTER = 1;
-    @SuppressWarnings("WeakerAccess")
-    public static final int END = 2;
-
     protected final View view;
     protected final Builder mBuilder;
     protected ListView listView;
@@ -296,7 +282,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
         }
     }
 
-    private static int gravityIntToGravity(@GravityInt int gravity) {
+    private static int gravityIntToGravity(GravityEnum gravity) {
         switch (gravity) {
             case CENTER:
                 return Gravity.CENTER_HORIZONTAL;
@@ -308,7 +294,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
     }
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-    private static int gravityToAlignment(@GravityInt int gravity) {
+    private static int gravityToAlignment(GravityEnum gravity) {
         switch (gravity) {
             case CENTER:
                 return View.TEXT_ALIGNMENT_CENTER;
@@ -803,12 +789,8 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
 
         protected final Context context;
         protected CharSequence title;
-        protected
-        @GravityInt
-        int titleGravity = Gravity.START;
-        protected
-        @GravityInt
-        int contentGravity = Gravity.START;
+        protected GravityEnum titleGravity = GravityEnum.START;
+        protected GravityEnum contentGravity = GravityEnum.START;
         protected int titleColor = -1;
         protected int contentColor = -1;
         protected CharSequence content;
@@ -908,7 +890,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
             return this;
         }
 
-        public Builder titleGravity(@GravityInt int gravity) {
+        public Builder titleGravity(GravityEnum gravity) {
             this.titleGravity = gravity;
             return this;
         }
@@ -976,7 +958,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
             return this;
         }
 
-        public Builder contentGravity(@GravityInt int gravity) {
+        public Builder contentGravity(GravityEnum gravity) {
             this.contentGravity = gravity;
             return this;
         }
@@ -1538,6 +1520,10 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
         }
     }
 
+    public static enum GravityEnum {
+        START, CENTER, END
+    }
+
     public static interface ListCallback {
         void onSelection(MaterialDialog dialog, View itemView, int which, CharSequence text);
     }

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

@@ -431,7 +431,7 @@ public class MainActivity extends ActionBarActivity implements FolderSelectorDia
                 .negativeText(R.string.disagree)
                 .positiveColorRes(R.color.material_red_400)
                 .negativeColorRes(R.color.material_red_400)
-                .titleGravity(MaterialDialog.CENTER)
+                .titleGravity(MaterialDialog.GravityEnum.CENTER)
                 .titleColorRes(R.color.material_red_400)
                 .contentColorRes(android.R.color.white)
                 .backgroundColorRes(R.color.material_blue_grey_800)