[설정][New] 간편암호 제거 -> 이메일 표시

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

@@ -1,6 +1,5 @@
 package kr.co.zumo.app.lifeplus.view.screen.setting;
 
-import android.support.v7.widget.SwitchCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -26,15 +25,14 @@ public class CommonSettingViewHolder extends SettingViewHolder {
   private TextView textViewMenuText;
   private TextView textViewUserConfirm;
   private TextView textName;
-  private TextView textUnlock;
+  private TextView textEmail;
   private ViewGroup customLayout;
   private ImageView imageViewAccordion;
-  private SwitchCompat switchPinOnOff;
 
   public CommonSettingViewHolder(View itemView) {
     super(itemView);
     textViewMenuText = itemView.findViewById(R.id.text_view_setting_menu_text);
-    textUnlock = itemView.findViewById(R.id.text_unlock);
+    textEmail = itemView.findViewById(R.id.text_email);
     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);
@@ -44,10 +42,6 @@ public class CommonSettingViewHolder extends SettingViewHolder {
       dispatchEvent(new Event.Builder(Event.CLICK).integer(SettingPresenter.SETTING_COMMON).index(SettingViewHolder.MEMBER_CONFIRM).build());
     });
 
-    switchPinOnOff = itemView.findViewById(R.id.switch_pin_on_off);
-    switchPinOnOff.setOnCheckedChangeListener((buttonView, isChecked) -> {
-      dispatchEvent(new Event.Builder(Event.SWITCH).integer(SettingPresenter.SETTING_COMMON).index(SettingViewHolder.SWITCH_PIN).bool(isChecked).build());
-    });
   }
 
   @Override
@@ -59,16 +53,8 @@ public class CommonSettingViewHolder extends SettingViewHolder {
   private void render() {
     textName.setText(settingHolderBean.getUserName());
     textViewUserConfirm.setText(StringUtil.fromHtml(settingHolderBean.getUserConfirmOrManage()));
-    switchPinOnOff.setChecked(settingHolderBean.isAutoUnlock());
-
-    if (settingHolderBean.isMember() == false) {
-      textUnlock.setVisibility(View.GONE);
-      switchPinOnOff.setVisibility(View.GONE);
-    }
-    else {
-      textUnlock.setVisibility(View.VISIBLE);
-      switchPinOnOff.setVisibility(View.VISIBLE);
-    }
+
+    textEmail.setText(settingHolderBean.getEmail());
   }
 
   @Override

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

@@ -27,6 +27,8 @@ public interface ISettingView extends IView {
 
   void setUserConfirm(String string);
 
+  void setEmail(String email);
+
   void setAutoUnlockEnabled(boolean isEnabled);
 
   void setPushEnabled(boolean isEnabled);

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

@@ -116,6 +116,11 @@ public class SettingFragment extends FragmentBase<SettingPresenter> implements I
     settingHolderBean.setUserConfirmOrManage(string);
   }
 
+  @Override
+  public void setEmail(String email) {
+    settingHolderBean.setEmail(email);
+  }
+
   @Override
   public void setAutoUnlockEnabled(boolean isEnabled) {
     settingHolderBean.setAutoUnlock(isEnabled);

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

@@ -356,12 +356,14 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
       view.setRecommendCode(model.getMyRecommendCode());
       view.setUserName(model.getUserName());
       view.setUserConfirm(StringUtil.underline(ResourceUtil.getString(R.string.setting_menu1_user_info)));
+      view.setEmail(model.getUserEmail());
       view.setGuestUi(false);
     }
     else {
       view.setRecommendCode("");
       view.setUserName(ResourceUtil.getString(R.string.setting_menu1_user_confirm_please));
       view.setUserConfirm(StringUtil.underline(ResourceUtil.getString(R.string.setting_menu1_user_confirm)));
+      view.setEmail("");
       view.setGuestUi(true);
     }
 

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

@@ -93,28 +93,18 @@
       tools:text="@string/setting_menu1_user_info"/>
 
     <TextView
-      android:id="@+id/text_unlock"
+      android:id="@+id/text_email"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="2dp"
       android:padding="10dp"
-      android:text="@string/setting_pin_unlock"
+      tools:text="email"
       android:textColor="@color/C999999"
       android:textSize="12sp"
       app:layout_constraintHorizontal_chainStyle="spread_inside"
       app:layout_constraintStart_toStartOf="@+id/guide_start"
       app:layout_constraintTop_toBottomOf="@+id/text_name"/>
 
-    <kr.co.zumo.app.lifeplus.view.custom.OnOffSwitch
-      android:id="@+id/switch_pin_on_off"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:background="?android:attr/selectableItemBackground"
-      android:padding="10dp"
-      app:layout_constraintBottom_toBottomOf="@+id/text_unlock"
-      app:layout_constraintEnd_toStartOf="@+id/guide_end"
-      app:layout_constraintTop_toTopOf="@+id/text_unlock"/>
-
     <android.support.constraint.Guideline
       android:id="@+id/guide_end"
       android:layout_width="wrap_content"