[설정][Common] 설정화면 추가 중

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

@@ -3,13 +3,11 @@ package kr.co.zumo.app.lifeplus.activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 
-import java.util.ArrayList;
-
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.bean.TextImageBean;
 import kr.co.zumo.app.lifeplus.view.fragment.setting.SettingExpandableListViewAdapter;
 
 /**
@@ -25,27 +23,16 @@ import kr.co.zumo.app.lifeplus.view.fragment.setting.SettingExpandableListViewAd
 public class SettingActivity extends AppCompatActivity {
 
   private RecyclerView settingRecyclerView;
-  private ArrayList<TextImageBean> settingMenuList;
 
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_setting);
     settingRecyclerView = (RecyclerView) findViewById(R.id.recycler_view_setting);
-    //doSettingData();
-    //SettingExpandableListViewAdapter adapter = new SettingExpandableListViewAdapter(settingMenuList);
     SettingExpandableListViewAdapter adapter = new SettingExpandableListViewAdapter(this);
     settingRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext(), LinearLayoutManager.VERTICAL, false));
+    settingRecyclerView.addItemDecoration(new DividerItemDecoration(getApplicationContext(),DividerItemDecoration.VERTICAL ));
     settingRecyclerView.setAdapter(adapter);
   }
 
-
-/*  public void doSettingData() {
-    settingMenuList = new ArrayList<>();
-    settingMenuList.add(new TextImageBean(R.drawable.icon_setting, R.string.setting_menu1));
-    settingMenuList.add(new TextImageBean(R.drawable.icon_code, R.string.setting_menu2));
-    settingMenuList.add(new TextImageBean(R.drawable.icon_location2, R.string.setting_menu3));
-    settingMenuList.add(new TextImageBean(R.drawable.icon_info, R.string.setting_menu4));
-
-  }*/
 }

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

@@ -7,6 +7,6 @@
 <android.support.v7.widget.RecyclerView
   android:id="@+id/recycler_view_setting"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
-</android.support.v7.widget.RecyclerView>
+  android:layout_height="match_parent"
+  />
 </LinearLayout>

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

@@ -29,7 +29,7 @@
       android:layout_height="wrap_content"
       android:layout_marginStart="8dp"
       android:layout_marginTop="23dp"
-      android:layout_marginBottom="27dp"
+      android:layout_marginBottom="22dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toEndOf="@+id/image_view_setting_menu_icon"
       app:layout_constraintTop_toTopOf="parent"
@@ -62,7 +62,10 @@
       android:layout_alignParentStart="true"
       android:layout_alignParentTop="true"
       android:layout_marginStart="24dp"
-      android:text="김한화"/>
+      android:textSize="12sp"
+      android:textColor="@color/C999999"
+      android:lineSpacingExtra="3sp"
+      android:text="내 추천인 코드 공유"/>
 
     <TextView
       android:layout_width="wrap_content"
@@ -70,7 +73,10 @@
       android:layout_alignParentTop="true"
       android:layout_alignParentEnd="true"
       android:layout_marginEnd="27dp"
-      android:text="회원확인"/>
+      android:textSize="12sp"
+      android:textColor="@color/C666666"
+      android:lineSpacingExtra="3sp"
+      android:text="D4KDFJ1F"/>
 
     <TextView
       android:layout_width="wrap_content"
@@ -79,15 +85,12 @@
       android:layout_alignParentTop="true"
       android:layout_marginStart="22dp"
       android:layout_marginTop="40dp"
-      android:text="자동 간편암호 잠금해제"/>
+      android:layout_marginBottom="28dp"
+      android:textSize="12sp"
+      android:textColor="@color/C999999"
+      android:lineSpacingExtra="3sp"
+      android:text=" 스페셜/추천인 코드 등록"/>
 
-    <Switch
-      android:id="@+id/switch1"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentEnd="true"
-      android:layout_marginTop="30dp"
-      android:layout_marginEnd="39dp"/>
   </com.github.aakira.expandablelayout.ExpandableRelativeLayout>
 
 </LinearLayout>

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

@@ -56,21 +56,38 @@
     app:ael_expanded="false"
     >
 
+
     <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentStart="true"
       android:layout_alignParentTop="true"
-      android:layout_marginStart="24dp"
-      android:text="김한화"/>
+      android:layout_marginStart="22dp"
+      android:layout_marginTop="23dp"
+      android:text="PUSH  수신 설정"/>
+
+    <Switch
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentEnd="true"
+      android:layout_marginTop="23dp"
+      android:layout_marginEnd="39dp"/>
 
     <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:layout_alignParentStart="true"
       android:layout_alignParentTop="true"
+      android:layout_marginStart="22dp"
+      android:layout_marginTop="64dp"
+      android:text="PUSH 마케팅 수신 설정"/>
+
+    <Switch
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
       android:layout_alignParentEnd="true"
-      android:layout_marginEnd="27dp"
-      android:text="회원확인"/>
+      android:layout_marginTop="64dp"
+      android:layout_marginEnd="39dp"/>
 
     <TextView
       android:layout_width="wrap_content"
@@ -78,16 +95,17 @@
       android:layout_alignParentStart="true"
       android:layout_alignParentTop="true"
       android:layout_marginStart="22dp"
-      android:layout_marginTop="40dp"
-      android:text="자동 간편암호 잠금해제"/>
+      android:layout_marginTop="104dp"
+      android:text="위치기반서비스 이용 설정"/>
 
     <Switch
       android:id="@+id/switch1"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentEnd="true"
-      android:layout_marginTop="30dp"
+      android:layout_marginTop="104dp"
       android:layout_marginEnd="39dp"/>
+
   </com.github.aakira.expandablelayout.ExpandableRelativeLayout>
 
 </LinearLayout>

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

@@ -62,32 +62,18 @@
       android:layout_alignParentStart="true"
       android:layout_alignParentTop="true"
       android:layout_marginStart="24dp"
-      android:text="김한화"/>
-
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentTop="true"
-      android:layout_alignParentEnd="true"
-      android:layout_marginEnd="27dp"
-      android:text="회원확인"/>
+      android:text="이용 약관"/>
 
     <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentStart="true"
       android:layout_alignParentTop="true"
-      android:layout_marginStart="22dp"
-      android:layout_marginTop="40dp"
-      android:text="자동 간편암호 잠금해제"/>
-
-    <Switch
-      android:id="@+id/switch1"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentEnd="true"
       android:layout_marginTop="30dp"
-      android:layout_marginEnd="39dp"/>
+      android:layout_marginStart="24dp"
+      android:text="이용안내"/>
+
+
   </com.github.aakira.expandablelayout.ExpandableRelativeLayout>
 
 </LinearLayout>