Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/CategoryFirstMainFilterDialog.java

@@ -6,8 +6,6 @@ import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
 
 import java.util.ArrayList;
 
@@ -43,9 +41,9 @@ public class CategoryFirstMainFilterDialog extends DialogBase<ICustomFilterListe
 
   @Override
   protected void onActivityCreatedInternal() {
-    //Full Screen dialog
-    Window window = getDialog().getWindow();
-    window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+    applyAnimation();
+
+    applyFullScreen();
 
     init();
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/CategorySecondMainFilterDialog.java

@@ -6,8 +6,6 @@ import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
 
 import java.util.ArrayList;
 
@@ -42,9 +40,9 @@ public class CategorySecondMainFilterDialog extends DialogBase<ICustomFilterList
 
   @Override
   protected void onActivityCreatedInternal() {
-    //Full Screen dialog
-    Window window = getDialog().getWindow();
-    window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+    applyAnimation();
+
+    applyFullScreen();
 
     init();
 

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

@@ -6,6 +6,7 @@ package kr.co.zumo.app.lifeplus.view.dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
+import android.view.WindowManager;
 
 import kr.co.zumo.app.R;
 
@@ -40,6 +41,27 @@ public abstract class DialogBase<CL extends ICustomDialogCancelListener> extends
 
   protected abstract void onActivityCreatedInternal();
 
+  /**
+   * 다이얼로그 표시 에니메이션 적용
+   * - onActivityCreatedInternal() 안에서 처리해줘야한다.
+   */
+  protected void applyAnimation() {
+    if (null != getDialog() && null != getDialog().getWindow()) {
+      getDialog().getWindow().getAttributes().windowAnimations = R.style.DialogAnimation;
+    }
+  }
+
+  /**
+   * 다이얼로그 전체 화면 적용
+   * - onActivityCreatedInternal() 안에서 처리해줘야한다.
+   */
+  protected void applyFullScreen() {
+    if (null != getDialog() && null != getDialog().getWindow()) {
+      //Full Screen dialog
+      getDialog().getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+    }
+  }
+
   /**
    * dismiss 확인
    *

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/PinConfirmDialog.java

@@ -9,8 +9,6 @@ import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -67,11 +65,9 @@ public class PinConfirmDialog extends DialogBase<ICustomDialogListener<PinConfir
 
   @Override
   protected void onActivityCreatedInternal() {
+    applyAnimation();
 
-    getDialog().getWindow().getAttributes().windowAnimations = R.style.DialogAnimation;
-
-    Window window = getDialog().getWindow();
-    window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+    applyFullScreen();
 
     customPinView = new CustomPinView(getContext());
     pinPresenter = new CustomPinInputPresenter(customPinView, isResetButtonVisible, new IPinContract.Listener() {

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/PinUnlockDialog.java

@@ -9,8 +9,6 @@ import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -63,11 +61,9 @@ public class PinUnlockDialog extends DialogBase<ICustomDialogListener<PinUnlockD
 
   @Override
   protected void onActivityCreatedInternal() {
+    applyAnimation();
 
-    getDialog().getWindow().getAttributes().windowAnimations = R.style.DialogAnimation;
-
-    Window window = getDialog().getWindow();
-    window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+    applyFullScreen();
 
     customPinView = new CustomPinView(getContext());
     pinPresenter = new CustomPinUnlockPresenter(customPinView, new IPinContract.Listener() {