[컨텐츠][New] 컨텐츠 웹 페이지 제거

app/src/main/AndroidManifest.xml

@@ -90,12 +90,6 @@
       android:windowSoftInputMode="adjustResize">
     </activity>
 
-    <activity
-      android:name=".lifeplus.activity.ContentsViaWebActivity"
-      android:screenOrientation="portrait"
-      android:windowSoftInputMode="adjustResize">
-    </activity>
-
     <activity
       android:name=".lifeplus.activity.SignUpActivity"
       android:screenOrientation="portrait"

app/src/main/java/kr/co/zumo/app/lifeplus/activity/ContentsViaWebActivity.java

@@ -1,57 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.activity;
-
-import android.content.Intent;
-
-import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
-import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
-import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-
-/**
- * ContentsActivity
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2018. 9. 5.]   [최초 작성]
- * @since 2018. 9. 5.
- */
-public class ContentsViaWebActivity extends ActivityBaseScreen {
-
-  @Override
-  protected void render() {
-
-    ActivityDeliveryHelper.getInstance().shipTo(getHelper(DeliveryHelper.class));
-
-//    ContentsDeliveryBean contentsDeliveryBean = ActivityDeliveryHelper.getInstance().getPackaging(ContentsDeliveryBean.class);
-//
-//    DeliveryHelper deliveryHelper = getHelper(DeliveryHelper.class);
-//    deliveryHelper.setPackaging(new ContentsDeliveryBean.Builder(contentsDeliveryBean.getContentsBean()).build());
-//
-//    ActivityDeliveryHelper.getInstance().clearPackaging();
-
-    // 첫 화면 표시
-    launchScreen(ScreenID.CONTENTS_VIA_WEB);
-  }
-
-  @Override
-  protected void onAfterNewIntent(Intent intent) {
-
-  }
-
-  @Override
-  protected void onAfterDestroy() {
-
-  }
-
-  @Override
-  protected void onBeforeDestroy() {
-
-  }
-
-}
-
-

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/ScreenID.java

@@ -90,7 +90,6 @@ public class ScreenID {
   public static final int ACTIVITY = 69;
   public static final int BUCKET_DETAIL = 70;
   public static final int SERIES = 71;
-  public static final int CONTENTS_VIA_WEB = 72;
   public static final int WEB_FROM_CONTENTS = 73;
   public static final int BUCKET_ACTIVITY = 74;
   public static final int MAP = 75;
@@ -109,7 +108,7 @@ public class ScreenID {
     LIFE_PLUS_INTRODUCTION, LIFE_PLUS_X, SETTING_MEMBER_INFO, MY_MAIN_GUEST, COUPON_MALL, ALL_MENU_GUEST, SETTING_MEMBER_QUIT_INFO, MY_FAQ, SETTING_MEMBER_QUIT_REQUEST,
     SETTING_MEMBER_QUIT_FINISH, SETTING_TERMS, SETTING_MEMBER_QUIT_FAIL, MAIN_PIN_UNLOCK, PIN_RESET_AUTH, PIN_RESET_INPUT, PIN_RESET_AUTH_FROM_SETTING,
     PIN_RESET_INPUT_FROM_SETTING, /*PIN_RESET_AUTH_FROM_ALREADY_MEMBER,*/ PIN_RESET_INPUT_FROM_ALREADY_MEMBER, CONTENTS, EVENT, PHONE_NUMBER_RESET, BUCKET_MY_EDIT, BUCKET_DETAIL,
-    NETWORK_ERROR_STARTING, OVER_VIEW, ACTIVITY, SERIES, CONTENTS_VIA_WEB, SIGN_UP_START_FROM_ZUMO_ON_BOARDING, WEB_FROM_CONTENTS, BUCKET_ACTIVITY, MAP, MY_EVENT, WINNER_ANNOUNCEMENT,
+    NETWORK_ERROR_STARTING, OVER_VIEW, ACTIVITY, SERIES, SIGN_UP_START_FROM_ZUMO_ON_BOARDING, WEB_FROM_CONTENTS, BUCKET_ACTIVITY, MAP, MY_EVENT, WINNER_ANNOUNCEMENT,
     EVENT_DETAIL, SEARCH,
   })
   public @interface ID {}

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/screen/ActivityScreen.java

