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

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

@@ -73,36 +73,65 @@ public class SettingExpandableListViewAdapter extends RecyclerView.Adapter<Recyc
 
   @Override
   public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+
     switch (position) {
       case 0:
-        ((defaultSettingViewHolder) holder).imageViewAccordion.setOnClickListener(new View.OnClickListener() {
+        defaultSettingViewHolder defaultSettingViewHolder = ((defaultSettingViewHolder) holder);
+        defaultSettingViewHolder.textViewMenuText.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {
-            ((defaultSettingViewHolder) holder).onClick();
+            defaultSettingViewHolder.onClick();
+          }
+        });
+        defaultSettingViewHolder.imageViewAccordion.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+            defaultSettingViewHolder.onClick();
           }
         });
         break;
       case 1:
-        ((codeManageViewHolder) holder).imageViewAccordion.setOnClickListener(new View.OnClickListener() {
+        codeManageViewHolder codeManageViewHolder = ((codeManageViewHolder) holder);
+        codeManageViewHolder.textViewMenuText.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {
-            ((codeManageViewHolder) holder).onClick();
+            codeManageViewHolder.onClick();
+          }
+        });
+        codeManageViewHolder.imageViewAccordion.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+            codeManageViewHolder.onClick();
           }
         });
         break;
       case 2:
-        ((pushAndLocationSettingViewHolder) holder).imageViewAccordion.setOnClickListener(new View.OnClickListener() {
+        pushAndLocationSettingViewHolder pushAndLocationSettingViewHolder = ((pushAndLocationSettingViewHolder) holder);
+        pushAndLocationSettingViewHolder.textViewMenuText.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+            pushAndLocationSettingViewHolder.onClick();
+          }
+        });
+        pushAndLocationSettingViewHolder.imageViewAccordion.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {
-            ((pushAndLocationSettingViewHolder) holder).onClick();
+            pushAndLocationSettingViewHolder.onClick();
           }
         });
         break;
       case 3:
-        ((agreeInformationViewHolder) holder).imageViewAccordion.setOnClickListener(new View.OnClickListener() {
+        agreeInformationViewHolder agreeInformationViewHolder = ((agreeInformationViewHolder) holder);
+        agreeInformationViewHolder.imageViewAccordion.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {
-            ((agreeInformationViewHolder) holder).onClick();
+            agreeInformationViewHolder.onClick();
+          }
+        });
+        agreeInformationViewHolder.textViewMenuText.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+            agreeInformationViewHolder.onClick();
           }
         });
         break;
@@ -123,26 +152,28 @@ public class SettingExpandableListViewAdapter extends RecyclerView.Adapter<Recyc
   }
 
   private class defaultSettingViewHolder extends RecyclerView.ViewHolder {
-    
+
+    private TextView textViewMenuText;
     private TextView textViewUserConfirm;
     private RelativeLayout customLayout;
     private ImageView imageViewAccordion;
-    private Switch testSwitch;
+    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);
-      testSwitch = itemView.findViewById(R.id.test_switch);
-      testSwitch.setTrackDrawable(new SwitchTrackTextDrawable(context, R.string.on, R.string.off));
-      
+      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() {
@@ -154,6 +185,8 @@ public class SettingExpandableListViewAdapter extends RecyclerView.Adapter<Recyc
   }
 
   private class codeManageViewHolder extends RecyclerView.ViewHolder {
+
+    private TextView textViewMenuText;
     private RelativeLayout customLayout;
     private ImageView imageViewAccordion;
 
@@ -161,7 +194,7 @@ public class SettingExpandableListViewAdapter extends RecyclerView.Adapter<Recyc
       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() {
@@ -171,11 +204,14 @@ public class SettingExpandableListViewAdapter extends RecyclerView.Adapter<Recyc
   }
 
   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);
     }
@@ -187,11 +223,14 @@ public class SettingExpandableListViewAdapter extends RecyclerView.Adapter<Recyc
   }
 
   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);
     }
