Parcourir la source

Switch gravityint to rely on internal constants

Not pretty, but necessary
Henri Sweers il y a 10 ans
Parent
commit
a91b74a6fd

+ 23 - 6
library/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java

@@ -53,9 +53,13 @@ import java.util.List;
  */
 public class MaterialDialog extends DialogBase implements View.OnClickListener {
 
-    @IntDef({Gravity.START, Gravity.CENTER_HORIZONTAL, Gravity.END})
+    @IntDef({START, CENTER, END})
     public @interface GravityInt {}
 
+    public static final int START = 0;
+    public static final int CENTER = 1;
+    public static final int END = 2;
+
     protected View view;
     protected ListView listView;
     protected ImageView icon;
@@ -125,7 +129,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
             //noinspection ResourceType
             title.setTextAlignment(gravityToAlignment(builder.titleGravity));
         } else {
-            title.setGravity(builder.titleGravity);
+            title.setGravity(gravityIntToGravity(builder.titleGravity));
         }
 
         if (builder.contentColor != -1) {
@@ -237,7 +241,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
                 //noinspection ResourceType
                 content.setTextAlignment(gravityToAlignment(builder.contentGravity));
             } else {
-                content.setGravity(builder.contentGravity);
+                content.setGravity(gravityIntToGravity(builder.contentGravity));
             }
         }
 
@@ -276,14 +280,27 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
         }
     }
 
+    private static int gravityIntToGravity(@GravityInt int gravity) {
+        switch (gravity) {
+            case START:
+                return Gravity.START;
+            case CENTER:
+                return Gravity.CENTER_HORIZONTAL;
+            case END:
+                return Gravity.END;
+            default:
+                return Gravity.START;
+        }
+    }
+
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     private static int gravityToAlignment(@GravityInt int gravity) {
         switch (gravity) {
-            case Gravity.START:
+            case START:
                 return View.TEXT_ALIGNMENT_VIEW_START;
-            case Gravity.CENTER_HORIZONTAL:
+            case CENTER:
                 return View.TEXT_ALIGNMENT_CENTER;
-            case Gravity.END:
+            case END:
                 return View.TEXT_ALIGNMENT_VIEW_END;
             default:
                 return View.TEXT_ALIGNMENT_VIEW_START;

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

@@ -409,7 +409,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(Gravity.CENTER_HORIZONTAL)
+                .titleGravity(MaterialDialog.CENTER)
                 .titleColorRes(R.color.material_red_400)
                 .contentColorRes(android.R.color.white)
                 .theme(Theme.DARK)