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

app/src/main/java/kr/co/zumo/app/lifeplus/bean/SettingHolderBean.java

@@ -19,6 +19,7 @@ public class SettingHolderBean extends SettingMemberBean {
   private String userName;
   private String userConfirmOrManage;
   private boolean isMember;
+  private int accountType;
 
   public String getUserConfirmOrManage() {
     return userConfirmOrManage;
@@ -43,4 +44,12 @@ public class SettingHolderBean extends SettingMemberBean {
   public void setUserName(String userName) {
     this.userName = userName;
   }
+
+  public void setAccountType(int type) {
+    this.accountType = type;
+  }
+
+  public int getAccountType() {
+    return accountType;
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/model/LifeplusPreferences.java

@@ -3,6 +3,8 @@
  */
 package kr.co.zumo.app.lifeplus.model;
 
+import kr.co.zumo.app.lifeplus.view.screen.setting.AccountType;
+
 /**
  * 디바이스에 저장이 필요한 값들을 관리.
  * <pre>
@@ -383,7 +385,7 @@ public class LifeplusPreferences {
   }
 
   public int getAccountType() {
-    return preferences.get(ACCOUNT_TYPE, 0);
+    return preferences.get(ACCOUNT_TYPE, AccountType.TYPE_EMAIL);
   }
 
   /**

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

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.setting;
 
+import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -28,6 +29,7 @@ public class CommonSettingViewHolder extends SettingViewHolder {
   private TextView textEmail;
   private ViewGroup customLayout;
   private ImageView imageViewAccordion;
+  private ImageView imageAccountType;
 
   public CommonSettingViewHolder(View itemView) {
     super(itemView);
@@ -36,6 +38,7 @@ public class CommonSettingViewHolder extends SettingViewHolder {
     customLayout = itemView.findViewById(R.id.layout_default_setting);
     textName = itemView.findViewById(R.id.text_name);
     imageViewAccordion = itemView.findViewById(R.id.image_view_setting_menu_accordion);
+    imageAccountType = itemView.findViewById(R.id.image_view_account_type);
 
     textViewUserConfirm = itemView.findViewById(R.id.text_view_user_confirm);
     textViewUserConfirm.setOnClickListener(v -> {
@@ -55,6 +58,7 @@ public class CommonSettingViewHolder extends SettingViewHolder {
     textViewUserConfirm.setText(StringUtil.fromHtml(settingHolderBean.getUserConfirmOrManage()));
 
     textEmail.setText(settingHolderBean.getEmail());
+    imageAccountType.setImageDrawable(ContextCompat.getDrawable(itemView.getContext(), AccountType.getAccountIconByType(settingHolderBean.getAccountType())));
   }
 
   @Override

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

@@ -29,6 +29,8 @@ public interface ISettingView extends IView {
 
   void setEmail(String email);
 
+  void setAccountType(int type);
+
   void setPushEnabled(boolean isEnabled);
 
   void setPushMarketingEnabled(boolean isEnabled);

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

@@ -50,10 +50,8 @@ public class SettingFragment extends FragmentBase<SettingPresenter> implements I
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     settingHolderBean = new SettingHolderBean();
-
     settingRecyclerView = findViewById(R.id.recycler_view_setting);
 
-
     textVersion = findViewById(R.id.text_version);
     textUpdate = findViewById(R.id.text_update);
 
@@ -124,6 +122,11 @@ public class SettingFragment extends FragmentBase<SettingPresenter> implements I
     settingHolderBean.setEmail(email);
   }
 
+  @Override
+  public void setAccountType(int type) {
+    settingHolderBean.setAccountType(type);
+  }
+
   @Override
   public void setPushEnabled(boolean isEnabled) {
     settingHolderBean.setAllowPush(isEnabled);

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

@@ -353,6 +353,7 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
       view.setUserName(model.getUserName());
       view.setUserConfirm(StringUtil.underline(ResourceUtil.getString(R.string.setting_menu1_user_info)));
       view.setEmail(model.getUserEmail());
+      view.setAccountType(model.getAccountType());
       view.setGuestUi(false);
     }
     else {

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

@@ -7,12 +7,14 @@ import android.graphics.drawable.StateListDrawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.Checkable;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import java.util.List;
@@ -26,6 +28,7 @@ import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.CheckBoxAllDriver;
 import kr.co.zumo.app.lifeplus.view.SimpleTextWatcher;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
+import kr.co.zumo.app.lifeplus.view.screen.setting.AccountType;
 
 /**
  * SettingMemberInfoFragment
@@ -49,6 +52,7 @@ public class SettingMemberInfoFragment extends FragmentBase<SettingMemberInfoPre
   private View viewNameRegistration;
   private View viewNameEdit;
   private TextView textEmail;
+  private ImageView imageAccountType;
   private View viewLogout;
   private View viewPinReset;
   private View viewCancel;
@@ -72,6 +76,7 @@ public class SettingMemberInfoFragment extends FragmentBase<SettingMemberInfoPre
     viewNameRegistration = findViewById(R.id.text_registration);
     viewNameEdit = findViewById(R.id.text_edit);
     textEmail = findViewById(R.id.text_email);
+    imageAccountType = findViewById(R.id.image_account_type);
     viewLogout = findViewById(R.id.text_logout);
     viewPinReset = findViewById(R.id.text_reset_pin);
     viewCancel = findViewById(R.id.text_cancel);
@@ -215,7 +220,7 @@ public class SettingMemberInfoFragment extends FragmentBase<SettingMemberInfoPre
 
   @Override
   public void setAccountType(int type) {
-    // todo 계정 타입 표시
+    imageAccountType.setImageDrawable(ContextCompat.getDrawable(getContext(), AccountType.getAccountIconByType(type)));
   }
 
   @Override

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

@@ -163,7 +163,7 @@ public class SettingMemberInfoPresenter extends Presenter<SettingMemberInfoModel
     SettingMemberBean bean = model.getSettingMemberBean();
 
     view.setEmail(bean.getEmail());
-    view.setAccountType(0);
+    view.setAccountType(model.getAccountType());
 
     // 이메일 유/무 구분
     String userName = model.getUserName();

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

@@ -105,6 +105,16 @@
       app:layout_constraintStart_toStartOf="@+id/guide_start"
       app:layout_constraintTop_toBottomOf="@+id/text_name"/>
 
+    <ImageView
+      android:id="@+id/image_view_account_type"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="0dp"
+      app:layout_constraintBottom_toBottomOf="@+id/text_email"
+      app:layout_constraintStart_toEndOf="@+id/text_email"
+      app:layout_constraintTop_toTopOf="@+id/text_email"
+      tools:srcCompat="@drawable/ic_icon_account_email_wh"/>
+
     <android.support.constraint.Guideline
       android:id="@+id/guide_end"
       android:layout_width="wrap_content"

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

@@ -174,14 +174,33 @@
         <TextView
           android:id="@+id/text_email"
           android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
+          android:layout_height="0dp"
           android:layout_marginTop="10dp"
+          android:layout_marginEnd="120dp"
+          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_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           tools:text="abce@email.com"/>
 
+        <ImageView
+          android:id="@+id/image_account_type"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="5dp"
+          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_constraintStart_toEndOf="@+id/text_email"
+          app:layout_constraintTop_toTopOf="@+id/text_email"
+          tools:srcCompat="@drawable/ic_icon_account_email_wh"/>
+
 
         <TextView
           android:id="@+id/text_logout"