release 2.1.6

mylhyl · May 8, 2017 · 6b96e63 · 6b96e63
1 parent c341774
commit 6b96e63
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
 
 # 引入
 ```xml
- compile 'com.mylhyl:circleDialog:2.1.5'
+ compile 'com.mylhyl:circleDialog:2.1.6'
 ```
 
 eclipse 可以[点击这里下载aar文件](http://jcenter.bintray.com/com/mylhyl/circleDialog/), 然后用zip解压取出jar包
@@ -83,6 +83,8 @@ QQ交流群：553426264 [点击链接加入群Android-CircleDialog](https://jq.q
 
 # 版本
 
+> 2.1.6 增加`text`及`title`参数`gravity`
+
 > 2.1.5 修复已知Bug
 
 > 2.1.4 minSdkVersion 15

diff --git a/app/src/main/java/com/mylhyl/circledialog/sample/MainActivity.java b/app/src/main/java/com/mylhyl/circledialog/sample/MainActivity.java
@@ -16,10 +16,12 @@
 import com.mylhyl.circledialog.callback.ConfigButton;
 import com.mylhyl.circledialog.callback.ConfigDialog;
 import com.mylhyl.circledialog.callback.ConfigInput;
+import com.mylhyl.circledialog.callback.ConfigText;
 import com.mylhyl.circledialog.params.ButtonParams;
 import com.mylhyl.circledialog.params.DialogParams;
 import com.mylhyl.circledialog.params.InputParams;
 import com.mylhyl.circledialog.params.ProgressParams;
+import com.mylhyl.circledialog.params.TextParams;
 import com.mylhyl.circledialog.view.listener.OnInputClickListener;
 
 import java.util.Timer;
@@ -46,6 +48,13 @@ public void onItemClick(final AdapterView<?> parent, View view, int position, lo
                 new CircleDialog.Builder(this)
                         .setTitle("标题")
                         .setText("提示框")
+                        .configText(new ConfigText() {
+                            @Override
+                            public void onConfig(TextParams params) {
+                                params.gravity = Gravity.LEFT;
+                                params.padding = new int[]{50, 50, 50, 50};
+                            }
+                        })
                         .setPositive("确定", null)
                         .show();
                 break;
@@ -82,7 +91,8 @@ public void onConfig(DialogParams params) {
                         .setTitleColor(Color.BLUE)
                         .setItems(items, new AdapterView.OnItemClickListener() {
                             @Override
-                            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                            public void onItemClick(AdapterView<?> parent, View view, int
+                                    position, long id) {
 
                             }
                         })
@@ -173,7 +183,8 @@ public void run() {
                     @Override
                     public void onConfig(DialogParams params) {
                         params.gravity = Gravity.TOP;
-//                        TranslateAnimation refreshAnimation = new TranslateAnimation(15, -15, 0, 0);
+//                        TranslateAnimation refreshAnimation = new TranslateAnimation(15, -15,
+// 0, 0);
 //                        refreshAnimation.setInterpolator(new OvershootInterpolator());
 //                        refreshAnimation.setDuration(100);
 //                        refreshAnimation.setRepeatCount(3);

diff --git a/circledialog/build.gradle b/circledialog/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 23
         versionCode 1
-        versionName "2017.5.5"
+        versionName "2017.5.8"
     }
     buildTypes {
         release {
@@ -33,7 +33,7 @@ publish {
     userOrg = 'mylhyl'
     groupId = 'com.mylhyl'
     artifactId = 'circleDialog'
-    version = '2.1.5'
+    version = '2.1.6'
     description = 'circleDialog ios style'
     website = "https://github.com/mylhyl/Android-CircleDialog"
 }
diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/params/TextParams.java b/circledialog/src/main/java/com/mylhyl/circledialog/params/TextParams.java
@@ -2,6 +2,7 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.view.Gravity;
 
 import com.mylhyl.circledialog.res.values.CircleColor;
 import com.mylhyl.circledialog.res.values.CircleDimen;
@@ -36,6 +37,8 @@ public class TextParams implements Parcelable {
      */
     public int textSize = CircleDimen.CONTENT_TEXT_SIZE;
 
+    public int gravity = Gravity.CENTER;
+
     @Override
     public int describeContents() {
         return 0;
@@ -49,6 +52,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(this.backgroundColor);
         dest.writeInt(this.textColor);
         dest.writeInt(this.textSize);
+        dest.writeInt(this.gravity);
     }
 
     public TextParams() {
@@ -61,6 +65,7 @@ protected TextParams(Parcel in) {
         this.backgroundColor = in.readInt();
         this.textColor = in.readInt();
         this.textSize = in.readInt();
+        this.gravity = in.readInt();
     }
 
     public static final Parcelable.Creator<TextParams> CREATOR = new Parcelable

diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/params/TitleParams.java b/circledialog/src/main/java/com/mylhyl/circledialog/params/TitleParams.java
@@ -2,12 +2,11 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.view.Gravity;
 
 import com.mylhyl.circledialog.res.values.CircleColor;
 import com.mylhyl.circledialog.res.values.CircleDimen;
 
-import java.io.Serializable;
-
 /**
  * 标题参数
  * Created by hupei on 2017/3/30.
@@ -34,6 +33,7 @@ public class TitleParams implements Parcelable {
      */
     public int backgroundColor;
 
+    public int gravity = Gravity.CENTER;
 
     @Override
     public int describeContents() {
@@ -47,6 +47,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(this.textSize);
         dest.writeInt(this.textColor);
         dest.writeInt(this.backgroundColor);
+        dest.writeInt(this.gravity);
     }
 
     public TitleParams() {
@@ -58,6 +59,7 @@ protected TitleParams(Parcel in) {
         this.textSize = in.readInt();
         this.textColor = in.readInt();
         this.backgroundColor = in.readInt();
+        this.gravity = in.readInt();
     }
 
     public static final Parcelable.Creator<TitleParams> CREATOR = new Parcelable

diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/view/BodyTextView.java b/circledialog/src/main/java/com/mylhyl/circledialog/view/BodyTextView.java
@@ -3,10 +3,10 @@
 import android.content.Context;
 import android.os.Build;
 
+import com.mylhyl.circledialog.params.ButtonParams;
 import com.mylhyl.circledialog.params.CircleParams;
 import com.mylhyl.circledialog.params.DialogParams;
 import com.mylhyl.circledialog.params.TextParams;
-import com.mylhyl.circledialog.params.ButtonParams;
 import com.mylhyl.circledialog.params.TitleParams;
 import com.mylhyl.circledialog.res.drawable.CircleDrawable;
 import com.mylhyl.circledialog.res.values.CircleColor;
@@ -31,6 +31,8 @@ private void init(CircleParams params) {
         ButtonParams negativeParams = params.negativeParams;
         ButtonParams positiveParams = params.positiveParams;
 
+        setGravity(textParams.gravity);
+
         //如果标题没有背景色，则使用默认色
         int backgroundColor = textParams.backgroundColor != 0 ? textParams.backgroundColor :
                 CircleColor.bgDialog;
@@ -66,7 +68,8 @@ else if (titleParams == null && negativeParams == null && positiveParams == null
         //有标题有按钮则不用考虑圆角
         else setBackgroundColor(backgroundColor);
 
-        setHeight(textParams.height);
+//        setHeight(textParams.height);
+        setMinHeight(textParams.height);
         setTextColor(textParams.textColor);
         setTextSize(textParams.textSize);
         setText(textParams.text);

diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/view/TitleView.java b/circledialog/src/main/java/com/mylhyl/circledialog/view/TitleView.java
@@ -24,6 +24,8 @@ private void init(CircleParams params) {
         DialogParams dialogParams = params.dialogParams;
         TitleParams titleParams = params.titleParams;
 
+        setGravity(titleParams.gravity);
+
         //如果标题没有背景色，则使用默认色
         int backgroundColor = titleParams.backgroundColor != 0 ? titleParams.backgroundColor :
                 CircleColor.bgDialog;