[공통][Common] 리스티클 표지 튜토리얼 및 앱리뷰 다이얼로그 수정

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

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.View;
-import android.view.Window;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -22,6 +21,7 @@ import kr.co.zumo.app.lifeplus.view.Event;
  */
 public class AppReviewDialog extends DialogBase<ICustomDialogListener<AppReviewDialog>> {
 
+
   @NonNull
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -32,6 +32,9 @@ public class AppReviewDialog extends DialogBase<ICustomDialogListener<AppReviewD
 
     builder.setView(view);
     Dialog dialog = builder.create();
+    dialog.setCancelable(false);
+    dialog.setCanceledOnTouchOutside(false);
+    this.setCancelable(false);
 
     // alert 의 기본 흰 배경 제거
     dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
@@ -39,14 +42,11 @@ public class AppReviewDialog extends DialogBase<ICustomDialogListener<AppReviewD
     return dialog;
   }
 
-  private void setupView(View view){
-    Window window = getDialog().getWindow();
-    window.setBackgroundDrawableResource(R.color.C99000000);
-
+  private void setupView(View view) {
     //다음기회에 클릭
     view.findViewById(R.id.text_view_next_time).setOnClickListener(view1 -> {
-      if(null!= getCustomListener()){
-        getCustomListener().onDialogCanceled(AppReviewDialog.this);
+      if (null != getCustomListener()) {
+        getCustomListener().onDialogResult(AppReviewDialog.this, new Event.Builder(Event.FAQ).build());
       }
 
     });

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

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
@@ -289,6 +290,14 @@ public class ContentsFragment extends FragmentBase<ContentsPresenter> implements
     LayoutInflater inflater = (LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     View view = inflater.inflate(R.layout.tutorial_listicle_cover, null);
     frameLayout.addView(view);
+
+    Handler delayHandler = new Handler();
+    delayHandler.postDelayed(new Runnable() {
+      @Override
+      public void run() {
+        frameLayout.removeView(view);
+      }
+    }, 2000);
   }
 
   @Override

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

@@ -86,7 +86,7 @@ public class ContentsListicleCoverHolder extends ContentsHolder<ContentsDetailBe
         @Override
         public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
           Visibler.visible(dim);
-          
+          listener.onEvent(new Event.Builder(Event.TUTORIAL).build());
           return false;
         }
       })
@@ -130,8 +130,6 @@ public class ContentsListicleCoverHolder extends ContentsHolder<ContentsDetailBe
       textViewCopyRight.setText(R.string.copy_right);
     }
 
-    imageViewArrow.setOnClickListener(view -> {listener.onEvent(new Event.Builder(Event.SCROLL).build());});
-
   }
 
   @Override

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

@@ -186,10 +186,7 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
         break;
       case Event.TUTORIAL:
         // TODO: 튜토리얼
-//        FrameLayout frameLayout = (FrameLayout) getActivity().getWindow().findViewById(android.R.id.content);
-//        LayoutInflater inflater = (LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-//        View view = inflater.inflate(R.layout.tutorial_listicle_cover, null);
-//        frameLayout.addView(view);
+        view.showTutorialListicle();
         break;
       case Event.LAST:
         if (false == model.hasSeries()) {
@@ -420,7 +417,7 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
     /**
      *  5회 이상 && 마지막 페이지
      */
-    int reviewCount = model.getCountForReview();
+    int reviewCount = 5;
     if (reviewCount >= 5 && reviewCount != LifeplusPreferences.REVIEW_COMPLETED && model.isLastPage()) {
 
       // 리뷰 한 것으로 표시
@@ -434,7 +431,10 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
               case Event.ADD:
                 view.goGooglePlay();
                 break;
-              default:
+              case Event.FAQ:
+                go(ScreenID.FAQ);
+                break;
+                default:
                 break;
             }
           }