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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/member/SettingMemberInfoFragment.java

@@ -15,6 +15,7 @@ import android.widget.CheckBox;
 import android.widget.Checkable;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import java.util.List;
@@ -57,6 +58,7 @@ public class SettingMemberInfoFragment extends FragmentBase<SettingMemberInfoPre
   private View viewPinReset;
   private View viewCancel;
   private View viewMemberOut;
+  private View viewLine;
   private CheckBoxAllDriver checkBoxAllDriver;
   private View layoutPassword;
   private CheckBox checkBoxAll;
@@ -84,6 +86,7 @@ public class SettingMemberInfoFragment extends FragmentBase<SettingMemberInfoPre
     viewCancel = findViewById(R.id.text_cancel);
     viewMemberOut = findViewById(R.id.text_member_out);
     layoutPassword = findViewById(R.id.layout_password);
+    viewLine = findViewById(R.id.view_line);
     checkBoxAll = findViewById(R.id.agree_check_all);
     checkBoxAll.setVisibility(View.GONE);
 
@@ -226,8 +229,18 @@ public class SettingMemberInfoFragment extends FragmentBase<SettingMemberInfoPre
   @Override
   public void setAccountType(String type) {
     imageAccountType.setImageDrawable(ContextCompat.getDrawable(getContext(), AccountType.getAccountIconByType(type)));
-
     layoutPassword.setVisibility(AccountType.TYPE_EMAIL.equals(type) ? View.VISIBLE : View.GONE);
+    LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) viewLine.getLayoutParams();
+
+    if (AccountType.TYPE_EMAIL.equals(type)) {
+      params.setMargins(params.leftMargin, 0, params.rightMargin, params.bottomMargin);
+
+    }
+    else {
+      params.setMargins(params.leftMargin, ResourceUtil.dpToPx(38), params.rightMargin, params.bottomMargin);
+    }
+
+    viewLine.setLayoutParams(params);
   }
 
   @Override

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

@@ -180,9 +180,9 @@
           android:maxLines="1"
           android:textColor="@color/C000000"
           android:textSize="14sp"
-          app:layout_constraintHorizontal_bias="0"
           app:layout_constrainedWidth="true"
           app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintHorizontal_bias="0"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           tools:text="abce@email.com"/>
@@ -195,8 +195,8 @@
           android:layout_marginTop="10dp"
           android:layout_marginEnd="8dp"
           android:layout_marginBottom="8dp"
-          app:layout_constraintHorizontal_bias="0"
           app:layout_constraintBottom_toBottomOf="@+id/text_email"
+          app:layout_constraintHorizontal_bias="0"
           app:layout_constraintStart_toEndOf="@+id/text_email"
           app:layout_constraintTop_toTopOf="@+id/text_email"
           tools:srcCompat="@drawable/ic_icon_account_email_wh"/>
@@ -260,6 +260,7 @@
         android:orientation="vertical">
 
         <View
+          android:id="@+id/view_line"
           android:layout_width="match_parent"
           android:layout_height="1dp"
           android:layout_marginBottom="38dp"