@@ -201,4 +240,6 @@ public class SettingExpandableListViewAdapter extends RecyclerView.Adapter<Recyc
       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/SwitchTrackTextDrawable.java

@@ -55,6 +55,7 @@ public class SwitchTrackTextDrawable extends Drawable {
     textPaint.setStyle(Paint.Style.FILL);
     textPaint.setTextAlign(Paint.Align.CENTER);
     textPaint.setTextSize(ResourceUtil.dpToPx(9));
+
     // Set textSize, typeface, etc, as you wish
     return textPaint;
   }
@@ -69,6 +70,7 @@ public class SwitchTrackTextDrawable extends Drawable {
     final int heightBaseline = canvas.getClipBounds().height() / 2 + textBounds.height() / 2;
 
     final int widthQuarter = canvas.getClipBounds().width() / 4;
+    //on 텍스트 흰색 변경
     mTextPaint.setColor(mContext.getResources().getColor(android.R.color.white));
     canvas.drawText(mLeftText, 0, mLeftText.length(),
       widthQuarter, heightBaseline,

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

@@ -9,7 +9,6 @@
   android:orientation="vertical">
 
   <FrameLayout
-    android:id="@+id/setting_custom_menu_frame1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="1dp"
@@ -39,8 +38,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="54dp"
-        android:layout_marginTop="23dp"
-        android:layout_marginBottom="27dp"
+        android:layout_marginTop="13dp"
+        android:layout_marginBottom="17dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:paddingRight="15dp"
         android:text="@string/setting_menu1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image_view_setting_menu_icon"
@@ -51,12 +53,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_marginTop="26dp"
-        android:layout_marginBottom="26dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="15dp"
         android:paddingLeft="20dp"
-        android:paddingTop="5dp"
+        android:paddingTop="21dp"
+        android:paddingBottom="11dp"
         android:paddingRight="25dp"
-        android:paddingBottom="5dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -80,7 +82,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginStart="25dp"
         android:lineSpacingExtra="4sp"
-        android:paddingTop="-5dp"
+        android:padding="5dp"
         android:text="@string/sign_up_completed_name"
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
@@ -92,11 +94,8 @@
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
         android:lineSpacingExtra="4sp"
-        android:padding="5dp"
-        android:paddingLeft="25dp"
-        android:paddingTop="5dp"
-        android:paddingRight="25dp"
         android:text="@string/setting_menu1_user_confirm"
+        android:padding="5dp"
         android:textColor="@color/C666666"
         android:textSize="12sp"/>
 
@@ -107,8 +106,9 @@
         android:layout_alignParentTop="true"
         android:layout_marginStart="25dp"
         android:layout_marginTop="40dp"
-        android:layout_marginBottom="28dp"
+        android:layout_marginBottom="26dp"
         android:lineSpacingExtra="4sp"
+        android:padding="5dp"
         android:text="자동 간편암호 잠금해제"
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
@@ -123,7 +123,7 @@
         android:paddingRight="25dp">
 
         <Switch
-          android:id="@+id/test_switch"
+          android:id="@+id/switch_pin_on_off"
           android:layout_width="44dp"
           android:layout_height="18dp"
           android:layout_alignParentEnd="true"

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

@@ -3,105 +3,116 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/setting_custom_menu_layout1"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:layout_marginBottom="1dp"
-  android:orientation="vertical"
-  >
+  android:orientation="vertical">
 
-  <android.support.constraint.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="73dp">
-
-    <ImageView
-      android:id="@+id/image_view_setting_menu_icon"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="25dp"
-      android:layout_marginTop="23dp"
-      android:layout_marginBottom="8dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/icon_code"/>
-
-    <TextView
-      android:id="@+id/text_view_setting_menu_text"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="8dp"
-      android:layout_marginTop="23dp"
-      android:layout_marginBottom="11dp"
-      android:text="@string/setting_menu2"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintStart_toEndOf="@+id/image_view_setting_menu_icon"
-      app:layout_constraintTop_toTopOf="parent"/>
-
-    <ImageView
-      android:id="@+id/image_view_setting_menu_accordion"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="8dp"
-      android:layout_marginBottom="10dp"
-      android:layout_marginEnd="14dp"
-      android:padding="8dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      app:layout_constraintVertical_bias="0.888"
-      app:srcCompat="@drawable/icon_arcordion_open_arrow"/>
-  </android.support.constraint.ConstraintLayout>
-
-  <RelativeLayout
-    android:id="@+id/layout_code_manage"
+  <FrameLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="1dp"
     android:orientation="vertical"
-    android:visibility="gone"
-    tools:visibility="visible"
     >
 
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentStart="true"
-      android:layout_alignParentTop="true"
-      android:layout_marginTop="16dp"
-      android:lineSpacingExtra="3sp"
-      android:layout_marginLeft="25dp"
-      android:paddingTop="10dp"
-      android:text="@string/setting_menu2_share"
-      android:textColor="@color/C999999"
-      android:textSize="12sp"/>
+    <RelativeLayout
+      android:id="@+id/layout_menu1"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
+
+      <ImageView
+        android:id="@+id/image_view_setting_menu_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="25dp"
+        android:layout_marginTop="23dp"
+        android:layout_marginBottom="27dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/icon_code"/>
+
+      <TextView
+        android:id="@+id/text_view_setting_menu_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="54dp"
+        android:layout_marginTop="13dp"
+        android:layout_marginBottom="17dp"
+        android:paddingTop="10dp"
+        android:paddingRight="15dp"
+        android:paddingBottom="10dp"
+        android:text="@string/setting_menu2"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/image_view_setting_menu_icon"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+      <ImageView
+        android:id="@+id/image_view_setting_menu_accordion"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="15dp"
+        android:paddingLeft="20dp"
+        android:paddingTop="21dp"
+        android:paddingRight="25dp"
+        android:paddingBottom="11dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/icon_arcordion_open_arrow"/>
+    </RelativeLayout>
 
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentTop="true"
-      android:layout_alignParentEnd="true"
-      android:layout_marginTop="10dp"
-      android:lineSpacingExtra="3sp"
-      android:paddingTop="10dp"
-      android:paddingRight="25dp"
-      android:paddingBottom="8dp"
-      android:text="@string/setting_menu2_code"
-      android:textColor="@color/C666666"
-      android:textSize="12sp"/>
+    <RelativeLayout
+      android:id="@+id/layout_code_manage"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:gravity="bottom"
+      android:paddingTop="63dp"
+      android:visibility="gone"
+      tools:visibility="visible"
+      >
 
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentStart="true"
-      android:layout_alignParentTop="true"
-      android:layout_marginTop="60dp"
-      android:layout_marginBottom="28dp"
-      android:lineSpacingExtra="3sp"
-      android:paddingTop="10dp"
-      android:layout_marginLeft="25dp"
-      android:text="@string/setting_menu2_register"
-      android:textColor="@color/C999999"
-      android:textSize="12sp"/>
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="25dp"
+        android:lineSpacingExtra="4sp"
+        android:padding="5dp"
+        android:text="@string/setting_menu2_share"
+        android:textColor="@color/C999999"
+        android:textSize="12sp"/>
 
-  </RelativeLayout>
+      <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:layout_marginEnd="24dp"
+        android:lineSpacingExtra="4sp"
+        android:padding="5dp"
+        android:text="@string/setting_menu2_code"
+        android:textColor="@color/C666666"
+        android:textSize="12sp"/>
 
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="25dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginBottom="26dp"
+        android:lineSpacingExtra="4sp"
+        android:padding="5dp"
+        android:text="@string/setting_menu2_register"
+        android:textColor="@color/C999999"
+        android:textSize="12sp"/>
+    </RelativeLayout>
+  </FrameLayout>
 </LinearLayout>

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

@@ -3,164 +3,150 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/setting_custom_menu_layout1"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:layout_marginBottom="1dp"
-  android:orientation="vertical"
-  >
+  android:orientation="vertical">
 
-  <android.support.constraint.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-      android:id="@+id/image_view_setting_menu_icon"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:paddingLeft="25dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/icon_location2"/>
-
-    <TextView
-      android:id="@+id/text_view_setting_menu_text"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="8dp"
-      android:text="@string/setting_menu3"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintStart_toEndOf="@+id/image_view_setting_menu_icon"
-      app:layout_constraintTop_toTopOf="parent"/>
-
-    <ImageView
-      android:id="@+id/image_view_setting_menu_accordion"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="11dp"
-      android:layout_marginBottom="11dp"
-      android:paddingLeft="20dp"
-      android:paddingTop="20dp"
-      android:paddingRight="25dp"
-      android:paddingBottom="20dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/icon_arcordion_open_arrow"/>
-  </android.support.constraint.ConstraintLayout>
-
-  <RelativeLayout
-    android:id="@+id/layout_push_location_setting"
+  <FrameLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="1dp"
     android:orientation="vertical"
-    android:visibility="gone"
-    tools:visibility="visible"
     >
 
     <RelativeLayout
+      android:id="@+id/layout_menu1"
       android:layout_width="match_parent"
       android:layout_height="wrap_content">
 
-      <TextView
+      <ImageView
+        android:id="@+id/image_view_setting_menu_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:lineSpacingExtra="4sp"
-        android:paddingLeft="25dp"
-        android:text="PUSH  수신 설정"
-        android:textColor="@color/C999999"
-        android:textSize="12sp"/>
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="25dp"
+        android:layout_marginTop="23dp"
+        android:layout_marginBottom="27dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/icon_location2"/>
 
-      <RelativeLayout
+      <TextView
+        android:id="@+id/text_view_setting_menu_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingRight="25dp">
-
-        <ToggleButton
-          style="?android:attr/borderlessButtonStyle"
-          android:layout_width="44dp"
-          android:layout_height="18dp"
-          android:layout_alignParentEnd="true"
-          android:background="@drawable/toggle_selector"
-          android:text=""
-          android:textOff=""
-          android:textOn=""
-          />
-      </RelativeLayout>
+        android:layout_marginStart="54dp"
+        android:layout_marginTop="13dp"
+        android:layout_marginBottom="17dp"
+        android:paddingTop="10dp"
+        android:paddingRight="15dp"
+        android:paddingBottom="10dp"
+        android:text="@string/setting_menu3"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/image_view_setting_menu_icon"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+      <ImageView
+        android:id="@+id/image_view_setting_menu_accordion"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="15dp"
+        android:paddingLeft="20dp"
+        android:paddingTop="21dp"
+        android:paddingRight="25dp"
+        android:paddingBottom="11dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/icon_arcordion_open_arrow"/>
     </RelativeLayout>
 
     <RelativeLayout
+      android:id="@+id/layout_push_location_setting"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_alignParentStart="true"
-      android:layout_marginTop="45dp">
+      android:layout_height="match_parent"
+      android:gravity="bottom"
+      android:paddingTop="63dp"
+      android:visibility="gone"
+      tools:visibility="visible"
+      >
 
       <TextView
+        android:id="@+id/text_view_push_setting"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
+        android:layout_marginStart="25dp"
         android:lineSpacingExtra="4sp"
-        android:paddingLeft="25dp"
-        android:text="PUSH 마케팅 수신 설정"
+        android:text="@string/setting_menu3_setting1"
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
 
-      <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingRight="25dp">
-
-        <ToggleButton
-          style="?android:attr/borderlessButtonStyle"
-          android:layout_width="44dp"
-          android:layout_height="18dp"
-          android:layout_alignParentEnd="true"
-          android:background="@drawable/toggle_selector"
-          android:text=""
-          android:textOff=""
-          android:textOn=""
-          />
-      </RelativeLayout>
-    </RelativeLayout>
-
-    <RelativeLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="85dp"
-      android:layout_marginBottom="28dp"
-      >
+      <Switch
+        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"/>
 
       <TextView
+        android:id="@+id/text_view_marketing_setting"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/text_view_push_setting"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
+        android:layout_marginStart="25dp"
+        android:layout_marginTop="40dp"
         android:lineSpacingExtra="4sp"
-        android:paddingLeft="25dp"
-        android:text="위치기반서비스 이용 설정"
+        android:paddingRight="5dp"
+        android:text="@string/setting_menu3_setting2"
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
 
-      <RelativeLayout
+      <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_marginEnd="25dp"
+        android:layout_marginBottom="28dp"
+        android:thumb="@drawable/switch_thumb_selector"
+        android:track="@drawable/switch_track_selector"
+        />
+
+      <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingRight="25dp">
+        android:layout_below="@+id/text_view_marketing_setting"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="25dp"
+        android:layout_marginTop="25dp"
+        android:layout_marginBottom="26dp"
+        android:lineSpacingExtra="4sp"
+        android:text="@string/setting_menu3_setting3"
+        android:textColor="@color/C999999"
+        android:textSize="12sp"/>
 
-        <ToggleButton
-          style="?android:attr/borderlessButtonStyle"
-          android:layout_width="44dp"
-          android:layout_height="18dp"
-          android:layout_alignParentEnd="true"
-          android:background="@drawable/toggle_selector"
-          android:text=""
-          android:textOff=""
-          android:textOn=""
-          />
-      </RelativeLayout>
+      <Switch
+        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"
+        />
     </RelativeLayout>
-
-
-  </RelativeLayout>
-
+  </FrameLayout>
 </LinearLayout>

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

@@ -3,90 +3,136 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/setting_custom_menu_layout1"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:layout_marginBottom="1dp"
-  android:orientation="vertical"
-  >
+  android:orientation="vertical">
 
-  <android.support.constraint.ConstraintLayout
+  <FrameLayout
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="1dp"
+    android:orientation="vertical"
+    >
 
-    <ImageView
-      android:id="@+id/image_view_setting_menu_icon"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="23dp"
-      android:layout_marginBottom="26dp"
-      android:paddingLeft="25dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/icon_info"/>
+    <RelativeLayout
+      android:id="@+id/layout_menu1"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
 
-    <TextView
-      android:id="@+id/text_view_setting_menu_text"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="8dp"
-      android:layout_marginTop="23dp"
-      android:layout_marginBottom="27dp"
-      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"/>
+      <ImageView
+        android:id="@+id/image_view_setting_menu_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="25dp"
+        android:layout_marginTop="23dp"
+        android:layout_marginBottom="27dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/icon_setting"/>
 
-    <ImageView
-      android:id="@+id/image_view_setting_menu_accordion"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="11dp"
-      android:layout_marginBottom="11dp"
-      android:paddingLeft="20dp"
-      android:paddingTop="20dp"
-      android:paddingRight="25dp"
-      android:paddingBottom="20dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/icon_arcordion_open_arrow"/>
-  </android.support.constraint.ConstraintLayout>
+      <TextView
+        android:id="@+id/text_view_setting_menu_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="54dp"
+        android:layout_marginTop="13dp"
+        android:layout_marginBottom="17dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:paddingRight="15dp"
+        android:text="@string/setting_menu1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/image_view_setting_menu_icon"
+        app:layout_constraintTop_toTopOf="parent"/>
 
-  <RelativeLayout
-    android:id="@+id/layout_agree_information"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:visibility="gone"
-    tools:visibility="visible"
-    >
+      <ImageView
+        android:id="@+id/image_view_setting_menu_accordion"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="15dp"
+        android:paddingLeft="20dp"
+        android:paddingTop="21dp"
+        android:paddingBottom="11dp"
+        android:paddingRight="25dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/icon_arcordion_open_arrow"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+      android:id="@+id/layout_agree_information"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:gravity="bottom"
+      android:paddingTop="63dp"
+      android:visibility="gone"
+      tools:visibility="visible"
+      >
 
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentStart="true"
-      android:layout_alignParentTop="true"
-      android:lineSpacingExtra="4sp"
-      android:paddingLeft="25dp"
-      android:text="이용 약관"
-      android:textColor="@color/C999999"
-      android:textSize="12sp"/>
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="25dp"
+        android:lineSpacingExtra="4sp"
+        android:padding="5dp"
+        android:text="@string/sign_up_completed_name"
+        android:textColor="@color/C999999"
+        android:textSize="12sp"/>
 
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentStart="true"
-      android:layout_alignParentTop="true"
-      android:layout_marginTop="30dp"
-      android:layout_marginBottom="28dp"
-      android:lineSpacingExtra="4sp"
-      android:paddingLeft="25dp"
-      android:text="이용안내"
-      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"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="25dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginBottom="26dp"
+        android:lineSpacingExtra="4sp"
+        android:padding="5dp"
+        android:text="자동 간편암호 잠금해제"
+        android:textColor="@color/C999999"
+        android:textSize="12sp"/>
 
-  </RelativeLayout>
+      <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/layout/setting_toast_pop_up.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    android:layout_gravity="bottom"
+    android:background="@color/C333333"
+    android:orientation="vertical"
+    >
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="25dp"
+      android:layout_marginTop="18dp"
+      android:layout_marginEnd="25dp"
+      android:layout_marginBottom="18dp"
+      android:orientation="vertical">
+
+      <TextView
+        android:id="@+id/setting_toast_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="9dp"
+        android:lineSpacingExtra="4sp"
+        android:text="@string/special_code_confirm_success"
+        android:textColor="@color/CFFFFFF"
+        android:textSize="12sp"
+        />
+
+      <TextView
+        android:id="@+id/setting_toast_detail"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:lineSpacingExtra="4sp"
+        android:text="@string/special_code_confirm_success_detail"
+        android:textColor="@color/C999999"
+        android:textSize="12sp"
+        />
+
+    </LinearLayout>
+  </LinearLayout>
+</RelativeLayout>

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

@@ -220,6 +220,9 @@
   <string name="setting_menu2_code"><u>D4KDFJ1F</u></string>
   <string name="setting_menu2_register">스페셜/추천인 코드 등록</string>
   <string name="setting_menu3">PUSH/위치 설정</string>
+  <string name="setting_menu3_setting1">PUSH 수신 설정</string>
+  <string name="setting_menu3_setting2">PUSH 마케팅 수신 설정</string>
+  <string name="setting_menu3_setting3">위치기반서비스 이용 설정</string>
   <string name="setting_menu4">약관/이용 안내</string>
 
 
@@ -291,8 +294,16 @@
   <string name="setting_version_information_message">최신버전입니다.</string>
   <string name="setting_version_update"><u>업데이트</u></string>
 
-  <string name="on">on</string>
-  <string name="off">off</string>
+
+  <string name="special_code_confirm_success">스페셜 코드 등록 완료</string>
+  <string name="special_code_confirm_success_detail">라이프플러스 고객으로 인증되었습니다.\n고객님의 일상을 더욱 윤택하게 하는 풍성한 혜택을 누려보세요!</string>
+
+  <string name="recommend_special_code_confirm_success">추천인 코드 등록 완료</string>
+  <string name="recommend_confirm_success_detail">이한화님의 추천이 인증되었습니다.\n회원님과 추천인에게 300코인 지급이 완료되었습니다.</string>
+
+
+  <string name="on"><b>ON</b></string>
+  <string name="off"><b>OFF</b></string>
   <string name="user_quit_fail">회원님의 경우 탈퇴가 불가능합니다.\n아래 내용을 확인해주세요.</string>
   <string name="user_quit_fail_message">Lifeplus 회원탈퇴 전 유의사항을 확인해주세요.</string>
   <string name="user_coin">보유코인</string>