移除百分比适配

Author: mylhyl

circledialog/src/main/java/com/mylhyl/circledialog/AbsBaseCircleDialog.java

@@ -23,7 +23,6 @@
 
 import com.mylhyl.circledialog.res.drawable.CircleDrawable;
 import com.mylhyl.circledialog.res.values.CircleDimen;
-import com.mylhyl.circledialog.scale.ScaleUtils;
 
 /**
  * Created by hupei on 2017/3/29.
@@ -166,9 +165,7 @@ private void setDialogGravity(Dialog dialog) {
         if (mPadding != null) {
             int[] padding = mPadding;
             wlp.width = WindowManager.LayoutParams.MATCH_PARENT;
-            window.getDecorView().setPadding(ScaleUtils.scaleValue(padding[0]), ScaleUtils
-                    .scaleValue(padding[1]), ScaleUtils.scaleValue(padding[2]), ScaleUtils
-                    .scaleValue(padding[3]));
+            window.getDecorView().setPadding(padding[0], padding[1], padding[2], padding[3]);
         }
         window.setAttributes(wlp);
         //动画

circledialog/src/main/java/com/mylhyl/circledialog/BaseCircleDialog.java

@@ -14,7 +14,6 @@
 import android.view.WindowManager;
 
 import com.mylhyl.circledialog.params.DialogParams;
-import com.mylhyl.circledialog.scale.ScaleLayoutConfig;
 
 /**
  * Created by hupei on 2017/3/29.
@@ -75,7 +74,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ScaleLayoutConfig.init(getContext().getApplicationContext());
         if (savedInstanceState != null) {
             mParams = savedInstanceState.getParcelable(SAVED_PARAMS);
         }

circledialog/src/main/java/com/mylhyl/circledialog/res/values/CircleDimen.java

@@ -11,23 +11,23 @@ public class CircleDimen {
     /**
      * 标题高
      */
-    public static int TITLE_HEIGHT = 170;
+    public static int TITLE_HEIGHT = 100;
     /**
      * 文本对话框的内容高度
      */
     public static int TEXT_HEIGHT = 180;
     /**
      * 标题字体大小
      */
-    public static int TITLE_TEXT_SIZE = 60;
+    public static int TITLE_TEXT_SIZE = 16;
     /**
      * 副标题字体大小
      */
     public static int SUBTITLE_TEXT_SIZE = 52;
     /**
      * 文字消息字体大小
      */
-    public static int CONTENT_TEXT_SIZE = 50;
+    public static int CONTENT_TEXT_SIZE = 16;
     /**
      * 列表item字体大小
      */