@@ -11,7 +11,6 @@ import kr.co.zumo.app.lifeplus.activity.BucketListActivity;
 import kr.co.zumo.app.lifeplus.activity.CategoryActivity;
 import kr.co.zumo.app.lifeplus.activity.ContentsActivity;
 import kr.co.zumo.app.lifeplus.activity.ContentsOverviewActivity;
-import kr.co.zumo.app.lifeplus.activity.ContentsViaWebActivity;
 import kr.co.zumo.app.lifeplus.activity.CoopActivity;
 import kr.co.zumo.app.lifeplus.activity.EventActivity;
 import kr.co.zumo.app.lifeplus.activity.EventDetailActivity;
@@ -79,11 +78,6 @@ public class ActivityScreen extends Screen {
         shipToActivity();
         break;
 
-      case ScreenID.CONTENTS_VIA_WEB:
-        intent = new Intent(activity, ContentsViaWebActivity.class);
-        shipToActivity();
-        break;
-
       case ScreenID.NOTIFICATION:
         intent = new Intent(activity, NotiActivity.class);
         break;

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/screen/ScreenManager.java

@@ -79,9 +79,6 @@ public class ScreenManager implements IScreen {
         case ScreenID.CONTENTS:
           screen = new ActivityScreen(helper, id, direction, method);
           break;
-        case ScreenID.CONTENTS_VIA_WEB:
-          screen = new ActivityScreen(helper, id, direction, method);
-          break;
         case ScreenID.OVER_VIEW:
           screen = new ActivityScreen(helper, id, direction, method);
           break;

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

@@ -1,125 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.view.screen.contents;
-
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
-import kr.co.zumo.app.lifeplus.util.AppUtil;
-import kr.co.zumo.app.lifeplus.util.StringUtil;
-import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
-
-/**
- * ContentsWebFragment
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2018. 11. 6.]   [최초 작성]
- * @since 2018. 11. 6.
- */
-public class ContentsWebFragment extends FragmentBase<ContentsWebPresenter> implements IContentsBaseView {
-
-  private WebView webView;
-  private ActionBarHelper actionBarHelper;
-
-  @Override
-  protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.fragment_contents, container, false);
-  }
-
-  @Override
-  protected void onAfterActivityCreated(Bundle savedInstanceState) {
-
-  }
-
-  @Override
-  protected void defineActionBar(ActionBarHelper actionBarHelper) {
-    actionBarHelper.begin()
-      .back(actionBar -> presenter.onNavigationClickBack(actionBar))
-      .home(actionBar -> presenter.onNavigationClickHome(actionBar))
-      .bookmark(actionBar -> presenter.onNavigationClickBookmark(actionBar))
-      .like(actionBar -> presenter.onNavigationClickLike(actionBar))
-      .share(actionBar -> presenter.onNavigationClickShare(actionBar))
-      .white()
-      .transparent()
-      .dotDotDot(actionBar -> presenter.onNavigationClickDotDotDot(actionBar))
-      .show();
-    this.actionBarHelper = actionBarHelper;
-  }
-
-  @Override
-  protected ContentsWebPresenter definePresenter() {
-    return new ContentsWebPresenter(getModel(ContentsWebModel.class), this);
-  }
-
-  @Override
-  protected void onAfterDestroyView() {
-
-  }
-
-  @Override
-  protected void onAfterDestroy() {
-
-  }
-
-  @Override
-  protected boolean isSkipScreenWhenBack() {
-    return false;
-  }
-
-  @Override
-  public void goGooglePlay() {
-    String appPackageName = AppUtil.getPackageName();
-    try {
-      startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appPackageName)));
-    } catch (ActivityNotFoundException e) {
-      startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + appPackageName)));
-    }
-  }
-
-  @Override
-  public void render(String url) {
-    if (StringUtil.isFull(url)) {
-      webView = findViewById(R.id.web_view);
-      webView.setWebViewClient(new WebViewClient() {
-        @Override
-        public boolean shouldOverrideUrlLoading(WebView view, String url) {
-          view.loadUrl(url);
-          return true;
-        }
-      });
-      webView.getSettings().setJavaScriptEnabled(true);
-
-      webView.setWebChromeClient(new WebChromeClient());
-
-      webView.loadUrl(url);
-
-    }
-  }
-
-  @Override
-  public void setLiked(boolean isChecked) {
-    actionBarHelper.setLiked(isChecked);
-  }
-
-  @Override
-  public void setBookmarked(boolean isChecked) {
-    actionBarHelper.setBookmarked(isChecked);
-  }
-
-}

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

