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

app/src/main/java/kr/co/zumo/app/lifeplus/activity/SettingActivity.java

@@ -2,14 +2,15 @@ package kr.co.zumo.app.lifeplus.activity;
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
+import kr.co.zumo.app.lifeplus.model.BlankModel;
 import kr.co.zumo.app.lifeplus.view.fragment.setting.SettingExpandableListViewAdapter;
 import kr.co.zumo.app.lifeplus.view.fragment.setting.SettingExpandableListViewDecoration;
+import kr.co.zumo.app.lifeplus.view.presenter.setting.SettingPresenter;
 
 /**
  * SettingActivity
@@ -21,13 +22,13 @@ import kr.co.zumo.app.lifeplus.view.fragment.setting.SettingExpandableListViewDe
  * @history 하세미   [2018-10-10]   [최초 작성]
  * @since 2018-10-10
  */
-public class SettingActivity extends AppCompatActivity {
+public class SettingActivity extends ActivityBase<SettingPresenter> {
 
   private RecyclerView settingRecyclerView;
 
+
   @Override
-  protected void onCreate(@Nullable Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
+  void onAfterCreate(Bundle savedInstanceState) {
     setContentView(R.layout.activity_setting);
     settingRecyclerView = (RecyclerView) findViewById(R.id.recycler_view_setting);
     SettingExpandableListViewAdapter adapter = new SettingExpandableListViewAdapter(this);
@@ -37,4 +38,22 @@ public class SettingActivity extends AppCompatActivity {
     settingRecyclerView.setAdapter(adapter);
   }
 
+  @Override
+  void defineActionBar() {
+    ActionBarManager actionBarManager = ActionBarManager.getInstance();
+    actionBarManager.setProgressVisible(false);
+    actionBarManager.setTitleVisible(true);
+    actionBarManager.setTitle(R.string.setting);
+    actionBarManager.setBiVisible(false);
+    actionBarManager.setMenuVisible(false);
+    actionBarManager.setSearchVisible(false);
+    actionBarManager.setBackVisible(true);
+    actionBarManager.show();
+  }
+
+  @Override
+  SettingPresenter definePresenter() {
+    return new SettingPresenter(getModel(BlankModel.class), this);
+  }
+
 }

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

@@ -1,38 +0,0 @@
-package kr.co.zumo.app.lifeplus.bean;
-
-/**
- * SettingModel
- * <pre>
- * </pre>
- *
- * @author 하세미
- * @version 1.0
- * @history 하세미   [2018-10-10]   [최초 작성]
- * @since 2018-10-10
- */
-public class TextImageBean {
-
-  private int imageResource;
-  private int stringResource;
-
-  public TextImageBean(int imageResource, int stringResource) {
-    this.imageResource = imageResource;
-    this.stringResource = stringResource;
-  }
-
-  public int getImageResource() {
-    return imageResource;
-  }
-
-  public void setImageResource(int imageResource) {
-    this.imageResource = imageResource;
-  }
-
-  public int getStringResource() {
-    return stringResource;
-  }
-
-  public void setStringResource(int stringResource) {
-    this.stringResource = stringResource;
-  }
-}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/setting/SettingExpandableListViewAdapter.java

@@ -3,19 +3,11 @@ package kr.co.zumo.app.lifeplus.view.fragment.setting;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import java.util.ArrayList;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.bean.TextImageBean;
 
 /**
  * SettingExpandableListViewAdapter
@@ -29,10 +21,8 @@ import kr.co.zumo.app.lifeplus.bean.TextImageBean;
  */
 public class SettingExpandableListViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-  private ArrayList<TextImageBean> settingList;
   private Context context;
 
-
   public SettingExpandableListViewAdapter(Context context) {
     this.context = context;
   }
@@ -151,95 +141,5 @@ public class SettingExpandableListViewAdapter extends RecyclerView.Adapter<Recyc
     return 4;
   }
 
-  private class defaultSettingViewHolder extends RecyclerView.ViewHolder {
-
-    private TextView textViewMenuText;
-    private TextView textViewUserConfirm;
-    private RelativeLayout customLayout;
-    private ImageView imageViewAccordion;
-    private Switch switchPinOnOff;
-
-    public defaultSettingViewHolder(View itemView) {
-      super(itemView);
-      textViewMenuText = itemView.findViewById(R.id.text_view_setting_menu_text);
-      textViewUserConfirm = itemView.findViewById(R.id.text_view_user_confirm);
-      customLayout = itemView.findViewById(R.id.layout_default_setting);
-      imageViewAccordion = itemView.findViewById(R.id.image_view_setting_menu_accordion);
-      switchPinOnOff = itemView.findViewById(R.id.switch_pin_on_off);
-      switchPinOnOff.setTrackDrawable(new SwitchTrackTextDrawable(context, R.string.on, R.string.off));
-      textViewUserConfirm.setOnClickListener(new View.OnClickListener() {
-        @Override
-        public void onClick(View view) {
-          Log.w("APP# defaultSettingViewHolder | onClick", "|" + "click");
-        }
-      });
-
-    }
-
-    public void onClick() {
-      customLayout.setVisibility(customLayout.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
-      imageViewAccordion.setImageResource(customLayout.getVisibility() == View.GONE ? R.drawable.icon_arcordion_open_arrow : R.drawable.icon_arcordion_close_arrow);
-
-    }
-
-  }
-
-  private class codeManageViewHolder extends RecyclerView.ViewHolder {
-
-    private TextView textViewMenuText;
-    private RelativeLayout customLayout;
-    private ImageView imageViewAccordion;
-
-    public codeManageViewHolder(View itemView) {
-      super(itemView);
-      customLayout = itemView.findViewById(R.id.layout_code_manage);
-      imageViewAccordion = itemView.findViewById(R.id.image_view_setting_menu_accordion);
-      textViewMenuText = itemView.findViewById(R.id.text_view_setting_menu_text);
-    }
-
-    public void onClick() {
-      customLayout.setVisibility(customLayout.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
-      imageViewAccordion.setImageResource(customLayout.getVisibility() == View.GONE ? R.drawable.icon_arcordion_open_arrow : R.drawable.icon_arcordion_close_arrow);
-    }
-  }
-
-  private class pushAndLocationSettingViewHolder extends RecyclerView.ViewHolder {
-
-    private TextView textViewMenuText;
-    private RelativeLayout customLayout;
-    private ImageView imageViewAccordion;
-
-    public pushAndLocationSettingViewHolder(View itemView) {
-      super(itemView);
-      textViewMenuText = itemView.findViewById(R.id.text_view_setting_menu_text);
-      customLayout = itemView.findViewById(R.id.layout_push_location_setting);
-      imageViewAccordion = itemView.findViewById(R.id.image_view_setting_menu_accordion);
-    }
-
-    public void onClick() {
-      customLayout.setVisibility(customLayout.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
-      imageViewAccordion.setImageResource(customLayout.getVisibility() == View.GONE ? R.drawable.icon_arcordion_open_arrow : R.drawable.icon_arcordion_close_arrow);
-    }
-  }
-
-  private class agreeInformationViewHolder extends RecyclerView.ViewHolder {
-
-    private TextView textViewMenuText;
-    private RelativeLayout customLayout;
-    private ImageView imageViewAccordion;
-
-    public agreeInformationViewHolder(View itemView) {
-      super(itemView);
-      textViewMenuText = itemView.findViewById(R.id.text_view_setting_menu_text);
-      customLayout = itemView.findViewById(R.id.layout_agree_information);
-      imageViewAccordion = itemView.findViewById(R.id.image_view_setting_menu_accordion);
-    }
-
-    public void onClick() {
-      customLayout.setVisibility(customLayout.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
-      imageViewAccordion.setImageResource(customLayout.getVisibility() == View.GONE ? R.drawable.icon_arcordion_open_arrow : R.drawable.icon_arcordion_close_arrow);
-    }
-  }
-
 
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/setting/agreeInformationViewHolder.java

@@ -0,0 +1,38 @@
+package kr.co.zumo.app.lifeplus.view.fragment.setting;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+
+/**
+ * agreeInformationViewHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-12]   [최초 작성]
+ * @since 2018-10-12
+ */
+public class agreeInformationViewHolder extends RecyclerView.ViewHolder {
+
+  public TextView textViewMenuText;
+  public RelativeLayout customLayout;
+  public ImageView imageViewAccordion;
+
+  public agreeInformationViewHolder(View itemView) {
+    super(itemView);
+    textViewMenuText = itemView.findViewById(R.id.text_view_setting_menu_text);
+    customLayout = itemView.findViewById(R.id.layout_agree_information);
+    imageViewAccordion = itemView.findViewById(R.id.image_view_setting_menu_accordion);
+  }
+
+  public void onClick() {
+    customLayout.setVisibility(customLayout.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
+    imageViewAccordion.setImageResource(customLayout.getVisibility() == View.GONE ? R.drawable.icon_arcordion_open_arrow : R.drawable.icon_arcordion_close_arrow);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/setting/codeManageViewHolder.java

@@ -0,0 +1,38 @@
+package kr.co.zumo.app.lifeplus.view.fragment.setting;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+
+/**
+ * codeManageViewHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-12]   [최초 작성]
+ * @since 2018-10-12
+ */
+public class codeManageViewHolder extends RecyclerView.ViewHolder {
+
+  public TextView textViewMenuText;
+  public RelativeLayout customLayout;
+  public ImageView imageViewAccordion;
+
+  public codeManageViewHolder(View itemView) {
+    super(itemView);
+    customLayout = itemView.findViewById(R.id.layout_code_manage);
+    imageViewAccordion = itemView.findViewById(R.id.image_view_setting_menu_accordion);
+    textViewMenuText = itemView.findViewById(R.id.text_view_setting_menu_text);
+  }
+
+  public void onClick() {
+    customLayout.setVisibility(customLayout.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
+    imageViewAccordion.setImageResource(customLayout.getVisibility() == View.GONE ? R.drawable.icon_arcordion_open_arrow : R.drawable.icon_arcordion_close_arrow);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/setting/defaultSettingViewHolder.java

@@ -0,0 +1,53 @@
+package kr.co.zumo.app.lifeplus.view.fragment.setting;
+
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+
+/**
+ * defaultSettingViewHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-12]   [최초 작성]
+ * @since 2018-10-12
+ */
+public class defaultSettingViewHolder extends RecyclerView.ViewHolder {
+
+  public TextView textViewMenuText;
+  public TextView textViewUserConfirm;
+  public RelativeLayout customLayout;
+  public ImageView imageViewAccordion;
+  public Switch switchPinOnOff;
+
+  public defaultSettingViewHolder(View itemView) {
+    super(itemView);
+    textViewMenuText = itemView.findViewById(R.id.text_view_setting_menu_text);
+    textViewUserConfirm = itemView.findViewById(R.id.text_view_user_confirm);
+    customLayout = itemView.findViewById(R.id.layout_default_setting);
+    imageViewAccordion = itemView.findViewById(R.id.image_view_setting_menu_accordion);
+//      switchPinOnOff = itemView.findViewById(R.id.switch_pin_on_off);
+//      switchPinOnOff.setTrackDrawable(new SwitchTrackTextDrawable(context, R.string.on, R.string.off));
+    textViewUserConfirm.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View view) {
+        Log.w("APP# defaultSettingViewHolder | onClick", "|" + "click");
+      }
+    });
+
+  }
+
+  public void onClick() {
+    customLayout.setVisibility(customLayout.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
+    imageViewAccordion.setImageResource(customLayout.getVisibility() == View.GONE ? R.drawable.icon_arcordion_open_arrow : R.drawable.icon_arcordion_close_arrow);
+
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/setting/pushAndLocationSettingViewHolder.java

@@ -0,0 +1,38 @@
+package kr.co.zumo.app.lifeplus.view.fragment.setting;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+
+/**
+ * pushAndLocationSettingViewHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-12]   [최초 작성]
+ * @since 2018-10-12
+ */
+public class pushAndLocationSettingViewHolder extends RecyclerView.ViewHolder {
+
+  public TextView textViewMenuText;
+  public RelativeLayout customLayout;
+  public ImageView imageViewAccordion;
+
+  public pushAndLocationSettingViewHolder(View itemView) {
+    super(itemView);
+    textViewMenuText = itemView.findViewById(R.id.text_view_setting_menu_text);
+    customLayout = itemView.findViewById(R.id.layout_push_location_setting);
+    imageViewAccordion = itemView.findViewById(R.id.image_view_setting_menu_accordion);
+  }
+
+  public void onClick() {
+    customLayout.setVisibility(customLayout.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
+    imageViewAccordion.setImageResource(customLayout.getVisibility() == View.GONE ? R.drawable.icon_arcordion_open_arrow : R.drawable.icon_arcordion_close_arrow);
+  }
+}

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

@@ -0,0 +1,96 @@
+package kr.co.zumo.app.lifeplus.view.presenter.setting;
+
+import android.support.v7.app.ActionBar;
+
+import kr.co.zumo.app.lifeplus.model.BlankModel;
+import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.IView;
+import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
+
+/**
+ * SettingPresenter
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-12]   [최초 작성]
+ * @since 2018-10-12
+ */
+public class SettingPresenter extends Presenter<BlankModel, IView> {
+
+
+  public SettingPresenter(BlankModel model, IView view) {
+    super(model, view);
+  }
+
+  @Override
+  protected void destroyInternal() {
+
+  }
+
+  @Override
+  protected void startInternal() {
+
+  }
+
+  @Override
+  protected void stopInternal() {
+
+  }
+
+  @Override
+  protected void resumeInternal() {
+
+  }
+
+  @Override
+  protected void pauseInternal() {
+
+  }
+
+  @Override
+  public boolean onBackPressed() {
+    return false;
+  }
+
+  @Override
+  protected void onEventInternal(Event event) {
+
+  }
+
+  @Override
+  public void onResult(Event event) {
+
+  }
+
+  @Override
+  public void onClickTitle(ActionBar actionBar) {
+
+  }
+
+  @Override
+  public void onClickSearch(ActionBar actionBar) {
+
+  }
+
+  @Override
+  public void onClickMenu(ActionBar actionBar) {
+
+  }
+
+  @Override
+  public void onClickLike(ActionBar actionBar) {
+
+  }
+
+  @Override
+  public void onClickBookmark(ActionBar actionBar) {
+
+  }
+
+  @Override
+  public void onClickShare(ActionBar actionBar) {
+
+  }
+}

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

@@ -6,6 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical"
+  android:background="@color/CFFFFFF"
   >
 
   <android.support.v4.widget.NestedScrollView

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

@@ -41,8 +41,8 @@
         android:layout_marginTop="13dp"
         android:layout_marginBottom="17dp"
         android:paddingTop="10dp"
-        android:paddingBottom="10dp"
         android:paddingRight="15dp"
+        android:paddingBottom="10dp"
         android:text="@string/setting_menu1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image_view_setting_menu_icon"
@@ -57,8 +57,8 @@
         android:layout_marginBottom="15dp"
         android:paddingLeft="20dp"
         android:paddingTop="21dp"
-        android:paddingBottom="11dp"
         android:paddingRight="25dp"
+        android:paddingBottom="11dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -82,7 +82,9 @@
         android:layout_alignParentTop="true"
         android:layout_marginStart="25dp"
         android:lineSpacingExtra="4sp"
-        android:padding="5dp"
+        android:paddingTop="5dp"
+        android:paddingRight="5dp"
+        android:paddingBottom="5dp"
         android:text="@string/sign_up_completed_name"
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
@@ -94,8 +96,8 @@
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
         android:lineSpacingExtra="4sp"
-        android:text="@string/setting_menu1_user_confirm"
         android:padding="5dp"
+        android:text="@string/setting_menu1_user_confirm"
         android:textColor="@color/C666666"
         android:textSize="12sp"/>
 
@@ -108,7 +110,9 @@
         android:layout_marginTop="40dp"
         android:layout_marginBottom="26dp"
         android:lineSpacingExtra="4sp"
-        android:padding="5dp"
+        android:paddingTop="5dp"
+        android:paddingRight="5dp"
+        android:paddingBottom="5dp"
         android:text="자동 간편암호 잠금해제"
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
@@ -122,16 +126,19 @@
         android:layout_marginTop="0dp"
         android:paddingRight="25dp">
 
-        <Switch
+        <ToggleButton
           android:id="@+id/switch_pin_on_off"
+          style="?android:attr/borderlessButtonStyle"
           android:layout_width="44dp"
           android:layout_height="18dp"
           android:layout_alignParentEnd="true"
-          android:layout_marginTop="40dp"
+          android:layout_marginTop="48dp"
           android:layout_marginBottom="28dp"
-          android:background="@drawable/switch_track_selector"
-          android:thumb="@drawable/switch_thumb_selector"
-          />
+          android:background="@drawable/toggle_selector"
+          android:text=""
+          android:textOff=""
+          android:textOn=""/>
+
       </RelativeLayout>
     </RelativeLayout>
   </FrameLayout>

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

@@ -82,7 +82,9 @@
         android:layout_alignParentTop="true"
         android:layout_marginStart="25dp"
         android:lineSpacingExtra="4sp"
-        android:padding="5dp"
+        android:paddingTop="5dp"
+        android:paddingRight="5dp"
+        android:paddingBottom="5dp"
         android:text="@string/setting_menu2_share"
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
@@ -109,7 +111,9 @@
         android:layout_marginTop="40dp"
         android:layout_marginBottom="26dp"
         android:lineSpacingExtra="4sp"
-        android:padding="5dp"
+        android:paddingTop="5dp"
+        android:paddingRight="5dp"
+        android:paddingBottom="5dp"
         android:text="@string/setting_menu2_register"
         android:textColor="@color/C999999"
         android:textSize="12sp"/>

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

@@ -76,6 +76,7 @@
       >
 
       <TextView
+
         android:id="@+id/text_view_push_setting"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -87,15 +88,18 @@
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
 
-      <Switch
+
+      <ToggleButton
+        style="?android:attr/borderlessButtonStyle"
         android:layout_width="44dp"
         android:layout_height="18dp"
         android:layout_alignParentEnd="true"
         android:layout_marginEnd="25dp"
-        android:layout_marginBottom="28dp"
-        android:paddingTop="2dp"
-        android:thumb="@drawable/switch_thumb_selector"
-        android:track="@drawable/switch_track_selector"/>
+        android:layout_marginBottom="22dp"
+        android:background="@drawable/toggle_selector"
+        android:text=""
+        android:textOff=""
+        android:textOn=""/>
 
       <TextView
         android:id="@+id/text_view_marketing_setting"
@@ -107,22 +111,26 @@
         android:layout_marginStart="25dp"
         android:layout_marginTop="40dp"
         android:lineSpacingExtra="4sp"
+        android:paddingTop="2dp"
         android:paddingRight="5dp"
+        android:paddingBottom="2dp"
         android:text="@string/setting_menu3_setting2"
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
 
-      <Switch
-        android:id="@+id/switch_pin_on_off"
+
+      <ToggleButton
+        style="?android:attr/borderlessButtonStyle"
         android:layout_width="44dp"
         android:layout_height="18dp"
         android:layout_alignParentEnd="true"
         android:layout_marginTop="40dp"
         android:layout_marginEnd="25dp"
-        android:layout_marginBottom="28dp"
-        android:thumb="@drawable/switch_thumb_selector"
-        android:track="@drawable/switch_track_selector"
-        />
+        android:layout_marginBottom="22dp"
+        android:background="@drawable/toggle_selector"
+        android:text=""
+        android:textOff=""
+        android:textOn=""/>
 
       <TextView
         android:layout_width="wrap_content"
@@ -133,20 +141,24 @@
         android:layout_marginTop="25dp"
         android:layout_marginBottom="26dp"
         android:lineSpacingExtra="4sp"
+        android:paddingTop="2dp"
+        android:paddingBottom="2dp"
         android:text="@string/setting_menu3_setting3"
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
 
-      <Switch
+      <ToggleButton
+        style="?android:attr/borderlessButtonStyle"
         android:layout_width="44dp"
         android:layout_height="18dp"
         android:layout_alignParentEnd="true"
         android:layout_marginTop="86dp"
         android:layout_marginEnd="26dp"
         android:layout_marginBottom="28dp"
-        android:thumb="@drawable/switch_thumb_selector"
-        android:track="@drawable/switch_track_selector"
-        />
+        android:background="@drawable/toggle_selector"
+        android:text=""
+        android:textOff=""
+        android:textOn=""/>
     </RelativeLayout>
   </FrameLayout>
 </LinearLayout>

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

@@ -31,7 +31,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/icon_setting"/>
+        app:srcCompat="@drawable/icon_info"/>
 
       <TextView
         android:id="@+id/text_view_setting_menu_text"
@@ -41,9 +41,9 @@
         android:layout_marginTop="13dp"
         android:layout_marginBottom="17dp"
         android:paddingTop="10dp"
-        android:paddingBottom="10dp"
         android:paddingRight="15dp"
-        android:text="@string/setting_menu1"
+        android:paddingBottom="10dp"
+        android:text="@string/setting_menu4"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image_view_setting_menu_icon"
         app:layout_constraintTop_toTopOf="parent"/>
@@ -57,8 +57,8 @@
         android:layout_marginBottom="15dp"
         android:paddingLeft="20dp"
         android:paddingTop="21dp"
-        android:paddingBottom="11dp"
         android:paddingRight="25dp"
+        android:paddingBottom="11dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -82,22 +82,13 @@
         android:layout_alignParentTop="true"
         android:layout_marginStart="25dp"
         android:lineSpacingExtra="4sp"
-        android:padding="5dp"
-        android:text="@string/sign_up_completed_name"
+        android:paddingTop="5dp"
+        android:paddingRight="5dp"
+        android:paddingBottom="5dp"
+        android:text="@string/access_terms"
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
 
-      <TextView
-        android:id="@+id/text_view_user_confirm"
-        android:layout_width="70dp"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true"
-        android:lineSpacingExtra="4sp"
-        android:text="@string/setting_menu1_user_confirm"
-        android:padding="5dp"
-        android:textColor="@color/C666666"
-        android:textSize="12sp"/>
 
       <TextView
         android:layout_width="wrap_content"
@@ -108,31 +99,14 @@
         android:layout_marginTop="40dp"
         android:layout_marginBottom="26dp"
         android:lineSpacingExtra="4sp"
-        android:padding="5dp"
-        android:text="자동 간편암호 잠금해제"
+        android:paddingTop="5dp"
+        android:paddingRight="5dp"
+        android:paddingBottom="5dp"
+        android:text="@string/operation_guide"
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
 
-      <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="0dp"
-        android:layout_marginTop="0dp"
-        android:paddingRight="25dp">
 
-        <Switch
-          android:id="@+id/switch_pin_on_off"
-          android:layout_width="44dp"
-          android:layout_height="18dp"
-          android:layout_alignParentEnd="true"
-          android:layout_marginTop="40dp"
-          android:layout_marginBottom="28dp"
-          android:background="@drawable/switch_track_selector"
-          android:thumb="@drawable/switch_thumb_selector"
-          />
-      </RelativeLayout>
     </RelativeLayout>
   </FrameLayout>
 </LinearLayout>

app/src/main/res/values/strings.xml

@@ -294,6 +294,8 @@
   <string name="setting_version_information_message">최신버전입니다.</string>
   <string name="setting_version_update"><u>업데이트</u></string>
 
+  <string name="access_terms">이용 약관</string>
+  <string name="operation_guide">이용 안내</string>
 
   <string name="special_code_confirm_success">스페셜 코드 등록 완료</string>
   <string name="special_code_confirm_success_detail">라이프플러스 고객으로 인증되었습니다.\n고객님의 일상을 더욱 윤택하게 하는 풍성한 혜택을 누려보세요!</string>
@@ -302,6 +304,7 @@
   <string name="recommend_confirm_success_detail">이한화님의 추천이 인증되었습니다.\n회원님과 추천인에게 300코인 지급이 완료되었습니다.</string>
 
 
+  <string name="setting">설정</string>
   <string name="on"><b>ON</b></string>
   <string name="off"><b>OFF</b></string>
   <string name="user_quit_fail">회원님의 경우 탈퇴가 불가능합니다.\n아래 내용을 확인해주세요.</string>