浏览代码

[설정][Common] 설정 요청사항 반영 수정

Hasemi 7 年之前
父节点
当前提交
87a11125fb

+ 9 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/AgreeInformationViewHolder.java

@@ -56,8 +56,16 @@ public class AgreeInformationViewHolder extends SettingViewHolder {
     textViewMenuText.setOnClickListener(v -> onClickHolder());
   }
 
-  protected void onClickHolderInternal() {
+  @Override
+  protected void openHolderInternal() {
     customLayout.setVisibility(customLayout.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
     imageViewAccordion.setImageResource(customLayout.getVisibility() == View.GONE ? R.drawable.icon_arcordion_open_arrow : R.drawable.icon_arcordion_close_arrow);
+
+  }
+
+  @Override
+  protected void closeHolderInternal() {
+    customLayout.setVisibility(View.GONE);
+    imageViewAccordion.setImageResource(R.drawable.icon_arcordion_open_arrow);
   }
 }

+ 9 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/CodeManageViewHolder.java

@@ -70,8 +70,16 @@ public class CodeManageViewHolder extends SettingViewHolder {
     imageViewAccordion.setOnClickListener(view -> onClickHolder());
   }
 
-  protected void onClickHolderInternal() {
+  @Override
+  protected void openHolderInternal() {
     customLayout.setVisibility(customLayout.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
     imageViewAccordion.setImageResource(customLayout.getVisibility() == View.GONE ? R.drawable.icon_arcordion_open_arrow : R.drawable.icon_arcordion_close_arrow);
+
+  }
+
+  @Override
+  protected void closeHolderInternal() {
+    customLayout.setVisibility(View.GONE);
+    imageViewAccordion.setImageResource(R.drawable.icon_arcordion_open_arrow);
   }
 }

+ 9 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/CommonSettingViewHolder.java

@@ -85,9 +85,17 @@ public class CommonSettingViewHolder extends SettingViewHolder {
     });
   }
 
-  protected void onClickHolderInternal() {
+  @Override
+  protected void openHolderInternal() {
     customLayout.setVisibility(customLayout.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
     imageViewAccordion.setImageResource(customLayout.getVisibility() == View.GONE ? R.drawable.icon_arcordion_open_arrow : R.drawable.icon_arcordion_close_arrow);
+  }
 
+  @Override
+  protected void closeHolderInternal() {
+    customLayout.setVisibility(View.GONE);
+    imageViewAccordion.setImageResource(R.drawable.icon_arcordion_open_arrow);
   }
+
+
 }

+ 8 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/PushAndLocationSettingViewHolder.java

@@ -74,8 +74,15 @@ public class PushAndLocationSettingViewHolder extends SettingViewHolder {
     imageViewAccordion.setOnClickListener(v -> onClickHolder());
   }
 
-  protected void onClickHolderInternal() {
+  @Override
+  protected void openHolderInternal() {
     customLayout.setVisibility(customLayout.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
     imageViewAccordion.setImageResource(customLayout.getVisibility() == View.GONE ? R.drawable.icon_arcordion_open_arrow : R.drawable.icon_arcordion_close_arrow);
   }
+
+  @Override
+  protected void closeHolderInternal() {
+    customLayout.setVisibility(View.GONE);
+    imageViewAccordion.setImageResource(R.drawable.icon_arcordion_open_arrow);
+  }
 }

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

@@ -88,7 +88,7 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
 
   @Override
   protected void stopInternal() {
-    isEnabled = false;
+    //isEnabled = false;
   }
 
   @Override

+ 5 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/SettingViewHolder.java

@@ -57,7 +57,9 @@ public abstract class SettingViewHolder extends RecyclerView.ViewHolder {
 
   public void click(int index) {
     if (index == getAdapterPosition()) {
-      onClickHolderInternal();
+      openHolderInternal();
+    }else{
+      closeHolderInternal();
     }
   }
 
@@ -74,5 +76,6 @@ public abstract class SettingViewHolder extends RecyclerView.ViewHolder {
 
   protected abstract void bindInternal();
 
-  protected abstract void onClickHolderInternal();
+  protected abstract void openHolderInternal();
+  protected abstract void closeHolderInternal();
 }

+ 2 - 2
app/src/main/res/layout/setting_custom_menu1.xml

@@ -45,7 +45,7 @@
       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"/>
+      app:srcCompat="@drawable/icon_arcordion_close_arrow"/>
   </android.support.constraint.ConstraintLayout>
 
   <android.support.constraint.ConstraintLayout
@@ -54,7 +54,7 @@
     android:layout_height="wrap_content"
     android:paddingTop="55dp"
     android:paddingBottom="18dp"
-    android:visibility="gone"
+    android:visibility="visible"
     tools:visibility="visible"
     >