[공통][Common] 코인, 쿠폰몰 진입시 알림창 띄움

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/menu/AllMenuPresenter.java

@@ -1,9 +1,11 @@
 package kr.co.zumo.app.lifeplus.view.screen.menu;
 
+import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IView;
+import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
@@ -18,6 +20,7 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
  */
 public class AllMenuPresenter extends Presenter<AllMenuModel, IView> {
 
+  private DialogBase alertDialog;
   public AllMenuPresenter(AllMenuModel model, IView view) {
     super(model, view);
   }
@@ -81,7 +84,8 @@ public class AllMenuPresenter extends Presenter<AllMenuModel, IView> {
         go(ScreenID.LIFE_PLUS_INTRODUCTION);
         break;
       case Event.COUPON_MALL:
-        go(ScreenID.COUPON_MALL);
+        // TODO: 추후개발 예정
+        showErrorDialog(R.string.ready_comment);
         break;
       default:
         break;

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/MyBucketListFragment.java

@@ -8,7 +8,6 @@ import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -113,7 +112,6 @@ public class MyBucketListFragment extends FragmentBase<MyBucketListPresenter> im
   public void drawList(List<BucketWithTagBean> beans) {
     adapter = new MyBucketListAdapter(getActivity(), beans, event -> {
       //버킷리스트 상세 이동
-      Log.e("APP#  MyBucketListFragment | drawList", "| isClicked ===>" + isClicked);
       if (isClicked) {
         presenter.onEvent(new Event.Builder(Event.COMPLETE_BUCKET).index(event.getIndex()).build());
       }
@@ -121,6 +119,7 @@ public class MyBucketListFragment extends FragmentBase<MyBucketListPresenter> im
         presenter.onEvent(event);
       }
     });
+    recyclerViewMyBucketList.setNestedScrollingEnabled(false);
     recyclerViewMyBucketList.setLayoutManager(new GridLayoutManager(getActivity(), 2));
     recyclerViewMyBucketList.setAdapter(adapter);
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/main/MyMainFragment.java

@@ -118,6 +118,8 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
 
 
     findViewById(R.id.text_view_purchase).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_PURCHASE_HISTORY).build());});
+    findViewById(R.id.text_view_coupon).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.COUPON_MALL).build());});
+    findViewById(R.id.text_view_event).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.EVENT).build());});
 
 
     textViewConfirmUser.setOnClickListener(view -> { presenter.onEvent(new Event.Builder(Event.SIGN_UP).build());});

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/main/MyMainPresenter.java

@@ -11,6 +11,7 @@ import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.dialog.CustomAlertDialog;
+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.ICustomDialogListener;
@@ -28,6 +29,8 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
  */
 public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
 
+  private DialogBase alertDialog;
+
   private DoubleChecker doubleCheckerBookmarkList;
   private DoubleChecker doubleCheckerDefaultBookmarkList;
   private DoubleChecker doubleCheckerBestBucket;
@@ -96,10 +99,9 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
         }
         break;
       case Event.MY_COIN_MAIN:
-        go(ScreenID.MY_COIN_MAIN);
-        break;
-      case Event.MY_PURCHASE_HISTORY:
-        go(ScreenID.MY_PURCHASE_HISTORY);
+        //go(ScreenID.MY_COIN_MAIN);
+        // TODO: 추후개발 예정
+        showErrorDialog(R.string.ready_comment);
         break;
       case Event.ADD_BUCKET:
         if (model.isMember()) {
@@ -137,9 +139,6 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
           go(ScreenID.MY_BUCKET_LIST);
         }
         break;
-      case Event.COUPON_MALL:
-        go(ScreenID.COUPON_MALL);
-        break;
       case Event.SIGN_UP:
         go(ScreenID.SIGN_UP_START);
         break;
@@ -171,6 +170,18 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
         deliveryHelper.setPackaging(model.getBucketList().get(index));
         go(ScreenID.BUCKET_DETAIL);
         break;
+      case Event.COUPON_MALL:
+        // TODO: 추후개발 예정
+        showErrorDialog(R.string.ready_comment);
+        break;
+      case Event.MY_PURCHASE_HISTORY:
+        // TODO: 추후개발 예정
+        showErrorDialog(R.string.ready_comment);
+        break;
+      case Event.EVENT:
+        // TODO: 추후개발 예정
+        showErrorDialog(R.string.ready_comment);
+        break;
       default:
         break;
     }
@@ -283,5 +294,4 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
 
   }
 
-
 }

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

@@ -5,7 +5,6 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  tools:layout_marginTop="-900dp"
   android:orientation="vertical">
 
   <android.support.constraint.ConstraintLayout

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

@@ -661,6 +661,7 @@
 
   <string name="tag_title">연관태그 추천 콘텐츠 %s개</string>
   <string name="quit_member">탈퇴한 회원입니다.</string>
+  <string name="ready_comment">준비중입니다.</string>
 
 
 </resources>