Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

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

@@ -27,11 +27,14 @@
         android:textSize="15sp"/>
 
       <ImageView
+        android:id="@+id/button_block_member_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
+        android:layout_marginBottom="5dp"
         android:layout_marginEnd="26dp"
+        android:layout_marginTop="5dp"
         android:src="@drawable/icon_header_close"/>
     </RelativeLayout>
 
@@ -151,24 +154,31 @@
       android:layout_marginLeft="24dp"
       android:layout_marginRight="24dp"
       android:background="@drawable/faq_text_border"
+      android:gravity="center"
       android:orientation="horizontal"
-      android:paddingBottom="27dp"
-      android:paddingLeft="55dp"
-      android:paddingRight="55dp"
-      android:paddingTop="27dp">
+      android:paddingBottom="17dp"
+      android:paddingLeft="45dp"
+      android:paddingRight="45dp"
+      android:paddingTop="17dp">
 
       <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="8dp"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp"
         android:src="@drawable/icon_email"
         />
 
       <TextView
+        android:id="@+id/text_view_rest_email_information"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:lineSpacingExtra="3sp"
+        android:paddingBottom="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="10dp"
         android:text="@string/rest_member_email_information"
         android:textColor="#999999"
         android:textSize="12sp"
@@ -188,6 +198,7 @@
       android:layout_marginRight="24dp">
 
       <Button
+        android:id="@+id/button_block_confirm"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/C000000"

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

@@ -27,11 +27,14 @@
         android:textSize="15sp"/>
 
       <ImageView
+        android:id="@+id/button_rest_member_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
+        android:layout_marginBottom="5dp"
         android:layout_marginEnd="26dp"
+        android:layout_marginTop="5dp"
         android:src="@drawable/icon_header_close"/>
     </RelativeLayout>
 
@@ -151,24 +154,31 @@
       android:layout_marginLeft="24dp"
       android:layout_marginRight="24dp"
       android:background="@drawable/faq_text_border"
+      android:gravity="center"
       android:orientation="horizontal"
-      android:paddingBottom="27dp"
-      android:paddingLeft="55dp"
-      android:paddingRight="55dp"
-      android:paddingTop="27dp">
+      android:paddingBottom="17dp"
+      android:paddingLeft="45dp"
+      android:paddingRight="45dp"
+      android:paddingTop="17dp">
 
       <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="8dp"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp"
         android:src="@drawable/icon_email"
         />
 
       <TextView
+        android:id="@+id/text_view_rest_email_information"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:lineSpacingExtra="3sp"
+        android:paddingBottom="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="10dp"
         android:text="@string/rest_member_email_information"
         android:textColor="#999999"
         android:textSize="12sp"
@@ -188,6 +198,7 @@
       android:layout_marginRight="24dp">
 
       <Button
+        android:id="@+id/button_rest_cancel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/C000000"