[설정][Common] 설정 기획 이슈 반영함

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

@@ -49,8 +49,8 @@ public class AgreeInformationViewHolder extends SettingViewHolder {
 
   @Override
   protected void bindInternal() {
-    imageViewAccordion.setOnClickListener(v -> onClickHolder());
-    textViewMenuText.setOnClickListener(v -> onClickHolder());
+    touchLayout.setOnClickListener(v -> onClickHolder());
+    //textViewMenuText.setOnClickListener(v -> onClickHolder());
   }
 
   @Override

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

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.setting;
 
+import android.support.constraint.ConstraintLayout;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -22,6 +23,7 @@ import kr.co.zumo.app.lifeplus.view.Event;
  */
 public class CodeManageViewHolder extends SettingViewHolder {
 
+  private ConstraintLayout layoutFirst;
   private TextView textViewMenuText;
   private ViewGroup customLayout;
   private ImageView imageViewAccordion;
@@ -63,8 +65,8 @@ public class CodeManageViewHolder extends SettingViewHolder {
     String code = settingHolderBean.getMyRecommendCode();
 
     textViewRecommend.setText(StringUtil.isEmpty(code) ? "" : StringUtil.fromHtml(StringUtil.underline(code)));
-    textViewMenuText.setOnClickListener(view -> onClickHolder());
-    imageViewAccordion.setOnClickListener(view -> onClickHolder());
+    touchLayout.setOnClickListener(view -> onClickHolder());
+    //imageViewAccordion.setOnClickListener(view -> onClickHolder());
   }
 
   @Override

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

@@ -65,13 +65,13 @@ public class CommonSettingViewHolder extends SettingViewHolder {
   protected void bindInternal() {
     render();
 
-    textViewMenuText.setOnClickListener(view -> {
+    touchLayout.setOnClickListener(view -> {
       onClickHolder();
     });
 
-    imageViewAccordion.setOnClickListener(view -> {
-      onClickHolder();
-    });
+//    imageViewAccordion.setOnClickListener(view -> {
+//      onClickHolder();
+//    });
   }
 
   @Override

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

@@ -72,8 +72,8 @@ public class PushAndLocationSettingViewHolder extends SettingViewHolder {
   protected void bindInternal() {
     update(settingHolderBean);
 
-    textViewMenuText.setOnClickListener(v -> onClickHolder());
-    imageViewAccordion.setOnClickListener(v -> onClickHolder());
+    touchLayout.setOnClickListener(v -> onClickHolder());
+    //imageViewAccordion.setOnClickListener(v -> onClickHolder());
   }
 
   @Override

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

@@ -298,7 +298,13 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
           );
         }
         else if (index == SettingViewHolder.SWITCH_LOCATION) {
-          {} // 위치
+          // 위치
+          //위치 동의 했을때만 동의 팝업 띄운다
+          if (bool) {
+            showCustomToast(
+              ResourceUtil.getString(R.string.setting_menu3_location_agree_message),
+              ResourceUtil.getString(R.string.empty_string), 0, Toast.LENGTH_SHORT);
+          }
         }
         break;
       case Event.ERROR:

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

@@ -3,9 +3,11 @@
  */
 package kr.co.zumo.app.lifeplus.view.screen.setting;
 
+import android.support.constraint.ConstraintLayout;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.SettingHolderBean;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
@@ -39,9 +41,11 @@ public abstract class SettingViewHolder extends RecyclerView.ViewHolder {
 
   protected IEventListener listener;
   protected SettingHolderBean settingHolderBean;
+  protected ConstraintLayout touchLayout;
 
   public SettingViewHolder(View itemView) {
     super(itemView);
+    touchLayout = itemView.findViewById(R.id.layout_first);
   }
 
   public final void bind(SettingHolderBean settingHolderBean, IEventListener listener) {

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

@@ -228,7 +228,7 @@ public class SettingMemberInfoFragment extends FragmentBase<SettingMemberInfoPre
     ViewGroup container = findViewById(R.id.layout_agree_container);
 
     CheckBox checkBoxAll = findViewById(R.id.agree_check_all);
-
+    checkBoxAll.setVisibility(list.size() > 1 ? View.VISIBLE : View.GONE);
     checkBoxAll.setButtonDrawable(getStateListDrawable());
 
     checkBoxAllDriver = new CheckBoxAllDriver(checkBoxAll);

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

@@ -10,8 +10,10 @@
   android:minHeight="70dp">
 
   <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_first"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
     android:minHeight="70dp"
     >
 
@@ -29,7 +31,6 @@
       android:id="@+id/text_view_setting_menu_text"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:background="?android:attr/selectableItemBackground"
       android:padding="9dp"
       android:text="@string/setting_menu1"
       android:textColor="@color/C000000"
@@ -42,7 +43,6 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginEnd="9dp"
-      android:background="?android:attr/selectableItemBackground"
       android:padding="20dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_view_setting_menu_text"
       app:layout_constraintEnd_toEndOf="parent"

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

@@ -9,7 +9,8 @@
   android:background="@color/CFFFFFF">
 
   <android.support.constraint.ConstraintLayout
-    android:id="@+id/layout_menu1"
+    android:id="@+id/layout_first"
+    android:background="?android:attr/selectableItemBackground"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="70dp">
@@ -28,7 +29,6 @@
       android:id="@+id/text_view_setting_menu_text"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:background="?android:attr/selectableItemBackground"
       android:padding="9dp"
       android:text="@string/setting_menu2"
       android:textColor="@color/C000000"
@@ -41,7 +41,6 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginEnd="9dp"
-      android:background="?android:attr/selectableItemBackground"
       android:padding="20dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_view_setting_menu_text"
       app:layout_constraintEnd_toEndOf="parent"

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

@@ -10,9 +10,10 @@
   android:minHeight="70dp">
 
   <android.support.constraint.ConstraintLayout
-    android:id="@+id/layout_menu1"
+    android:id="@+id/layout_first"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
     android:minHeight="70dp">
 
     <ImageView
@@ -29,7 +30,6 @@
       android:id="@+id/text_view_setting_menu_text"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:background="?android:attr/selectableItemBackground"
       android:padding="9dp"
       android:text="@string/setting_menu3"
       android:textColor="@color/C000000"
@@ -42,7 +42,6 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginEnd="9dp"
-      android:background="?android:attr/selectableItemBackground"
       android:padding="20dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_view_setting_menu_text"
       app:layout_constraintEnd_toEndOf="parent"

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

@@ -10,9 +10,10 @@
   android:minHeight="70dp">
 
   <android.support.constraint.ConstraintLayout
-    android:id="@+id/layout_menu1"
+    android:id="@+id/layout_first"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
     android:minHeight="70dp">
 
     <ImageView
@@ -29,7 +30,6 @@
       android:id="@+id/text_view_setting_menu_text"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:background="?android:attr/selectableItemBackground"
       android:padding="9dp"
       android:text="@string/setting_menu4"
       android:textColor="@color/C000000"
@@ -42,7 +42,6 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginEnd="9dp"
-      android:background="?android:attr/selectableItemBackground"
       android:padding="20dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_view_setting_menu_text"
       app:layout_constraintEnd_toEndOf="parent"
@@ -69,20 +68,23 @@
 
     <TextView
       android:id="@+id/text_info_policy"
-      android:layout_width="wrap_content"
+      android:layout_width="0dp"
       android:layout_height="wrap_content"
+      android:layout_marginEnd="15dp"
       android:background="?android:attr/selectableItemBackground"
       android:padding="10dp"
       android:text="@string/access_terms"
       android:textColor="@color/C999999"
       android:textSize="12sp"
+      app:layout_constrainedWidth="true"
+      app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintHorizontal_chainStyle="spread_inside"
       app:layout_constraintStart_toStartOf="@+id/guide_start"/>
 
 
     <TextView
       android:id="@+id/text_info_usage"
-      android:layout_width="wrap_content"
+      android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_marginTop="2dp"
       android:background="?android:attr/selectableItemBackground"
@@ -90,6 +92,8 @@
       android:text="@string/inquiry"
       android:textColor="@color/C999999"
       android:textSize="12sp"
+      app:layout_constrainedWidth="true"
+      app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintHorizontal_chainStyle="spread_inside"
       app:layout_constraintStart_toStartOf="@+id/guide_start"
       app:layout_constraintTop_toBottomOf="@+id/text_info_policy"/>
@@ -98,6 +102,7 @@
       android:id="@+id/guide_end"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:layout_marginEnd="15dp"
       android:orientation="vertical"
       app:layout_constraintGuide_end="15dp"/>
 

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

@@ -282,6 +282,7 @@
   <string name="setting_menu3_event_agree_message">이벤트 혜택 수신동의 처리되었습니다.\n(%s)</string>
   <string name="setting_menu3_event_disagree">이벤트 혜택 수신거부</string>
   <string name="setting_menu3_event_disagree_message">이벤트 혜택 수신거부 처리되었습니다.\n(%s)</string>
+  <string name="setting_menu3_location_agree_message">위치기반 서비스 이용을 동의하셨습니다.\n(%s)</string>
   <string name="setting_menu4">약관/1:1 문의</string>
   <string name="setting_terms">약관보기</string>
   <string name="setting_terms_detail">약관상세</string>
@@ -409,7 +410,7 @@
   <!--<string name="my_faq_nothing_comment">문의하신 내용이 없습니다</string>-->
   <string name="my_faq_device_information_header">"단말정보: "</string>
   <string name="my_faq_device_information">어플리케이션 버전 %1$s /기기모델 %2$s /OS버전 %3$s</string>
-  <string name="my_faq_notice1">문의하신 내용의 답변은 회원정보에 등록하신 이메일 및 이용\n안내/문의에서 확인가능합니다.</string>
+  <string name="my_faq_notice1">문의하신 내용의 답변은 회원가입 이메일 및 설정>1:1문의에서\n확인가능합니다.</string>
   <string name="my_faq_notice2">접수 순서대로 답변해 드리며, 문의가 많을 경우 답변이\n지연될 수 있습니다.</string>
   <string name="my_faq_write_character">/ 2,000</string>
   <string name="my_faq_push_setting">문의 답변 알림 받기</string>