[공통][Common] 공통얼랏 정의 수정

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/ConfirmDialog.java

@@ -59,24 +59,15 @@ public class ConfirmDialog extends TextDialog {
       .setPositiveButton(positiveButtonLabel, new DialogInterface.OnClickListener() {
         public void onClick(DialogInterface dialog, int id) {
           if (null != getCustomListener()) {
-            if (positiveButtonLabel == R.string.go_execute) {
-              getCustomListener().onDialogCanceled(ConfirmDialog.this);
-            }
-            else {
-              getCustomListener().onDialogResult(ConfirmDialog.this, new Event.Builder(Event.CONFIRM).build());
-            }
+            getCustomListener().onDialogResult(ConfirmDialog.this, new Event.Builder(Event.CONFIRM).build());
+
           }
         }
       })
       .setNegativeButton(negativeButtonLabel, new DialogInterface.OnClickListener() {
         public void onClick(DialogInterface dialog, int id) {
           if (null != getCustomListener()) {
-            if (negativeButtonLabel == R.string.back) {
-              getCustomListener().onDialogResult(ConfirmDialog.this, new Event.Builder(Event.CONFIRM).build());
-            }
-            else {
-              getCustomListener().onDialogCanceled(ConfirmDialog.this);
-            }
+            getCustomListener().onDialogCanceled(ConfirmDialog.this);
           }
         }
       });

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsDetailListicleDetailViewHolder.java

@@ -37,7 +37,7 @@ public class ContentsDetailListicleDetailViewHolder extends ContentsDetailView {
   @Override
   public void bind() {
     List<TextImageBean> textImageBeans = new ArrayList<>();
-    textImageBeans.add(new TextImageBean(R.drawable.img_banner_mycoin, R.string.life_plus));
+    textImageBeans.add(new TextImageBean(R.drawable.img_bestbucket_banner_1, R.string.life_plus));
     customListicleImageView.init(itemView.getContext(), textImageBeans, new IEventListener() {
       @Override
       public void onEvent(Event event) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/factory/BasicFragmentFactory.java

@@ -13,6 +13,7 @@ import kr.co.zumo.app.lifeplus.view.screen.category.type2.SecondCategoryMainFrag
 import kr.co.zumo.app.lifeplus.view.screen.category.type3.ThirdCategoryMainFragment;
 import kr.co.zumo.app.lifeplus.view.screen.category.type4.FourthCategoryMainFragment;
 import kr.co.zumo.app.lifeplus.view.screen.category.type5.FifthCategoryMainFragment;
+import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsDetailFragment;
 import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsFragment;
 import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsOverviewFragment;
 import kr.co.zumo.app.lifeplus.view.screen.couponmall.CouponMallFragment;
@@ -278,7 +279,7 @@ public class BasicFragmentFactory extends FragmentFactory {
         fragment = new ContentsFragment();
         break;
       case ScreenID.CONTENTS_NATIVE:
-        fragment = new ContentsFragment(); //new ContentsDetailFragment();
+        fragment = new ContentsDetailFragment();
         break;
       case ScreenID.OVER_VIEW:
         fragment = new ContentsOverviewFragment();

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpAgreePresenter.java

@@ -73,6 +73,7 @@ public class SignUpAgreePresenter extends Presenter<SignUpAgreeModel, ISignUpAgr
   @Override
   protected void createViewInternal() {
   }
+
   @Override
   protected void destroyInternal() {
     model.stopPolicyRequest();
@@ -162,18 +163,16 @@ public class SignUpAgreePresenter extends Presenter<SignUpAgreeModel, ISignUpAgr
   public boolean onBackPressed() {
     new DialogBuilder<ConfirmDialog, ICustomDialogListener>(getFragmentManager(), DialogID.ALERT)
       .listener(new ICustomDialogListener<ConfirmDialog>() {
+
         @Override
         public void onDialogResult(ConfirmDialog dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            dialog.dispose();
+          dialog.dispose();
 
-            back(ScreenID.MAIN);
-          }
         }
 
         @Override
         public void onDialogCanceled(ConfirmDialog dialog) {
-          dialog.dispose();
+          back(ScreenID.MAIN);
         }
       })
       .attribute(dialog -> {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpMobileAuthPresenter.java

@@ -77,6 +77,7 @@ public class SignUpMobileAuthPresenter extends Presenter<SignUpMobileAuthModel,
   @Override
   protected void createViewInternal() {
   }
+
   @Override
   protected void destroyInternal() {
     if (null != disposable) {
@@ -137,16 +138,12 @@ public class SignUpMobileAuthPresenter extends Presenter<SignUpMobileAuthModel,
       .listener(new ICustomDialogListener<ConfirmDialog>() {
         @Override
         public void onDialogResult(ConfirmDialog dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            dialog.dispose();
-
-            back(ScreenID.MAIN);
-          }
+          dialog.dispose();
         }
 
         @Override
         public void onDialogCanceled(ConfirmDialog dialog) {
-          dialog.dispose();
+          back(ScreenID.MAIN);
         }
       })
       .attribute((IAttribute<ConfirmDialog>) dialog -> {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpPinPresenter.java

@@ -57,6 +57,7 @@ public class SignUpPinPresenter extends Presenter<SignUpPinModel, ISignUpView> {
   @Override
   protected void createViewInternal() {
   }
+
   @Override
   protected void destroyInternal() {
     if (null != disposable) {
@@ -80,16 +81,12 @@ public class SignUpPinPresenter extends Presenter<SignUpPinModel, ISignUpView> {
       .listener(new ICustomDialogListener<ConfirmDialog>() {
         @Override
         public void onDialogResult(ConfirmDialog dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            dialog.dispose();
-
-            back(ScreenID.MAIN);
-          }
+          dialog.dispose();
         }
 
         @Override
         public void onDialogCanceled(ConfirmDialog dialog) {
-          dialog.dispose();
+          back(ScreenID.MAIN);
         }
       })
       .attribute((IAttribute<ConfirmDialog>) dialog -> {