修改Radiobutton间距

app/src/main/java/com/xingdata/zzdpos/App.java

@@ -118,13 +118,13 @@ public class App extends Application {
      */
 
     private void initFragment() {
-//        Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE).debug(BuildConfig.DEBUG)
-//                .handleException(e -> {
-//                }).install();
-//正式版本
-        Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE)
+        Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE).debug(BuildConfig.DEBUG)
                 .handleException(e -> {
                 }).install();
+//正式版本
+//        Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE)
+//                .handleException(e -> {
+//                }).install();
     }
 
     /**

app/src/main/java/com/xingdata/zzdpos/base/BaseFragment.java

@@ -52,6 +52,7 @@ public abstract class BaseFragment<P extends BasePresenter, B extends ViewDataBi
         }
     }
 
+
     protected interface titleBar {
         int getTitleText();
     }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleEditFragment.java

@@ -55,7 +55,6 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
         } else {
             mViewBinding.ruleNameLayout.setVisibility(View.GONE);
             mViewBinding.infoTitle.tvTitle.setText("新增充值优惠");
-            mViewBinding.ruleNameLayout.setVisibility(View.VISIBLE);
             ((RadioButton)mViewBinding.ruleState.getChildAt(0)).setChecked(true);
         }
 

app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/fragment/VipLevelEditFragment.java

@@ -55,6 +55,10 @@ public class VipLevelEditFragment extends BaseFragment<LevelPresenter, FragmentV
                         ToastUtils.showShort("折扣不能为空");
                         return;
                     }
+                    if (Integer.parseInt(mViewBinding.levelDiscont.getText().toString())>100||Integer.parseInt(mViewBinding.levelDiscont.getText().toString())<1) {
+                        ToastUtils.showShort("折扣必须为1到100之间");
+                        return;
+                    }
                     if (mViewBinding.updateDay.length() == 0) {
                         ToastUtils.showShort("最近多少天不能为空");
                         return;

app/src/main/java/com/xingdata/zzdpos/ui/vip/dialog/VipEditMenuDialog.java

@@ -32,19 +32,16 @@ public class VipEditMenuDialog extends BaseSheetDialog<VipPresenter, DialogVipMe
             switch (view.getId()) {
                 //編輯會員
                 case R.id.editVip:
-                    mPresenter.vipInfoEditFragment = new VipInfoEditFragment();
                     mPresenter.vipInfoEditFragment.setVip(mVip);
                     ((BaseActivity) getActivity()).start(mPresenter.vipInfoEditFragment);
                     break;
                 //充值記錄
                 case R.id.rechargeList:
-                    mPresenter.vipRechargeListFragment = new VipRechargeListFragment();
                     mPresenter.vipRechargeListFragment.setVip(mVip);
                     ((BaseActivity) getActivity()).start(mPresenter.vipRechargeListFragment);
                     break;
                 //優惠券詳情
                 case R.id.voucherDetails:
-                    mPresenter.vipMscardListFragment = new VipTruleListFragment();
                     mPresenter.vipMscardListFragment.setVip(mVip);
                     ((BaseActivity) getActivity()).start(mPresenter.vipMscardListFragment);
                     break;

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipAddSucceedFragment.java

@@ -35,18 +35,19 @@ public class VipAddSucceedFragment extends BaseFragment<VipPresenter, FragmentVi
         } else {
             mViewBinding.vipLevel.setText(mVip.getVipLevelName() + "    " + ConvertUtil.discount(mVip.getVipDefDiscount()) + "折");
         }
-
+        //继续添加
         mViewBinding.vipAdd.setOnClickListener(view -> {
-            this.pop();
+            mPresenter.vipInfoEditFragment.setVip(null);
+            startWithPop(mPresenter.vipInfoEditFragment);
         });
+
+        //充值
         mViewBinding.vipRecharge.setOnClickListener(view -> {
-            this.pop();
             mPresenter.vipRechargeFragment.setVip(mVip);
-            start(mPresenter.vipRechargeFragment);
+            startWithPop(mPresenter.vipRechargeFragment);
         });
 
         mViewBinding.vipSure.setOnClickListener(view -> {
-            pop();
             mPresenter.vipListFragment.updateVipSus(null);
         });
 

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoEditFragment.java

@@ -121,6 +121,7 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
                         mVip.setVipSex(Byte.parseByte(mViewBinding.vipSex.findViewById(sexId).getTag().toString()));
                     }
                     mPresenter.addVip(mVip);
+                    pop();
                     break;
             }
         });

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java

@@ -91,7 +91,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
         mViewBinding.setOnClickListener(view -> {
             switch (view.getId()) {
                 case R.id.addVip:
-                    if (mPresenter.levels== null || mPresenter.levels.size() == 0) {
+                    if (mPresenter.levels == null || mPresenter.levels.size() == 0) {
                         ToastUtils.showShort("缺少会员等级");
                         return;
                     }
@@ -165,7 +165,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
 
 
     public void getVipLevelSus(Pager<Level> levelPager) {
-        if ( mViewBinding.vipLevelR.getChildCount()!=0){
+        if (mViewBinding.vipLevelR.getChildCount() != 0) {
             mViewBinding.vipLevelR.removeAllViews();
         }
         LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
@@ -193,7 +193,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
         mPresenter.levels.addAll(levelPager.getList());
         Level level = new Level();
         level.setVipLevelName("超级会员");
-        level.setVipDefDiscount(mPresenter.levels.get(mPresenter.levels.size()-1).getVipDefDiscount());
+        level.setVipDefDiscount(mPresenter.levels.get(mPresenter.levels.size() - 1).getVipDefDiscount());
         mPresenter.levels.add(level);
     }
 
@@ -231,15 +231,15 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
         if (vip != null) {
             if (vipState == 0) {
                 mPresenter.vipInfoFragment.setVip(vip);
-                ((BaseActivity) getActivity()).start(mPresenter.vipInfoFragment);
+                start(mPresenter.vipInfoFragment);
             } else {
                 mPresenter.vipInfoFragment.setVip(vip);
-                ((BaseActivity) getActivity()).start(mPresenter.vipRechargeFragment);
+                start(mPresenter.vipRechargeFragment);
             }
 
         } else {
             mPresenter.vipInfoEditFragment.setVip(null);
-            ((BaseActivity) getActivity()).start(mPresenter.vipInfoEditFragment);
+            start(mPresenter.vipInfoEditFragment);
         }
     }
 
@@ -261,7 +261,10 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
         pageNumber = 0;
         mPresenter.getVipLevel(pageNumber, 200);
         mPresenter.getVipNumber();
-        mPresenter.vipInfoEditFragment.pop();
+        if (mPresenter.vipInfoEditFragment.isHidden()) {
+            mPresenter.vipInfoEditFragment.pop();
+        }
+
     }
 
     public void setVipState(int vipState) {

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeFragment.java

@@ -57,6 +57,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
 
     @Override
     public void initView() {
+        setMoney("0","0");
         mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
         mViewBinding.vipMobile.setText(String.valueOf(mVip.getVipMobile()));
         mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
@@ -120,6 +121,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
 
     @SuppressLint("ResourceAsColor")
     public void getMscardSus(Pager<Mscard> mscardPager) {
+
         mscards.clear();
         mscards.addAll(mscardPager.getList());
 
@@ -167,8 +169,11 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
 
             @Override
             public void afterTextChanged(Editable editable) {
-                if (mViewBinding.stealMoney.getText().length() == 0)
+                if (mViewBinding.stealMoney.getText().length() == 0){
+                    setMoney("0","0");
                     return;
+                }
+
                 Mscard mscard = mPresenter.getMaxRechange(mscards, ConvertUtil.yuanToFen(mViewBinding.stealMoney.getText().toString()));
                 String strSend = "0";
                 if (mscard == null) {

app/src/main/res/layout/fragment_recharge_rule_edit.xml

@@ -283,6 +283,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginBottom="@dimen/all_margin_left"
             android:orientation="horizontal">
 
             <Button

app/src/main/res/layout/fragment_recharge_rule_list.xml

@@ -29,7 +29,7 @@
         <LinearLayout
             android:id="@+id/addVipLinearLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="68dp"
             android:layout_marginTop="10dp"
             android:background="@color/white"
             android:gravity="center"
@@ -38,14 +38,16 @@
             <LinearLayout
                 android:id="@+id/addRule"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:onClick="@{onClickListener}"
+                android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <ImageButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:drawablePadding="@dimen/all_spacing"
                     android:layout_margin="5dp"
                     android:background="@mipmap/add_bg" />
 

app/src/main/res/layout/fragment_user_info.xml

@@ -38,10 +38,7 @@
                     android:orientation="horizontal">
 
                     <TextView
-                        style="@style/default_blacktext_margin_smallstyle"
-                        android:layout_width="70dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/all_margin_left"
+                        style="@style/default_blacktext_margin_16_sp_style"
                         android:text="姓名" />
 
                     <TextView
@@ -54,10 +51,7 @@
                         android:textColor="@color/black_likui" />
                 </LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/line_bg" />
+                <include layout="@layout/line_layout_margin"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -66,10 +60,7 @@
                     android:orientation="horizontal">
 
                     <TextView
-                        style="@style/default_blacktext_margin_smallstyle"
-                        android:layout_width="70dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/all_margin_left"
+                        style="@style/default_blacktext_margin_16_sp_style"
                         android:text="帐号" />
 
                     <TextView
@@ -87,10 +78,7 @@
 
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/line_bg" />
+        <include layout="@layout/line_layout_margin" />
 
 
         <LinearLayout
@@ -101,9 +89,7 @@
             android:orientation="horizontal">
 
             <TextView
-                style="@style/default_blacktext_margin_smallstyle"
-                android:layout_width="70dp"
-                android:layout_height="wrap_content"
+                style="@style/default_blacktext_margin_16_sp_style"
                 android:text="级别" />
 
             <TextView
@@ -116,15 +102,12 @@
                 android:textColor="@color/gray_huanggai" />
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/line_bg" />
-
+        <include layout="@layout/line_layout" />
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginBottom="@dimen/all_margin_left"
             android:orientation="horizontal">
 
             <Button
@@ -133,7 +116,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
-                android:layout_marginBottom="15dp"
                 android:onClick="@{onClickListener}"
                 android:text="确认" />
 

app/src/main/res/layout/fragment_user_info_edit.xml

@@ -137,6 +137,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginBottom="@dimen/all_margin_left"
             android:orientation="horizontal">
 
             <Button

app/src/main/res/layout/fragment_user_list.xml

@@ -96,11 +96,17 @@
                 android:textStyle="bold" />
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_marginTop="10dp"
+            android:background="@color/line1" />
+
         <LinearLayout
             android:id="@+id/addVipLinearLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_height="68dp"
+
             android:background="@color/white"
             android:gravity="center"
             android:orientation="vertical">
@@ -108,7 +114,8 @@
             <LinearLayout
                 android:id="@+id/addUser"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
                 android:onClick="@{onClickListener}"
                 android:orientation="horizontal">
 
@@ -130,8 +137,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_margin="@dimen/view_line_L5"
+            android:layout_height="0.5dp"
             android:background="@color/line1" />
 
         <LinearLayout

app/src/main/res/layout/fragment_vip_add_succeed.xml

 <?xml version="1.0" encoding="utf-8"?>
 <layout>
+
     <data>
+
         <variable
             name="onClickListener"
             type="android.view.View.OnClickListener" />
@@ -111,7 +113,8 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:layout_marginBottom="@dimen/all_margin_left">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -123,6 +126,7 @@
                     android:id="@+id/vip_Sure"
                     style="@style/button_positive_noradius"
                     android:layout_alignParentBottom="true"
+                    android:layout_marginBottom="@dimen/all_margin_left"
                     android:text="完成" />
 
                 <Button

app/src/main/res/layout/fragment_vip_info_edit.xml

@@ -232,6 +232,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginBottom="@dimen/all_margin_left"
             android:orientation="horizontal">
 
             <Button

app/src/main/res/layout/fragment_vip_level_edit.xml

@@ -34,8 +34,8 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/line_bg" />
+            android:layout_height="0.5dp"
+            android:background="@color/gray_huanggai" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -53,13 +53,19 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/white"
+                    android:gravity="center_vertical"
                     android:orientation="horizontal">
 
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/all_margin_left"
+                        android:background="@mipmap/point" />
+
                     <TextView
-                        style="@style/default_blacktext_margin_smallstyle"
+                        style="@style/default_blacktext_nopadding_smallstyle"
                         android:layout_width="90dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/all_margin_left"
                         android:text="等级名称" />
 
                     <EditText
@@ -74,20 +80,28 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
+                    android:layout_height="0.5dp"
+                    android:layout_marginLeft="@dimen/all_margin_left"
+                    android:layout_marginRight="@dimen/all_margin_left"
                     android:background="@color/line_bg" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/white"
+                    android:gravity="center_vertical"
                     android:orientation="horizontal">
 
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/all_margin_left"
+                        android:background="@mipmap/point" />
+
                     <TextView
-                        style="@style/default_blacktext_margin_smallstyle"
+                        style="@style/default_blacktext_nopadding_smallstyle"
                         android:layout_width="90dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/all_margin_left"
                         android:maxLength="11"
                         android:text="折扣设置" />
 
@@ -129,7 +143,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="0.5dp"
             android:background="@color/line_bg" />
 
         <LinearLayout
@@ -148,6 +162,7 @@
             <EditText
                 android:id="@+id/update_day"
                 style="@style/dialog_edit"
+                android:text=""
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -165,20 +180,29 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="0.5dp"
+            android:layout_marginLeft="@dimen/all_margin_left"
+            android:layout_marginRight="@dimen/all_margin_left"
             android:background="@color/line_bg" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white"
+            android:gravity="center_vertical"
             android:orientation="horizontal">
 
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/all_margin_left"
+                android:background="@mipmap/point" />
+
             <TextView
-                style="@style/default_blacktext_margin_smallstyle"
+                style="@style/default_blacktext_nopadding_smallstyle"
                 android:layout_width="90dp"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/all_margin_left"
+
                 android:text="消费金额" />
 
             <EditText
@@ -203,7 +227,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="horizontal">
+            android:layout_marginBottom="@dimen/all_margin_left">
 
             <Button
                 android:id="@+id/onSure"

app/src/main/res/layout/fragment_vip_level_list.xml

@@ -29,7 +29,7 @@
         <LinearLayout
             android:id="@+id/addVipLinearLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="68dp"
             android:layout_marginTop="10dp"
             android:background="@color/white"
             android:gravity="center"

app/src/main/res/layout/fragment_vip_list.xml

@@ -101,7 +101,7 @@
         <LinearLayout
             android:id="@+id/addVipLinearLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="68dp"
             android:layout_marginTop="10dp"
             android:background="@color/white"
             android:gravity="center"
@@ -110,7 +110,8 @@
             <LinearLayout
                 android:id="@+id/addVip"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
                 android:onClick="@{onClickListener}"
                 android:orientation="horizontal">
 

app/src/main/res/layout/fragment_vip_recharge.xml

@@ -211,12 +211,14 @@
                 android:text="充值金额:" />
 
             <TextView
+                android:text="1111111111"
                 android:id="@+id/rechargAMT"
                 style="@style/textView_body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/all_margin_left"
                 android:layout_marginRight="@dimen/all_margin_left"
+                android:textSize="@dimen/sbig_text_size"
                 android:textColor="@color/deep_red" />
         </LinearLayout>
 

app/src/main/res/layout/item_recharge_rulel_list_item.xml

@@ -4,7 +4,9 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/all_margin"
+        android:layout_marginLeft="@dimen/all_margin_left"
+        android:layout_marginRight="@dimen/all_margin_left"
+        android:layout_marginTop="@dimen/all_margin_left"
         android:background="@mipmap/recharge_rule"
         android:gravity="center_horizontal"
         android:orientation="vertical">

app/src/main/res/layout/item_user_list_item.xml

@@ -35,14 +35,14 @@
                     <TextView
                         android:id="@+id/user_mobile"
                         android:textSize="@dimen/all_text_size_small"
-                        style="@style/default_blacktext_margin_16_sp_style"
+                        style="@style/default_blacktext_nopadding_smallstyle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="13311556556" />
 
                     <TextView
                         android:id="@+id/user_name"
-                        style="@style/default_blacktext_margin_16_sp_style"
+                        style="@style/default_blacktext_nopadding_smallstyle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="张小萌" />

app/src/main/res/layout/line_layout.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="0.5dp"
+    android:background="@color/black_likui"
+    ></LinearLayout>
\ No newline at end of file

app/src/main/res/layout/line_layout_margin.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="0.5dp"
+    android:background="@color/line_bg"
+    android:layout_marginLeft="@dimen/all_margin_left"
+    android:layout_marginRight="@dimen/all_margin_left"
+    ></LinearLayout>
\ No newline at end of file

app/src/main/res/values/styles.xml

@@ -39,9 +39,9 @@
         <item name="android:layout_height">match_parent</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:singleLine">true</item>
-        <item name="android:padding">@dimen/sp_12</item>
+        <item name="android:padding">@dimen/dp_4</item>
         <item name="android:textColor">@color/black</item>
-        <item name="android:textSize">@dimen/detail_textview_size</item>
+        <item name="android:textSize">@dimen/big_text_size</item>
     </style>
 
     <style name="default_gray_huanggaitext_smallstyle">
@@ -63,6 +63,7 @@
         <item name="android:textColor">@color/black</item>
         <item name="android:textSize">@dimen/all_text_size</item>
     </style>
+
     <style name="default_blacktext_no_margin_smallstyle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">35dp</item>
@@ -84,6 +85,7 @@
         <item name="android:textColor">@color/black</item>
         <item name="android:textSize">@dimen/detail_textview_size</item>
     </style>
+
     <style name="default_blacktext_margin_16_sp_style">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">48dp</item>
@@ -313,7 +315,8 @@
     </style>
 
     <style name="button_positive_noradius">
-        <item name="android:background">@drawable/selector_gradient_red_button_background_noradius </item>
+        <item name="android:background">@drawable/selector_gradient_red_button_background_noradius
+        </item>
         <item name="android:layout_height">@dimen/button3_height</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:textColor">@color/white</item>
@@ -321,11 +324,11 @@
         <item name="android:focusable">false</item>
         <item name="android:layout_marginLeft">@dimen/all_margin_left</item>
         <item name="android:layout_marginRight">@dimen/all_margin_left</item>
-        <item name="android:layout_marginBottom">@dimen/all_margin_left</item>
         <item name="android:focusableInTouchMode">false</item>
     </style>
+
     <style name="button_positive_white">
-        <item name="android:background">@drawable/shape_red_layout </item>
+        <item name="android:background">@drawable/shape_red_layout</item>
         <item name="android:layout_height">@dimen/button3_height</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:textColor">@color/deep_red</item>
@@ -336,8 +339,10 @@
         <item name="android:layout_marginBottom">@dimen/all_margin_left</item>
         <item name="android:focusableInTouchMode">false</item>
     </style>
+
     <style name="button_positive_red">
-        <item name="android:background">@drawable/selector_gradient_red_button_background_noradius </item>
+        <item name="android:background">@drawable/selector_gradient_red_button_background_noradius
+        </item>
         <item name="android:layout_height">@dimen/button3_height</item>
         <item name="android:textColor">@color/black</item>
         <item name="android:gravity">center</item>
@@ -440,9 +445,10 @@
         <item name="android:layout_width">0dp</item>
         <item name="android:textSize">@dimen/small_text_size</item>
     </style>
+
     <style name="all_edittext_14sp_style">
         <item name="android:padding">@dimen/dialog_padding</item>
-       <item name="android:singleLine">false</item>
+        <item name="android:singleLine">true</item>
         <item name="android:saveEnabled">false</item>
         <item name="android:background">@drawable/selector_white_background_stroke</item>
         <item name="android:layout_width">0dp</item>