@@ -51,7 +51,7 @@ public class CircleDimen {
     /**
      * 底部按钮字体大小
      */
-    public static int FOOTER_BUTTON_TEXT_SIZE = 40;
+    public static int FOOTER_BUTTON_TEXT_SIZE = 16;
     /**
      * 列表模式底部按钮与列表的距离
      */

circledialog/src/main/java/com/mylhyl/circledialog/scale/ScaleAdapter.java

@@ -8,6 +8,7 @@
 import android.view.View;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.mylhyl.circledialog.CircleParams;
 import com.mylhyl.circledialog.EmojiFilter;
@@ -25,8 +26,8 @@
  */
 
 final class BodyInputView extends RelativeLayout implements InputView {
-    private ScaleEditText mEditText;
-    private ScaleTextView mTvCounter;
+    private EditText mEditText;
+    private TextView mTvCounter;
 
     public BodyInputView(Context context, CircleParams params) {
         super(context);
@@ -42,7 +43,7 @@ private void init(Context context, CircleParams params) {
                 ? inputParams.backgroundColor : dialogParams.backgroundColor;
         setBackgroundColor(backgroundColor);
 
-        mEditText = new ScaleEditText(context);
+        mEditText = new EditText(context);
         mEditText.setId(android.R.id.input);
         int inputType = inputParams.inputType;
         if (inputType != InputType.TYPE_NULL) {
@@ -86,7 +87,7 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int
         }
         int[] padding = inputParams.padding;
         if (padding != null)
-            mEditText.setAutoPadding(padding[0], padding[1], padding[2], padding[3]);
+            mEditText.setPadding(padding[0], padding[1], padding[2], padding[3]);
         mEditText.setTypeface(mEditText.getTypeface(), inputParams.styleText);
 
         addView(mEditText, layoutParams);
@@ -102,7 +103,7 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int
                         , inputParams.counterMargins[0]
                         , inputParams.counterMargins[1]);
             }
-            mTvCounter = new ScaleTextView(context);
+            mTvCounter = new TextView(context);
             mTvCounter.setTextSize(INPUT_COUNTER__TEXT_SIZE);
             mTvCounter.setTextColor(inputParams.counterColor);
 

circledialog/src/main/java/com/mylhyl/circledialog/scale/ScaleLayoutConfig.java

@@ -130,12 +130,12 @@ public View getView(int position, View convertView, ViewGroup parent) {
             ViewHolder viewHolder;
             if (convertView == null) {
                 viewHolder = new ViewHolder();
-                ScaleTextView textView = new ScaleTextView(mContext);
+                TextView textView = new TextView(mContext);
                 textView.setTextSize(mItemsParams.textSize);
                 textView.setTextColor(mItemsParams.textColor);
                 textView.setHeight(mItemsParams.itemHeight);
                 if (mItemsParams.padding != null) {
-                    textView.setAutoPadding(mItemsParams.padding[0], mItemsParams.padding[1]
+                    textView.setPadding(mItemsParams.padding[0], mItemsParams.padding[1]
                             , mItemsParams.padding[2], mItemsParams.padding[3]);
                 }
                 if (mItemsParams.textGravity != Gravity.NO_GRAVITY)

circledialog/src/main/java/com/mylhyl/circledialog/scale/ScaleUtils.java

@@ -4,13 +4,13 @@
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import com.airbnb.lottie.LottieAnimationView;
 import com.airbnb.lottie.LottieDrawable;
 import com.mylhyl.circledialog.CircleParams;
 import com.mylhyl.circledialog.params.DialogParams;
 import com.mylhyl.circledialog.params.LottieParams;
-import com.mylhyl.circledialog.scale.ScaleUtils;
 import com.mylhyl.circledialog.view.listener.OnCreateLottieListener;
 
 /**
@@ -40,8 +40,8 @@ private void init(Context context, CircleParams params) {
         int lottieWidth = mLottieParams.lottieWidth;
         int lottieHeight = mLottieParams.lottieHeight;
         LayoutParams layoutParams = new LayoutParams(
-                lottieWidth <= 0 ? LayoutParams.WRAP_CONTENT : ScaleUtils.scaleValue(lottieWidth)
-                , lottieHeight <= 0 ? LayoutParams.WRAP_CONTENT : ScaleUtils.scaleValue(lottieHeight));
+                lottieWidth <= 0 ? LayoutParams.WRAP_CONTENT : lottieWidth
+                , lottieHeight <= 0 ? LayoutParams.WRAP_CONTENT : lottieHeight);
         int[] margins = mLottieParams.margins;
         if (margins != null)
             layoutParams.setMargins(margins[0], margins[1], margins[2], margins[3]);
@@ -62,9 +62,9 @@ private void init(Context context, CircleParams params) {
         addView(mLottieAnimationView, layoutParams);
 
         //构建文本
-        ScaleTextView textView = null;
+        TextView textView = null;
         if (!TextUtils.isEmpty(mLottieParams.text)) {
-            textView = new ScaleTextView(getContext());
+            textView = new TextView(getContext());
             LayoutParams textLayoutParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
             textLayoutParams.gravity = Gravity.CENTER;
             int[] textMargins = mLottieParams.textMargins;
@@ -76,7 +76,7 @@ private void init(Context context, CircleParams params) {
             textView.setTypeface(textView.getTypeface(), mLottieParams.styleText);
             int[] textPadding = mLottieParams.textPadding;
             if (textPadding != null)
-                textView.setAutoPadding(textPadding[0], textPadding[1], textPadding[2], textPadding[3]);
+                textView.setPadding(textPadding[0], textPadding[1], textPadding[2], textPadding[3]);
             addView(textView, textLayoutParams);
         }
 

circledialog/src/main/java/com/mylhyl/circledialog/view/BodyInputView.java

@@ -7,6 +7,7 @@
 import android.text.TextUtils;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import com.mylhyl.circledialog.CircleParams;
 import com.mylhyl.circledialog.params.DialogParams;
@@ -84,13 +85,13 @@ private void init(Context context, CircleParams params) {
         addView(mProgressBar, layoutParams);
 
         //构建文本
-        final ScaleTextView textView = new ScaleTextView(getContext());
+        final TextView textView = new TextView(getContext());
         textView.setTextSize(mProgressParams.textSize);
         textView.setTextColor(mProgressParams.textColor);
         textView.setTypeface(textView.getTypeface(), mProgressParams.styleText);
         int[] padding = mProgressParams.padding;
         if (padding != null)
-            textView.setAutoPadding(padding[0], padding[1], padding[2], padding[3]);
+            textView.setPadding(padding[0], padding[1], padding[2], padding[3]);
         addView(textView);
 
         if (mProgressParams.style == ProgressParams.STYLE_HORIZONTAL