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

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

@@ -12,8 +12,6 @@
     android:id="@+id/recycler_view_setting"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="25dp"
-    android:layout_marginEnd="25dp"
     />
 
   <!--<android.support.constraint.ConstraintLayout

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

@@ -19,6 +19,7 @@
       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"
@@ -44,6 +45,7 @@
       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"
@@ -56,6 +58,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:visibility="gone"
+    tools:visibility="visible"
     >
 
     <TextView
@@ -64,6 +67,7 @@
       android:layout_alignParentStart="true"
       android:layout_alignParentTop="true"
       android:lineSpacingExtra="4sp"
+      android:paddingLeft="25dp"
       android:text="김한화"
       android:textColor="@color/C999999"
       android:textSize="12sp"/>
@@ -74,6 +78,7 @@
       android:layout_alignParentTop="true"
       android:layout_alignParentEnd="true"
       android:lineSpacingExtra="4sp"
+      android:paddingRight="25dp"
       android:text="회원확인"
       android:textColor="@color/C666666"
       android:textSize="12sp"/>
@@ -86,22 +91,28 @@
       android:layout_marginTop="40dp"
       android:layout_marginBottom="28dp"
       android:lineSpacingExtra="4sp"
+      android:paddingLeft="25dp"
       android:text="자동 간편암호 잠금해제"
       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:layout_marginTop="30dp"
-      android:layout_marginBottom="28dp"
-      android:background="@drawable/toggle_selector"
-      android:text=""
-      android:textOff=""
-      android:textOn=""
-      />
+    <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:layout_marginTop="40dp"
+        android:layout_marginBottom="28dp"
+        android:background="@drawable/toggle_selector"
+        android:text=""
+        android:textOff=""
+        android:textOn=""/>
+    </RelativeLayout>
 
   </RelativeLayout>
 

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

@@ -20,6 +20,7 @@
       android:layout_marginStart="0dp"
       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"
@@ -43,6 +44,7 @@
       android:layout_height="wrap_content"
       android:layout_marginTop="11dp"
       android:layout_marginBottom="11dp"
+      android:padding="25dp"
       android:paddingLeft="20dp"
       android:paddingTop="20dp"
       android:paddingBottom="20dp"
@@ -58,6 +60,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:visibility="gone"
+    tools:visibility="visible"
     >
 
     <TextView
@@ -65,8 +68,8 @@
       android:layout_height="wrap_content"
       android:layout_alignParentStart="true"
       android:layout_alignParentTop="true"
-      android:layout_marginStart="0dp"
       android:lineSpacingExtra="3sp"
+      android:paddingLeft="25dp"
       android:text="내 추천인 코드 공유"
       android:textColor="@color/C999999"
       android:textSize="12sp"/>
@@ -77,6 +80,7 @@
       android:layout_alignParentTop="true"
       android:layout_alignParentEnd="true"
       android:lineSpacingExtra="3sp"
+      android:paddingRight="25dp"
       android:text="D4KDFJ1F"
       android:textColor="@color/C666666"
       android:textSize="12sp"/>
@@ -89,6 +93,7 @@
       android:layout_marginTop="40dp"
       android:layout_marginBottom="28dp"
       android:lineSpacingExtra="3sp"
+      android:paddingLeft="25dp"
       android:text=" 스페셜/추천인 코드 등록"
       android:textColor="@color/C999999"
       android:textSize="12sp"/>

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

@@ -17,6 +17,7 @@
       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"
@@ -38,9 +39,10 @@
       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"
-      android:paddingLeft="20dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="parent"
@@ -53,6 +55,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:visibility="gone"
+    tools:visibility="visible"
     >
 
     <RelativeLayout
@@ -63,21 +66,27 @@
         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"/>
 
-      <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_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
@@ -92,20 +101,27 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:lineSpacingExtra="4sp"
+        android:paddingLeft="25dp"
         android:text="PUSH 마케팅 수신 설정"
         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
+        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
@@ -121,19 +137,27 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:lineSpacingExtra="4sp"
+        android:paddingLeft="25dp"
         android:text="위치기반서비스 이용 설정"
         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
+        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>
 
 

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

@@ -19,6 +19,7 @@
       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"
@@ -44,6 +45,7 @@
       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"
@@ -57,6 +59,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:visibility="gone"
+    tools:visibility="visible"
     >
 
     <TextView
@@ -65,6 +68,7 @@
       android:layout_alignParentStart="true"
       android:layout_alignParentTop="true"
       android:lineSpacingExtra="4sp"
+      android:paddingLeft="25dp"
       android:text="이용 약관"
       android:textColor="@color/C999999"
       android:textSize="12sp"/>
@@ -77,6 +81,7 @@
       android:layout_marginTop="30dp"
       android:layout_marginBottom="28dp"
       android:lineSpacingExtra="4sp"
+      android:paddingLeft="25dp"
       android:text="이용안내"
       android:textColor="@color/C999999"
       android:textSize="12sp"/>