[세팅][New] 레이아웃 수정 중

- Constraint 로 전환 중
- 커스텀 스위치 백그라운드(track) 문제 있음: 패딩을 주면 백그라운드가 가득차서 이상해짐

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

@@ -2,8 +2,8 @@ package kr.co.zumo.app.lifeplus.view.fragment.setting;
 
 import android.content.Context;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import kr.co.zumo.app.R;
@@ -22,7 +22,7 @@ import kr.co.zumo.app.lifeplus.view.Event;
 public class AgreeInformationViewHolder extends SettingViewHolder {
 
   private TextView textViewMenuText;
-  private RelativeLayout customLayout;
+  private ViewGroup customLayout;
   private ImageView imageViewAccordion;
   private TextView textViewPolicy;
   private TextView textViewUsage;

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

@@ -2,8 +2,8 @@ package kr.co.zumo.app.lifeplus.view.fragment.setting;
 
 import android.content.Context;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import kr.co.zumo.app.R;
@@ -22,7 +22,7 @@ import kr.co.zumo.app.lifeplus.view.Event;
 public class CodeManageViewHolder extends SettingViewHolder {
 
   private TextView textViewMenuText;
-  private RelativeLayout customLayout;
+  private ViewGroup customLayout;
   private ImageView imageViewAccordion;
   private TextView textViewShare;
   private TextView textViewRecommend;

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

@@ -2,8 +2,8 @@ package kr.co.zumo.app.lifeplus.view.fragment.setting;
 
 import android.content.Context;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 
@@ -24,7 +24,7 @@ public class CommonSettingViewHolder extends SettingViewHolder {
 
   private TextView textViewMenuText;
   private TextView textViewUserConfirm;
-  private RelativeLayout customLayout;
+  private ViewGroup customLayout;
   private ImageView imageViewAccordion;
   private Switch switchPinOnOff;
 

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

@@ -2,8 +2,8 @@ package kr.co.zumo.app.lifeplus.view.fragment.setting;
 
 import android.content.Context;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 
@@ -23,7 +23,7 @@ import kr.co.zumo.app.lifeplus.view.Event;
 public class PushAndLocationSettingViewHolder extends SettingViewHolder {
 
   private TextView textViewMenuText;
-  private RelativeLayout customLayout;
+  private ViewGroup customLayout;
   private ImageView imageViewAccordion;
   private Switch switchPushOnOff;
   private Switch switchMarketingOnOff;

app/src/main/res/drawable/switch_track_off.xml

@@ -4,14 +4,16 @@
   android:shape="rectangle">
 
   <corners
-    android:radius="11dp"/>
+    android:radius="9dp"/>
 
   <size
     android:width="46dp"
     android:height="18dp"/>
+
   <solid
     android:color="@color/CE5E5E5"/>
+
   <stroke
     android:width="2dp"
-    android:color="@color/CFFFFFF" />
+    android:color="@color/CFFFFFF"/>
 </shape>

app/src/main/res/drawable/switch_track_on.xml

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android"
-  android:shape="rectangle" >
+  android:shape="rectangle">
 
   <corners
-    android:radius="11dp" />
+    android:radius="9dp"/>
 
   <size
     android:width="46dp"
-    android:height="18dp" />
+    android:height="18dp"/>
 
   <solid
-    android:color="@color/C333333" />
+    android:color="@color/C333333"/>
+
   <stroke
     android:width="2dp"
-    android:color="@color/CFFFFFF" />
+    android:color="@color/CFFFFFF"/>
 
 </shape>

app/src/main/res/drawable/switch_track_selector.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:drawable="@drawable/switch_track_off"
-    android:state_checked="false"/>
   <item
     android:drawable="@drawable/switch_track_on"
     android:state_checked="true"/>
+  <item
+    android:drawable="@drawable/switch_track_off"
+    android:state_checked="false"/>
 
 </selector>

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

@@ -1,141 +1,123 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.constraint.ConstraintLayout
   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:orientation="vertical">
+  android:minHeight="70dp">
 
-  <FrameLayout
+  <android.support.constraint.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="1dp"
-    android:orientation="vertical"
+    android:minHeight="70dp"
     >
 
-    <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_marginStart="25dp"
+      android:layout_marginBottom="3dp"
+      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_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"/>
+    <TextView
+      android:id="@+id/text_view_setting_menu_text"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:padding="9dp"
+      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"/>
 
-      <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_menu1"
-        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="50dp"
+      android:layout_height="50dp"
+      android:layout_marginEnd="9dp"
+      android:padding="20dp"
+      app:layout_constraintBottom_toBottomOf="@+id/text_view_setting_menu_text"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintTop_toTopOf="@+id/text_view_setting_menu_text"
+      app:srcCompat="@drawable/icon_arcordion_open_arrow"/>
+  </android.support.constraint.ConstraintLayout>
 
-      <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>
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_default_setting"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="55dp"
+    android:paddingBottom="27dp"
+    android:visibility="gone"
+    tools:visibility="visible"
+    >
 
-    <RelativeLayout
-      android:id="@+id/layout_default_setting"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:gravity="bottom"
-      android:paddingTop="63dp"
-      android:visibility="gone"
-      tools:visibility="visible"
-      >
+    <android.support.constraint.Guideline
+      android:id="@+id/guide_start"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="vertical"
+      app:layout_constraintGuide_begin="15dp"/>
 
-      <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:paddingTop="5dp"
-        android:paddingRight="5dp"
-        android:paddingBottom="5dp"
-        android:text="@string/sign_up_completed_name"
-        android:textColor="@color/C999999"
-        android:textSize="12sp"/>
+    <TextView
+      android:id="@+id/textView"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:padding="10dp"
+      android:text="@string/sign_up_completed_name"
+      android:textColor="@color/C999999"
+      android:textSize="12sp"
+      app:layout_constraintHorizontal_chainStyle="spread_inside"
+      app:layout_constraintStart_toStartOf="@+id/guide_start"/>
 
-      <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:padding="5dp"
-        android:text="@string/setting_menu1_user_confirm"
-        android:textColor="@color/C666666"
-        android:textSize="12sp"/>
+    <TextView
+      android:id="@+id/text_view_user_confirm"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:lineSpacingExtra="4sp"
+      android:padding="10dp"
+      android:text="@string/setting_menu1_user_confirm"
+      android:textColor="@color/C666666"
+      android:textSize="12sp"
+      app:layout_constraintBottom_toBottomOf="@+id/textView"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintEnd_toStartOf="@+id/guide_end"
+      app:layout_constraintTop_toTopOf="@+id/textView"/>
 
-      <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:paddingTop="5dp"
-        android:paddingRight="5dp"
-        android:paddingBottom="5dp"
-        android:text="자동 간편암호 잠금해제"
-        android:textColor="@color/C999999"
-        android:textSize="12sp"/>
+    <TextView
+      android:id="@+id/textView2"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="2dp"
+      android:padding="10dp"
+      android:text="@string/setting_pin_unlock"
+      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/textView"/>
 
-      <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">
+    <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:layout_marginEnd="10dp"
+      app:layout_constraintBottom_toBottomOf="@+id/textView2"
+      app:layout_constraintEnd_toStartOf="@+id/guide_end"
+      app:layout_constraintTop_toTopOf="@+id/textView2"/>
 
-        <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:layout_alignParentEnd="true"
-          android:layout_marginTop="48dp"
-          android:layout_marginBottom="28dp"
-          />
+    <android.support.constraint.Guideline
+      android:id="@+id/guide_end"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="vertical"
+      android:drawablePadding="20dp"
+      app:layout_constraintGuide_end="15dp"/>
 
-      </RelativeLayout>
-    </RelativeLayout>
-  </FrameLayout>
-</LinearLayout>
+  </android.support.constraint.ConstraintLayout>
+</android.support.constraint.ConstraintLayout>

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

@@ -293,6 +293,7 @@
   <string name="setting_version_information">현재버전 %s</string>
   <string name="setting_version_information_message">최신버전입니다.</string>
   <string name="setting_version_update"><u>업데이트</u></string>
+  <string name="setting_pin_unlock">자동 간편암호 잠금해제</string>
 
   <string name="access_terms">이용 약관</string>
   <string name="operation_guide">이용 안내</string>