Explorar el Código

[공통][Common] 내비게이션바에 따른 풀스크린 다이얼로그 대응

Hasemi hace 6 años
padre
commit
6d1b118357

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/DialogBase.java

@@ -25,7 +25,7 @@ import kr.co.zumo.app.lifeplus.helper.IScreenResizeDispatcher;
 public abstract class DialogBase<CL extends ICustomDialogCancelListener> extends DialogFragment implements IDialogBase<CL> {
   private CL customListener;
   private boolean isDismissed = false;
-  private IScreenResizeDispatcher dispatcher;
+  protected IScreenResizeDispatcher dispatcher;
 
   public CL getCustomListener() {
     return customListener;

+ 7 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/FilterDetailDialog.java

@@ -69,6 +69,13 @@ public class FilterDetailDialog extends DialogBase<IFilterListener<FilterDetailD
     return inflater.inflate(R.layout.dialog_category_filter_detail, container, false);
   }
 
+  @Override
+  public void onScreenResized(int width, int height) {
+    if (null != getView()) {
+      ScreenUtil.updateBottomPadding(getView());
+    }
+  }
+
   @Override
   protected void onActivityCreatedInternal() {
     TextView viewApply = getView().findViewById(R.id.text_view_apply);

+ 8 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/FilterDialog.java

@@ -89,6 +89,13 @@ public class FilterDialog extends DialogBase<IFilterListener<FilterDialog>> impl
     return inflater.inflate(R.layout.dialog_category_filter, container, false);
   }
 
+  @Override
+  public void onScreenResized(int width, int height) {
+    if (null != getView()) {
+      ScreenUtil.updateBottomPadding(getView());
+    }
+  }
+
   @Override
   protected void onActivityCreatedInternal() {
     contentsCountTextView = getView().findViewById(R.id.text_view_apply);
@@ -192,6 +199,7 @@ public class FilterDialog extends DialogBase<IFilterListener<FilterDialog>> impl
   private void showDialogDetail(FilterSection section, FilterBean filterBean) {
     if (null == detailDialog) {
       detailDialog = new DialogBuilder<FilterDetailDialog, IFilterListener>(getFragmentManager(), DialogID.FILTER_DETAIL)
+        .resize(dispatcher)
         .listener(new IFilterListener<FilterDetailDialog>() {
           @Override
           public void onDialogResult(FilterDetailDialog dialog, Event event) {

+ 8 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/MoreInfoDialog.java

@@ -14,6 +14,7 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsButtonInfoBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsMoreInfoBean;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.util.ScreenUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.contents.view.MoreInfoView;
@@ -89,6 +90,13 @@ public class MoreInfoDialog extends DialogBottomBase<ICustomDialogListener<MoreI
     return 0;
   }
 
+  @Override
+  public void onScreenResized(int width, int height) {
+    if (null != getView()) {
+      ScreenUtil.updateBottomPadding(getView());
+    }
+  }
+
   @Override
   protected void onActivityCreatedInternal() {
     getDialog().getWindow().getAttributes().windowAnimations = R.style.DialogMoreInfoAnimation;

+ 7 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/PolicyDialog.java

@@ -35,6 +35,13 @@ public class PolicyDialog extends TextDialog<ICustomDialogListener<PolicyDialog>
     return inflater.inflate(R.layout.policy_dialog, container, false);
   }
 
+  @Override
+  public void onScreenResized(int width, int height) {
+    if (null != getView()) {
+      ScreenUtil.updateBottomPadding(getView());
+    }
+  }
+
   @Override
   protected void onActivityCreatedInternal() {
 

+ 2 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/CategoryFilterPresenter.java

@@ -62,6 +62,7 @@ public abstract class CategoryFilterPresenter<M extends CategoryFilterModel, V e
       firebaseAnalyticsHelper.logScreen(R.string.fa_screen_category_filter, getAnalyticsScreenName());
 
       filterDialog = new DialogBuilder<FilterDialog, IFilterListener>(getFragmentManager(), DialogID.FILTER)
+        .resize(getScreenSizeHelper())
         .listener(new IFilterListener<FilterDialog>() {
           @Override
           public void onDialogResult(FilterDialog dialog, Event event) {
@@ -84,7 +85,7 @@ public abstract class CategoryFilterPresenter<M extends CategoryFilterModel, V e
 
           @Override
           public void onFilterChanged(FilterDialog dialog, FilterBean filterBean) {
-            if(filterBean != null) {
+            if (filterBean != null) {
               googleAnalyticsHelper.sendGA(GoogleAnalyticsHelper.Category.CATEGOTY_FILTER, GoogleAnalyticsHelper.Action.CLICK, filterBean.getFilterName());
             }
 

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

@@ -405,7 +405,7 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
    * @param navigationBar
    */
   public void onNavigationClickLike(NavigationBar navigationBar) {
-    if(!model.getCurrentItem().isLiked()) {
+    if (!model.getCurrentItem().isLiked()) {
       googleAnalyticsHelper.sendGA(GoogleAnalyticsHelper.Category.LIKE, model.getFirstItem().getTitle());
     }
     model.updateLiked();
@@ -417,7 +417,7 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
    * @param navigationBar
    */
   public void onNavigationClickBookmark(NavigationBar navigationBar) {
-    if(!model.getCurrentItem().isBookmarked()) {
+    if (!model.getCurrentItem().isBookmarked()) {
       googleAnalyticsHelper.sendGA(GoogleAnalyticsHelper.Category.BOOKMARK, model.getFirstItem().getTitle(), model.getCurrentItem().getTitle());
     }
     model.updateBookmarked();
@@ -524,6 +524,7 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
   private void showMoreInfoPopup(int index) {
     if (null == dialogBase) {
       dialogBase = new DialogBuilder<MoreInfoDialog, ICustomDialogListener>(getFragmentManager(), DialogID.MORE_INFO)
+        .resize(getScreenSizeHelper())
         .listener(new ICustomDialogListener<MoreInfoDialog>() {
 
           @Override

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/entry/EventQuestionPresenter.java

@@ -243,6 +243,7 @@ public class EventQuestionPresenter extends Presenter<EventQuestionModel, IEvent
 
   private void showPolicyDetail(String contents) {
     new DialogBuilder<PolicyDialog, ICustomDialogListener>(getFragmentManager(), DialogID.POLICY)
+      .resize(getScreenSizeHelper())
       .listener(new ICustomDialogListener<PolicyDialog>() {
         @Override
         public void onDialogResult(PolicyDialog dialog, Event event) {

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/SearchResultPresenter.java

@@ -224,6 +224,7 @@ public class SearchResultPresenter extends Presenter<SearchResultModel, ISearchR
       firebaseAnalyticsHelper.logScreen(R.string.fa_screen_search_filter, "");
 
       filterDialog = new DialogBuilder<FilterDialog, IFilterListener>(getFragmentManager(), DialogID.FILTER)
+        .resize(getScreenSizeHelper())
         .listener(new IFilterListener<FilterDialog>() {
           @Override
           public void onDialogResult(FilterDialog dialog, Event event) {

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/info/SettingTermsPresenter.java

@@ -3,7 +3,6 @@
  */
 package kr.co.zumo.app.lifeplus.view.screen.setting.info;
 
-import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
@@ -114,6 +113,7 @@ public class SettingTermsPresenter extends Presenter<SettingTermsModel, ISetting
 
   private void showPolicyDetail(String contents) {
     new DialogBuilder<PolicyDialog, ICustomDialogListener>(getFragmentManager(), DialogID.POLICY)
+      .resize(getScreenSizeHelper())
       .listener(new ICustomDialogListener<PolicyDialog>() {
         @Override
         public void onDialogResult(PolicyDialog dialog, Event event) {

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/member/SettingMemberInfoPresenter.java

@@ -289,6 +289,7 @@ public class SettingMemberInfoPresenter extends Presenter<SettingMemberInfoModel
 
   private void showPolicyDetail(String contents) {
     new DialogBuilder<PolicyDialog, ICustomDialogListener>(getFragmentManager(), DialogID.POLICY)
+      .resize(getScreenSizeHelper())
       .listener(new ICustomDialogListener<PolicyDialog>() {
         @Override
         public void onDialogResult(PolicyDialog dialog, Event event) {