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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/ISettingView.java

@@ -41,5 +41,5 @@ public interface ISettingView extends IView {
 
   void setGuestUi(boolean isGuest);
 
-  void drawList();
+  void drawList(int holderIndex);
 }

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

@@ -27,6 +27,7 @@ import kr.co.zumo.app.lifeplus.view.IEventListener;
  */
 public class SettingExpandableListViewAdapter extends RecyclerView.Adapter<SettingViewHolder> {
 
+  private int holderIndex;
   private Context context;
   private IEventListener listener;
   private RecyclerView recyclerView;
@@ -34,12 +35,13 @@ public class SettingExpandableListViewAdapter extends RecyclerView.Adapter<Setti
   private int itemCount;
   private SettingHolderBean settingHolderBean;
 
-  public SettingExpandableListViewAdapter(Context context, SettingHolderBean settingHolderBean, IEventListener listener, int itemCount) {
+  public SettingExpandableListViewAdapter(Context context, SettingHolderBean settingHolderBean, IEventListener listener, int itemCount, int holderIndex) {
     this.context = context;
     this.listener = listener;
     this.itemCount = itemCount;
     this.settingHolderBean = settingHolderBean;
     holders = new ArrayList<>();
+    this.holderIndex = holderIndex;
   }
 
   @Override
@@ -91,6 +93,7 @@ public class SettingExpandableListViewAdapter extends RecyclerView.Adapter<Setti
     });
 
     holders.add(holder);
+    click(holderIndex);
 
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/SettingFragment.java

@@ -38,6 +38,7 @@ public class SettingFragment extends FragmentBase<SettingPresenter> implements I
   private TextView textUpdate;
   private SettingExpandableListViewAdapter adapter;
   private SettingHolderBean settingHolderBean;
+  private LinearLayoutManager layoutManager;
 
 
   @Nullable
@@ -59,6 +60,7 @@ public class SettingFragment extends FragmentBase<SettingPresenter> implements I
     textUpdate.setOnClickListener(v -> {
       presenter.onEvent(new Event.Builder(Event.CLICK).integer(SettingPresenter.SETTING_UPDATE).build());
     });
+    layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false);
 
   }
 
@@ -150,13 +152,12 @@ public class SettingFragment extends FragmentBase<SettingPresenter> implements I
   }
 
   @Override
-  public void drawList() {
-
+  public void drawList(int holderIndex) {
     adapter = new SettingExpandableListViewAdapter(getActivity(), settingHolderBean, event -> {
       presenter.onEvent(event);
-    }, settingHolderBean.isMember() ? 4 : 2);
+    }, settingHolderBean.isMember() ? 4 : 2, holderIndex);
 
-    settingRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+    settingRecyclerView.setLayoutManager(layoutManager);
     SettingExpandableListViewDecoration decoration = new SettingExpandableListViewDecoration(getActivity(), ResourceUtil.getColor(R.color.CEBEBEB), 1);
     settingRecyclerView.addItemDecoration(decoration);
     settingRecyclerView.setAdapter(adapter);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/SettingModel.java

