Merge remote-tracking branch 'origin/master'

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

@@ -5,7 +5,7 @@
 
         <variable
             name="onClickListener"
-            type="com.xingdata.zzdpos.util.OnClickListener"/>
+            type="com.xingdata.zzdpos.util.OnClickListener" />
 
     </data>
 
@@ -18,10 +18,11 @@
 
         <ImageButton
             android:id="@+id/iv_back"
-            android:layout_width="?attr/actionBarSize"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:background="@color/transparent"
             android:onClick="@{onClickListener}"
+            android:padding="@dimen/all_padding"
             android:src="@mipmap/go_back" />
 
         <TextView
@@ -30,13 +31,12 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:text="标题"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
             android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/all_sub_title_size"/>
-
+            android:textSize="@dimen/all_sub_title_size"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
 
     </android.support.constraint.ConstraintLayout>

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

@@ -5,7 +5,7 @@
 
         <variable
             name="onClickListener"
-            type="com.xingdata.zzdpos.util.OnClickListener"/>
+            type="com.xingdata.zzdpos.util.OnClickListener" />
 
 
     </data>
@@ -19,13 +19,13 @@
 
         <ImageButton
             android:id="@+id/iv_back"
-            android:layout_width="?attr/actionBarSize"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:background="@color/transparent"
             android:gravity="center"
             android:onClick="@{onClickListener}"
-            android:padding="@dimen/all_margin"
-            android:src="@mipmap/back_white"/>
+            android:padding="@dimen/all_padding"
+            android:src="@mipmap/back_white" />
 
         <TextView
             android:id="@+id/tv_title"
@@ -34,8 +34,7 @@
             android:layout_centerInParent="true"
             android:text="标题"
             android:textColor="@color/white"
-            android:textSize="@dimen/all_sub_title_size"
-           />
+            android:textSize="@dimen/all_sub_title_size" />
 
 
     </RelativeLayout>

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

@@ -10,9 +10,10 @@
 
         <ImageButton
             android:id="@+id/iv_back"
-            android:layout_width="?attr/actionBarSize"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:background="@mipmap/go_back" />
+            android:background="@mipmap/go_back"
+            android:padding="@dimen/all_padding" />
 
         <TextView
             android:id="@+id/tv_title"
@@ -25,10 +26,11 @@
 
         <ImageButton
             android:id="@+id/pop_menu"
-            android:layout_width="60dp"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:background="@mipmap/pop_menu" />
+            android:background="@mipmap/pop_menu"
+            android:padding="@dimen/all_padding" />
 
 
     </RelativeLayout>