@@ -1,46 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.view.screen.contents;
-
-import kr.co.zumo.app.lifeplus.bean.api.ContentsItemBean;
-import kr.co.zumo.app.lifeplus.view.dialog.ShareDialog;
-
-/**
- * ContentsBaseModel
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2018. 11. 6.]   [최초 작성]
- * @since 2018. 11. 6.
- */
-public class ContentsWebModel extends ContentsBaseModel {
-
-  @Override
-  protected void destroyViewInternalModel() {
-
-  }
-
-  @Override
-  public int getShareDialogType() {
-    return ShareDialog.TYPE_PAGE_TOTAL;
-  }
-
-  @Override
-  public String getContentsType() {
-    return ContentsItemBean.TYPE_CARD;
-  }
-
-
-  @Override
-  public int getSharePageIndex() {
-    return 0;
-  }
-
-  @Override
-  public ContentsItemBean getShareContents() {
-    return ContentsItemBean.toBean(contentsBean);
-  }
-}

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

@@ -1,179 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.view.screen.contents;
-
-import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.bean.ContentsDeliveryBean;
-import kr.co.zumo.app.lifeplus.helper.NavigationBar;
-import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-import kr.co.zumo.app.lifeplus.tool.Share;
-import kr.co.zumo.app.lifeplus.util.ResourceUtil;
-import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
-import kr.co.zumo.app.lifeplus.view.dialog.ICustomConfirmListener;
-import kr.co.zumo.app.lifeplus.view.dialog.ICustomDialogListener;
-import kr.co.zumo.app.lifeplus.view.dialog.TooltipDialog;
-
-/**
- * ContentsWebPresenter
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2018. 11. 6.]   [최초 작성]
- * @since 2018. 11. 6.
- */
-public class ContentsWebPresenter extends ContentsBasePresenter<ContentsWebModel, IContentsBaseView> {
-
-  protected DialogBase reviewDialog;
-  protected Share share;
-
-  public ContentsWebPresenter(ContentsWebModel model, IContentsBaseView view) {
-    super(model, view);
-
-  }
-
-  @Override
-  protected void startInternal() {
-    super.startInternal();
-
-    if (null != model.getContentsBean()) {
-      view.setLiked(model.isLiked());
-      view.setBookmarked(model.isBookmarked());
-    }
-  }
-
-  @Override
-  protected void startInternalOnce() {
-
-  }
-
-  @Override
-  public boolean onBackPressedInternal() {
-    back(ScreenID.MAIN);
-    return true;
-  }
-
-  @Override
-  protected void onEventInternal(Event event) {
-
-  }
-
-  @Override
-  protected void onContentsResultInternal(Event event) {
-
-  }
-
-  @Override
-  public void onScreenReady() {
-    if (null == model.getContentsBean()) {
-      return;
-    }
-
-    view.render(model.getContentsBean().getContentsUrlWithParam());
-
-    view.setLiked(model.isLiked());
-    view.setBookmarked(model.isBookmarked());
-  }
-
-  /**
-   * 닷닷닷 메뉴
-   *
-   * @param actionBar
-   */
-  public void onNavigationClickDotDotDot(NavigationBar actionBar) {
-    showTooltipDialog();
-  }
-
-  /**
-   * 좋아요 클릭
-   *
-   * @param navigationBar
-   */
-  public void onNavigationClickLike(NavigationBar navigationBar) {
-    model.updateLiked();
-  }
-
-  /**
-   * 북마크 클릭
-   *
-   * @param navigationBar
-   */
-  public void onNavigationClickBookmark(NavigationBar navigationBar) {
-    if (model.isMember()) {
-      model.updateBookmarked();
-    }
-    else {
-      showPopupForGuest();
-    }
-  }
-
-  /**
-   * 공유 클릭
-   *
-   * @param navigationBar
-   */
-  public void onNavigationClickShare(NavigationBar navigationBar) {
-    showShareDialog();
-  }
-
-  protected void showPopupForGuest() {
-    // 비회원 가입 유도
-    new DialogBuilder<ConfirmDialog, ICustomConfirmListener>(getFragmentManager(), DialogID.CONFIRM)
-      .listener(new ICustomConfirmListener<ConfirmDialog>() {
-        @Override
-        public void onPositiveResult(ConfirmDialog dialog, Event event) {
-          dialog.dispose();
-          go(ScreenID.SIGN_UP_START);
-        }
-
-        @Override
-        public void onNegativeResult(ConfirmDialog dialog, Event event) {
-          dialog.dispose();
-
-        }
-
-        @Override
-        public void onDialogCanceled(ConfirmDialog dialog) {
-          dialog.dispose();
-
-        }
-      })
-      .attribute(dialog -> {
-        dialog.setText(ResourceUtil.getString(R.string.only_user_service));
-        dialog.setPositiveButtonLabelId(R.string.member_confirm);
-      })
-      .show();
-  }
-
-  protected void showTooltipDialog() {
-    new DialogBuilder<TooltipDialog, ICustomDialogListener>(getFragmentManager(), DialogID.TOOL_TIP)
-      .listener(new ICustomDialogListener<TooltipDialog>() {
-
-        @Override
-        public void onDialogResult(TooltipDialog dialog, Event event) {
-          if (event.getEventId() == Event.OVER_VIEW) {
-            dialog.dispose();
-
-            model.setDeliveryPackaging(new ContentsDeliveryBean.Builder(model.getContentsBean()).build());
-
-            go(ScreenID.OVER_VIEW);
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(TooltipDialog dialog) {
-
-        }
-      })
-      .attribute(dialog -> {
-      })
-      .show();
-  }
-
-}

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

@@ -14,7 +14,6 @@ import kr.co.zumo.app.lifeplus.view.screen.category.type4.FourthCategoryMainFrag
 import kr.co.zumo.app.lifeplus.view.screen.category.type5.FifthCategoryMainFragment;
 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.contents.ContentsWebFragment;
 import kr.co.zumo.app.lifeplus.view.screen.contents.MapFragment;
 import kr.co.zumo.app.lifeplus.view.screen.contents.series.ContentsSeriesFragment;
 import kr.co.zumo.app.lifeplus.view.screen.couponmall.CouponMallFragment;
@@ -285,9 +284,6 @@ public class BasicFragmentFactory extends FragmentFactory {
       case ScreenID.CONTENTS:
         fragment = new ContentsFragment();
         break;
-      case ScreenID.CONTENTS_VIA_WEB:
-        fragment = new ContentsWebFragment();
-        break;
       case ScreenID.OVER_VIEW:
         fragment = new ContentsOverviewFragment();
         break;