[콘텐츠][New] 공유 문구 수정

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

@@ -206,7 +206,7 @@ public class ContentsPresenter extends Presenter<ContentsModel, IContentsView> {
         }
       })
       .attribute(dialog -> {
-        dialog.setDialogType(R.string.code_share, R.string.code_copy);
+        dialog.setDialogType(R.string.share_current_page_subject, R.string.url);
       })
       .show();
   }
@@ -264,8 +264,8 @@ public class ContentsPresenter extends Presenter<ContentsModel, IContentsView> {
 
 
   private void sendEmail() {
-    String subject = ResourceUtil.getString(R.string.share_title, ResourceUtil.getString(R.string.share_recommend_code_subject));
-    String contents = ResourceUtil.getString(R.string.share_recommend_code_contents, model.getContentsBean().getContentUrl());
+    String subject = ResourceUtil.getString(R.string.share_title, ResourceUtil.getString(R.string.share_current_page_subject));
+    String contents = ResourceUtil.getString(R.string.share_current_page_contents, model.getContentsBean().getTitle(), model.getContentsBean().getContentUrl());
     onCommand(new EmailSendingCommand("", subject, contents));
   }
 

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

@@ -7,6 +7,7 @@ import android.util.Log;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.ContentsBean;
+import kr.co.zumo.app.lifeplus.bean.api.MainContentsCategoryBean;
 import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
@@ -160,13 +161,15 @@ public class MainPresenter extends Presenter<MainModel, IMainView> {
   }
 
   private void setContentsHelper(String categoryNumber, int categoryIndex, int contentsIndex) {
-    ContentsBean bean = new ContentsBean();
-    bean.setCategoryNumber(categoryNumber);
-    bean.setImageUrl(model.getContentsBeans().get(categoryIndex).getContentsList().get(contentsIndex).getImageUrl());
-    bean.setContentUrl(model.getContentsBeans().get(categoryIndex).getContentsList().get(contentsIndex).getContentsUrl());
+    ContentsBean contentsBean = new ContentsBean();
+    MainContentsCategoryBean bean = model.getContentsBeans().get(categoryIndex).getContentsList().get(contentsIndex);
+    contentsBean.setCategoryNumber(categoryNumber);
+    contentsBean.setTitle(bean.getTitle());
+    contentsBean.setImageUrl(bean.getImageUrl());
+    contentsBean.setContentUrl(bean.getContentsUrl());
 
     DeliveryHelper helper = getHelper(DeliveryHelper.class);
-    helper.setPackaging(bean);
+    helper.setPackaging(contentsBean);
   }
 
   private void gotoCategoryMain(String id) {

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

@@ -1,6 +1,7 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
 
 import kr.co.zumo.app.lifeplus.bean.ContentsBean;
+import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
@@ -67,12 +68,15 @@ public class BookMarkListPresenter extends Presenter<BookMarkListModel, IBookMar
   protected void onEventInternal(Event event) {
     switch (event.getEventId()) {
       case Event.CONTENTS:
-        ContentsBean bean = new ContentsBean();
-        bean.setItemNumber(model.getBookmarkBeans().get(event.getIndex()).getItemNumber());
-        bean.setImageUrl(model.getBookmarkBeans().get(event.getIndex()).getImageUrl());
-        bean.setContentUrl(model.getBookmarkBeans().get(event.getIndex()).getContentsUrl());
+        ContentsBean contentsBean = new ContentsBean();
+        LifeplusContentsBean bean = model.getBookmarkBeans().get(event.getIndex());
+        contentsBean.setItemNumber(bean.getItemNumber());
+        contentsBean.setTitle(bean.getTitle());
+        contentsBean.setImageUrl(bean.getImageUrl());
+        contentsBean.setContentUrl(bean.getContentsUrl());
+
         DeliveryHelper deliveryHelper = getHelper(DeliveryHelper.class);
-        deliveryHelper.setPackaging(bean);
+        deliveryHelper.setPackaging(contentsBean);
 
         go(ScreenID.CONTENTS);
         break;

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

@@ -1,6 +1,7 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
 
 import kr.co.zumo.app.lifeplus.bean.ContentsBean;
+import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
@@ -82,12 +83,15 @@ public class DefaultBookMarkPresenter extends Presenter<DefaultBookMarkModel, ID
         go(ScreenID.FIFTH_CATEGORY, ScreenID.DIRECTION_NEXT);
         break;
       case Event.CONTENTS:
-        ContentsBean bean = new ContentsBean();
-        bean.setItemNumber(model.getDefaultBookmarkList().get(event.getIndex()).getItemNumber());
-        bean.setImageUrl(model.getDefaultBookmarkList().get(event.getIndex()).getImageUrl());
-        bean.setContentUrl(model.getDefaultBookmarkList().get(event.getIndex()).getContentsUrl());
+        ContentsBean contentsBean = new ContentsBean();
+        LifeplusContentsBean bean = model.getDefaultBookmarkList().get(event.getIndex());
+        contentsBean.setTitle(bean.getTitle());
+        contentsBean.setImageUrl(bean.getImageUrl());
+        contentsBean.setContentUrl(bean.getContentsUrl());
+        contentsBean.setItemNumber(bean.getItemNumber());
+
         DeliveryHelper deliveryHelper = getHelper(DeliveryHelper.class);
-        deliveryHelper.setPackaging(bean);
+        deliveryHelper.setPackaging(contentsBean);
 
         go(ScreenID.CONTENTS);
         break;

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

@@ -83,7 +83,7 @@ public class BucketListDetailPresenter extends Presenter<BucketListDetailModel,
 
   @Override
   public boolean onBackPressed() {
-    back(ScreenID.ADD_MY_BUCKET);
+    back(ScreenID.MY_BUCKET);
     return true;
   }
 
@@ -92,7 +92,7 @@ public class BucketListDetailPresenter extends Presenter<BucketListDetailModel,
     switch (event.getEventId()) {
       case Event.UPDATE:
         // 상단 버킷 클릭 시
-        go(ScreenID.ADD_MY_BUCKET);
+        go(ScreenID.BUCKET_MY_EDIT);
         break;
       case Event.TAG:
         // 태그 하나 누름

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

@@ -3,6 +3,7 @@ package kr.co.zumo.app.lifeplus.view.screen.my.main;
 
 import kr.co.zumo.app.lifeplus.bean.ContentsBean;
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
@@ -32,7 +33,6 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
   private DoubleChecker doubleCheckerBestBucket;
   private DoubleChecker doubleCheckerMyBucket;
   private DeliveryHelper deliveryHelper = getHelper(DeliveryHelper.class);
-  private ContentsBean bean;
 
   public MyMainPresenter(MyMainModel model, IMyMainView view) {
     super(model, view);
@@ -83,6 +83,8 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
 
   @Override
   protected void onEventInternal(Event event) {
+    ContentsBean contentsBean;
+    LifeplusContentsBean bean;
     switch (event.getEventId()) {
       case Event.BOOK_MARK_LIST:
         if (model.getBookmarkList().size() == 0) {
@@ -143,19 +145,23 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
         break;
       case Event.BOOK_MARK:
         //북마크 리스트 상세클릭시
-        bean = new ContentsBean();
-        bean.setItemNumber(model.getBookmarkList().get(event.getIndex()).getItemNumber());
-        bean.setImageUrl(model.getBookmarkList().get(event.getIndex()).getImageUrl());
-        deliveryHelper.setPackaging(bean);
+        contentsBean = new ContentsBean();
+        bean = model.getBookmarkList().get(event.getIndex());
+        contentsBean.setTitle(bean.getTitle());
+        contentsBean.setItemNumber(bean.getItemNumber());
+        contentsBean.setImageUrl(bean.getImageUrl());
+        deliveryHelper.setPackaging(contentsBean);
         go(ScreenID.CONTENTS);
 
         break;
       case Event.CONTENTS:
         //북마크 추천리스트 상세클릭시
-        bean = new ContentsBean();
-        bean.setItemNumber(model.getDefaultBookmarkList().get(event.getIndex()).getItemNumber());
-        bean.setImageUrl(model.getDefaultBookmarkList().get(event.getIndex()).getImageUrl());
-        deliveryHelper.setPackaging(bean);
+        contentsBean = new ContentsBean();
+        bean = model.getDefaultBookmarkList().get(event.getIndex());
+        contentsBean.setTitle(bean.getTitle());
+        contentsBean.setItemNumber(bean.getItemNumber());
+        contentsBean.setImageUrl(bean.getImageUrl());
+        deliveryHelper.setPackaging(contentsBean);
         go(ScreenID.CONTENTS);
 
         break;

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

@@ -627,7 +627,9 @@
   <string name="share_copy_completed_message">추천인 코드를 복사했습니다.</string>
   <string name="share_title">[Lifeplus] %s</string>
   <string name="share_recommend_code_subject">추천인 코드 공유</string>
+  <string name="share_current_page_subject">현재 페이지 공유</string>
   <string name="share_recommend_code_contents">"[Lifeplus] 추천인 코드 공유\n\n추천인 코드: %s\n\nLifeplus에서 더 다양한 컨텐츠를 확인하세요!\n\n아직 Lifeplus App이 없으시다면 아래 경로에서 다운로드 받으세요!\n\nApp 다운로드 : http://www.lifeplus.co.kr"</string>
+  <string name="share_current_page_contents">"[Lifeplus] %1$s\n\n%2$s\n\nLifeplus에서 더 다양한 컨텐츠를 확인하세요!\n\n아직 Lifeplus App이 없으시다면 아래 경로에서 다운로드 받으세요!\n\nApp 다운로드 : http://www.lifeplus.co.kr"</string>
   <string name="sending_email">이메일 보내기</string>
   <string name="view_in_web">웹에서 보기</string>
   <string name="view_in_app">앱에서 보기</string>