@@ -38,6 +38,7 @@ public class SettingModel extends Model {
   private Disposable disposableMarketing;
   private Disposable disposableLocation;
   private SettingMemberBean settingMemberBean;
+  private int holderIndex = 0;
 
   @Override
   protected void createViewInternal() {
@@ -90,6 +91,14 @@ public class SettingModel extends Model {
     }
   }
 
+  public void setHolderIndex(int holderIndex) {
+    this.holderIndex = holderIndex;
+  }
+
+  public int getHolderIndex() {
+    return holderIndex;
+  }
+
   /**
    * 추천인 이름
    * - 코드 등록 토스트에 사용

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

@@ -156,6 +156,7 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
     switch (event.getEventId()) {
       case Event.TOGGLE:
         view.click(holderIndex);
+        model.setHolderIndex(holderIndex);
         break;
       case Event.SWITCH:
         if (holderIndex == SettingPresenter.SETTING_COMMON) {
@@ -422,7 +423,7 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
       view.setGuestUi(true);
     }
 
-    view.drawList();
+    view.drawList(model.getHolderIndex());
 
     // version
     // 현재 버전과 비교해서 처리

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

@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item
+    android:state_enabled="false">
+    <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
+      <item android:bottom="36dp"
+            android:left="-2dp"
+            android:right="-2dp"
+            android:top="-2dp">
+        <shape android:shape="rectangle">
+          <stroke
+            android:width="1dp"
+            android:color="#e5e5e5"/>
+        </shape>
+      </item>
+    </layer-list>
+  </item>
   <item
     android:state_focused="true">
     <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
@@ -34,7 +49,7 @@
             android:color="#e5e5e5"/>
         </shape>
       </item>
-
     </layer-list>
   </item>
+
 </selector>

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

@@ -1,22 +1,22 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="20dp"
+        android:height="20dp"
         android:viewportWidth="54"
         android:viewportHeight="54">
   <group
     android:pivotX="27"
     android:pivotY="27"
-    android:scaleX="0.58"
-    android:scaleY="0.58">
-  <path
-    android:fillColor="#E5E5E5"
-    android:fillType="evenOdd"
-    android:pathData="M27,27m-27,0a27,27 0,1 1,54 0a27,27 0,1 1,-54 0"/>
-  <path
-    android:fillColor="#00000000"
-    android:fillType="evenOdd"
-    android:pathData="M17,16l20,22M16,37l22,-20"
-    android:strokeWidth="4"
-    android:strokeColor="#FAFAFA"/>
+    android:scaleX="0.7"
+    android:scaleY="0.7">
+    <path
+      android:fillColor="#E5E5E5"
+      android:fillType="evenOdd"
+      android:pathData="M27,27m-27,0a27,27 0,1 1,54 0a27,27 0,1 1,-54 0"/>
+    <path
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:pathData="M17,16l20,22M16,37l22,-20"
+      android:strokeWidth="4"
+      android:strokeColor="#FAFAFA"/>
   </group>
 </vector>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_enabled="true" android:color="@color/C000000"/>
+  <item android:state_enabled="false" android:color="@color/C999999"/>
+  <item android:color="@color/C999999"/>
+</selector>

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

@@ -107,6 +107,7 @@
         android:maxLines="1"
         android:paddingStart="5dp"
         android:paddingBottom="35dp"
+        android:textColor="@drawable/recommend_text_selector"
         android:textColorHint="@color/CC5C5C5"
         android:textSize="14sp"
         app:layout_constraintEnd_toStartOf="@+id/view2"
@@ -139,6 +140,7 @@
         android:maxLines="1"
         android:paddingStart="5dp"
         android:paddingBottom="35dp"
+        android:textColor="@drawable/recommend_text_selector"
         android:textColorHint="@color/CC5C5C5"
         android:textSize="14sp"
         app:layout_constraintEnd_toStartOf="@+id/view"
@@ -171,6 +173,7 @@
         android:maxLines="1"
         android:paddingStart="5dp"
         android:paddingBottom="35dp"
+        android:textColor="@drawable/recommend_text_selector"
         android:textColorHint="@color/CC5C5C5"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -185,7 +188,7 @@
         android:lineSpacingExtra="3.5sp"
         android:text="@string/special_code_input"
         android:textColor="@color/C666666"
-        android:textSize="10.5sp"
+        android:textSize="11sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -198,7 +201,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="23dp"
-      android:lineSpacingExtra="3.5sp"
+      android:lineSpacingExtra="4sp"
       android:text="@string/recommend_code"
       android:textColor="@color/C999999"
       android:textSize="12sp"
@@ -219,6 +222,7 @@
       android:maxLines="1"
       android:paddingStart="5dp"
       android:paddingBottom="35dp"
+      android:textColor="@drawable/recommend_text_selector"
       android:textColorHint="@color/CC5C5C5"
       android:textSize="14sp"
       app:layout_constraintTop_toBottomOf="@+id/textView7"/>
@@ -229,10 +233,10 @@
       android:layout_height="wrap_content"
       android:layout_marginTop="54dp"
       android:layout_marginBottom="8dp"
-      android:lineSpacingExtra="3.5sp"
+      android:lineSpacingExtra="4sp"
       android:text="@string/recommend_code_input"
       android:textColor="@color/C666666"
-      android:textSize="10.5sp"
+      android:textSize="11sp"
       app:layout_constraintBottom_toTopOf="@+id/button_registering"
       app:layout_constraintStart_toStartOf="@+id/edit_recommend_code"
       app:layout_constraintTop_toBottomOf="@+id/textView7"
@@ -245,9 +249,9 @@
       android:layout_height="42dp"
       android:layout_marginTop="35dp"
       android:background="@drawable/button_black_background"
-      android:lineSpacingExtra="5.5sp"
+      android:lineSpacingExtra="6sp"
       android:text="@string/registration"
-      android:textColor="#ffffff"
+      android:textColor="@color/CFFFFFF"
       android:textSize="15sp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/text_recommend_validation"/>