Просмотр исходного кода

[공통][New] presenter에 토스트 기본 메서드 추가

hyodong.min 7 лет назад
Родитель
Сommit
f2ad3631fc

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/ContentsDetailListBean.java

@@ -25,6 +25,7 @@ public class ContentsDetailListBean extends JsonBeanBase {
   private List<ContentsDetailBean> itemDetailList;
   @SerializedName("seriesItemList")
   private List<SeriesItemBean> seriesItemList;
+  // fixme 함께 본 컨텐츠 임시 속성 추가
   @SerializedName("withItemList")
   private List<WithShownItemBean> withItemList;
 

+ 9 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/Presenter.java

@@ -8,6 +8,7 @@ import android.support.annotation.StringRes;
 import android.support.v4.app.FragmentManager;
 import android.support.v7.app.ActionBar;
 import android.util.Log;
+import android.widget.Toast;
 
 import com.google.gson.Gson;
 
@@ -204,6 +205,14 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
     command.execute(model, view, this);
   }
 
+  protected void showToast(@StringRes int stringId) {
+    showToast(ResourceUtil.getString(stringId));
+  }
+
+  protected void showToast(String str) {
+    Toast.makeText(view.getActivity(), str, Toast.LENGTH_SHORT).show();
+  }
+
   /**
    * "요청하신 서버에 연결할 수 없습니다.
    * 잠시 후 다시 시도해주세요."

+ 0 - 5
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsPresenter.java

@@ -1,7 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.contents;
 
 import android.os.Handler;
-import android.support.annotation.StringRes;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -79,10 +78,6 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
 
   }
 
-  private void showToast(@StringRes int stringId) {
-    Toast.makeText(view.getActivity(), stringId, Toast.LENGTH_SHORT).show();
-  }
-
   @Override
   protected void createViewInternal() {
 

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinDetailPresenter.java

@@ -134,7 +134,7 @@ public class MyCoinDetailPresenter extends Presenter<MyCoinDetailModel, IMyCoinV
         break;
       case Event.ERROR:
         onBackPressedInternal();
-//        showErrorDialog(event.getString());
+        showToast(event.getString());
         break;
       default:
         break;

+ 2 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinExtinctionPresenter.java

@@ -85,7 +85,8 @@ public class MyCoinExtinctionPresenter extends Presenter<MyCoinExtinctionModel,
         doubleChecker.checkSecond();
         break;
       case Event.ERROR:
-        showErrorDialog(event.getString());
+        onBackPressedInternal();
+        showToast(event.getString());
         break;
       default:
         break;

+ 12 - 8
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/SettingPresenter.java

@@ -115,7 +115,7 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
       - 추천인 이름이 있으면 팝업 (코인 표시)
      */
     if (StringUtil.isFull(model.getSpecialCodeType())) {
-      showToast(
+      showCustomToast(
         ResourceUtil.getString(R.string.special_code_confirm_success),
         String.format(ResourceUtil.getString(R.string.special_code_confirm_success_detail), model.getSpecialCodeType()),
         0,
@@ -126,7 +126,7 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
     }
 
     if (StringUtil.isFull(model.getRecommendName())) {
-      showToast(
+      showCustomToast(
         ResourceUtil.getString(R.string.recommend_special_code_confirm_success),
         String.format(ResourceUtil.getString(R.string.recommend_confirm_success_detail), model.getRecommendName(), model.getIncreasedCoin()),
         0,
@@ -355,7 +355,7 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
     share.shareRecommendCode(model.getMyRecommendCode(), new IShareListener() {
       @Override
       public void onSuccess(String result) {
-        showToast("", ResourceUtil.getString(R.string.share_completed_message), 1, Toast.LENGTH_LONG);
+        showCustomToast("", ResourceUtil.getString(R.string.share_completed_message), 1, Toast.LENGTH_LONG);
       }
 
       @Override
@@ -371,7 +371,7 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
     share.shareRecommendCode(model.getMyRecommendCode(), new IShareListener() {
       @Override
       public void onSuccess(String result) {
-        showToast("", ResourceUtil.getString(R.string.share_copy_completed_message), 1, Toast.LENGTH_LONG);
+        showCustomToast("", ResourceUtil.getString(R.string.share_copy_completed_message), 1, Toast.LENGTH_LONG);
       }
 
       @Override
@@ -398,7 +398,7 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
         else if (index == SettingViewHolder.SWITCH_MARKETING) {
           // 마케팅
           String date = Formatter.format(Calendar.getInstance().getTimeInMillis(), "yyyy.MM.dd");
-          showToast(
+          showCustomToast(
             ResourceUtil.getString(bool ? R.string.setting_menu3_event_agree : R.string.setting_menu3_event_disagree),
             String.format(ResourceUtil.getString(bool ? R.string.setting_menu3_event_agree_message : R.string.setting_menu3_event_disagree_message), date),
             0,
@@ -427,11 +427,15 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
           view.notifyUpdate();
         }
         else if (index == Event.SETTING_LOAD) {
-          showErrorDialog(R.string.network_disconnected_message, () -> onBackPressedInternal());
+//          showErrorDialog(R.string.network_disconnected_message, () -> onBackPressedInternal());
+          onBackPressedInternal();
+          showToast(R.string.network_disconnected_message);
         }
         else {
           // 설정 메인
-          showErrorDialog(event.getString(), () -> onBackPressedInternal());
+//          showErrorDialog(event.getString(), () -> onBackPressedInternal());
+          onBackPressedInternal();
+          showToast(event.getString());
         }
         break;
       default:
@@ -493,7 +497,7 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
     }
   }
 
-  private void showToast(String title, String detail, @Nullable int copyToastFlag, int duration) {
+  private void showCustomToast(String title, String detail, @Nullable int copyToastFlag, int duration) {
 
     Context context = App.getInstance().getContext();
     Toast toast = new Toast(context);