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

app/build.gradle

@@ -23,7 +23,7 @@ android {
         minSdkVersion 19    // 4.4
         targetSdkVersion 27
         versionCode 149
-        versionName "4.0.0.34"
+        versionName "4.0.0.35"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/auth/MobileAuthView.java

@@ -402,17 +402,17 @@ public class MobileAuthView extends ConstraintLayout implements IMobileAuthContr
   }
 
   @Override
-  public void doAuthorizedNumberValidationMessage(@StringRes int stringId) {
+  public void doClearAuthorizedNumberValidationTextView() {
     editTextAuthorizedNumber.setPadding(editTextAuthorizedNumber.getPaddingLeft(), editTextAuthorizedNumber.getPaddingTop(), editTextAuthorizedNumber.getPaddingRight(), ResourceUtil.dpToPx(12));
-    textAuthorizedNumberValidation.setVisibility(View.VISIBLE);
-    textAuthorizedNumberValidation.setText(stringId);
+    textAuthorizedNumberValidation.setVisibility(View.GONE);
+    textAuthorizedNumberValidation.setText("");
   }
 
   @Override
-  public void doClearAuthorizedNumberValidationTextView() {
+  public void doAuthorizedNumberValidationMessage(@StringRes int stringId) {
     editTextAuthorizedNumber.setPadding(editTextAuthorizedNumber.getPaddingLeft(), editTextAuthorizedNumber.getPaddingTop(), editTextAuthorizedNumber.getPaddingRight(), ResourceUtil.dpToPx(40));
-    textAuthorizedNumberValidation.setVisibility(View.GONE);
-    textAuthorizedNumberValidation.setText("");
+    textAuthorizedNumberValidation.setVisibility(View.VISIBLE);
+    textAuthorizedNumberValidation.setText(stringId);
   }
 
   @Override

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

@@ -41,7 +41,7 @@
       android:layout_height="wrap_content"
       android:layout_marginLeft="24dp"
       android:layout_marginTop="32dp"
-      android:layout_marginRight="29dp"
+      android:layout_marginRight="24dp"
       android:orientation="horizontal"
       >
 
@@ -140,7 +140,7 @@
       android:layout_height="wrap_content"
       android:layout_marginLeft="24dp"
       android:layout_marginTop="12dp"
-      android:layout_marginRight="29dp"
+      android:layout_marginRight="24dp"
       android:orientation="horizontal"
       >
 
@@ -423,7 +423,8 @@
       <kr.co.zumo.app.lifeplus.view.custom.CustomSpinner
         android:id="@+id/spinner_mobile_company"
         android:layout_width="0dp"
-        android:layout_height="45dp"
+        android:layout_height="40dp"
+        android:layout_marginRight="5dp"
         android:layout_weight="2"
         android:background="@drawable/spinner_drop_down"
         android:entries="@array/mobile_companies"
@@ -435,7 +436,8 @@
       <kr.co.zumo.app.lifeplus.view.custom.CustomSpinner
         android:id="@+id/spinner_first_phone_number"
         android:layout_width="0dp"
-        android:layout_height="45dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="5dp"
         android:layout_weight="2"
         android:background="@drawable/spinner_drop_down"
         android:entries="@array/phone_numbers"
@@ -458,7 +460,7 @@
         android:id="@+id/spinner_mobile_company_bar"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:layout_marginRight="12dp"
+        android:layout_marginRight="5dp"
         android:layout_weight="2"
         android:background="@color/CE5E5E5"/>
 
@@ -466,6 +468,7 @@
         android:id="@+id/spinner_first_phone_number_bar"
         android:layout_width="0dp"
         android:layout_height="1dp"
+        android:layout_marginStart="5dp"
         android:layout_weight="2"
         android:background="@color/CE5E5E5"/>
 
@@ -474,7 +477,7 @@
     <RelativeLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:paddingTop="16dp">
+      android:paddingTop="12dp">
 
       <LinearLayout
         android:layout_width="match_parent"
@@ -496,29 +499,29 @@
             android:background="@null"
             android:hint="@string/phone_identify_phone_hint"
             android:inputType="number"
-            android:lineSpacingExtra="5sp"
             android:maxLength="8"
             android:paddingStart="4dp"
-            android:paddingTop="4dp"
-            android:paddingBottom="12dp"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
             android:textColor="@color/C000000"
             android:textColorHint="@color/CC5C5C5"
             android:textSize="14sp"
-            tools:text="12345678"
             />
         </LinearLayout>
 
         <LinearLayout
           android:layout_width="wrap_content"
-          android:layout_height="wrap_content">
+          android:layout_height="40dp">
 
           <TextView
             android:id="@+id/button_identify_number_send"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:gravity="center_vertical"
             android:paddingStart="12dp"
-            android:paddingTop="4dp"
-            android:paddingBottom="4dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="10dp"
             android:text="@string/phone_identify_submit"
             android:textColor="@color/button_state_color"
             android:textSize="12sp"
@@ -531,7 +534,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="24dp"
-        android:layout_marginTop="31dp"
+        android:layout_marginTop="40dp"
         android:layout_marginRight="24dp"
         android:orientation="vertical">
 
@@ -561,7 +564,7 @@
       android:id="@+id/layout_input_auth_number"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:paddingTop="16dp"
+      android:paddingTop="12dp"
       android:visibility="gone"
       tools:visibility="visible"
       >
@@ -581,20 +584,19 @@
           android:background="@null"
           android:hint="@string/phone_identify_six_characters"
           android:inputType="number"
-          android:lineSpacingExtra="5sp"
           android:maxLength="6"
           android:paddingStart="4dp"
-          android:paddingTop="4dp"
-          android:paddingBottom="12dp"
+          android:paddingTop="10dp"
+          android:paddingBottom="10dp"
           android:textColor="@color/C000000"
           android:textColorHint="@color/CC5C5C5"
           android:textSize="14sp"
-          tools:text="234879"/>
+          />
 
         <LinearLayout
           android:id="@+id/phone_identify_layout"
           android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
+          android:layout_height="40dp"
           android:orientation="horizontal"
           >
 
@@ -603,8 +605,8 @@
             android:layout_height="13dp"
             android:layout_gravity="center"
             android:layout_marginStart="9dp"
-            android:layout_marginTop="2dp"
             android:layout_marginEnd="5dp"
+            android:scaleType="centerInside"
             app:srcCompat="@drawable/icon_input_clock"
             />
 
@@ -614,8 +616,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="12dp"
-            android:lineSpacingExtra="5sp"
-            android:paddingTop="2dp"
+            android:paddingBottom="2dp"
             android:textColor="@color/C999999"
             android:textSize="14sp"
             tools:text="2:55"
@@ -623,7 +624,7 @@
 
           <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="40dp"
             android:gravity="center">
 
             <TextView
@@ -631,8 +632,8 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:lineSpacingExtra="3sp"
-              android:paddingTop="4dp"
-              android:paddingBottom="3dp"
+              android:paddingTop="8dp"
+              android:paddingBottom="10dp"
               android:text="@string/phone_identify_time_delay"
               android:textColor="@color/button_state_color"
               android:textSize="12sp"/>
@@ -644,7 +645,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="24dp"
-        android:layout_marginTop="31dp"
+        android:layout_marginTop="40dp"
         android:layout_marginRight="24dp"
         android:orientation="vertical">