浏览代码

[공통][New] 다이얼로그 정리

hyodong.min 7 年之前
父节点
当前提交
05d03c02db

+ 0 - 9
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/CategoryFirstMainFilterDialog.java

@@ -1,7 +1,5 @@
 package kr.co.zumo.app.lifeplus.view.dialog;
 
-import android.graphics.drawable.ColorDrawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -15,7 +13,6 @@ import java.util.ArrayList;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.FilterBean;
-import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.custom.CustomSquareCheckBox;
 
 /**
@@ -49,12 +46,6 @@ public class CategoryFirstMainFilterDialog extends DialogBase<ICustomFilterListe
     //Full Screen dialog
     Window window = getDialog().getWindow();
     window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
-    window.setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-      window.setStatusBarColor(ResourceUtil.getColor(R.color.CFFFFFF));
-    }
 
     init();
 

+ 2 - 7
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/PinConfirmDialog.java

@@ -3,7 +3,6 @@
  */
 package kr.co.zumo.app.lifeplus.view.dialog;
 
-import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -14,7 +13,6 @@ import android.view.Window;
 import android.view.WindowManager;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.custom.pin.CustomPinInputPresenter;
 import kr.co.zumo.app.lifeplus.view.custom.pin.CustomPinView;
@@ -70,13 +68,10 @@ public class PinConfirmDialog extends DialogBase<ICustomDialogListener<PinConfir
   @Override
   protected void onActivityCreatedInternal() {
 
-//    getDialog().getWindow().getAttributes().windowAnimations = R.style.DialogAnimation;
+    getDialog().getWindow().getAttributes().windowAnimations = R.style.DialogAnimation;
+
     Window window = getDialog().getWindow();
     window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-      window.setStatusBarColor(ResourceUtil.getColor(R.color.CFFFFFF));
-    }
 
     customPinView = new CustomPinView(getContext());
     pinPresenter = new CustomPinInputPresenter(customPinView, isResetButtonVisible, new IPinContract.Listener() {

+ 2 - 7
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/PinUnlockDialog.java

@@ -3,7 +3,6 @@
  */
 package kr.co.zumo.app.lifeplus.view.dialog;
 
-import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -14,7 +13,6 @@ import android.view.Window;
 import android.view.WindowManager;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.custom.pin.CustomPinUnlockPresenter;
 import kr.co.zumo.app.lifeplus.view.custom.pin.CustomPinView;
@@ -66,13 +64,10 @@ public class PinUnlockDialog extends DialogBase<ICustomDialogListener<PinUnlockD
   @Override
   protected void onActivityCreatedInternal() {
 
-//    getDialog().getWindow().getAttributes().windowAnimations = R.style.DialogAnimation;
+    getDialog().getWindow().getAttributes().windowAnimations = R.style.DialogAnimation;
+
     Window window = getDialog().getWindow();
     window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-      window.setStatusBarColor(ResourceUtil.getColor(R.color.CFFFFFF));
-    }
 
     customPinView = new CustomPinView(getContext());
     pinPresenter = new CustomPinUnlockPresenter(customPinView, new IPinContract.Listener() {

+ 6 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/ShareDialog.java

@@ -36,11 +36,15 @@ public class ShareDialog extends DialogBase<ICustomDialogListener<ShareDialog>>
     Log.e("APP#  ShareDialog | onCreateDialog", "|" + "----------------------------------------------------------------------");
     android.support.v7.app.AlertDialog.Builder builder = new android.support.v7.app.AlertDialog.Builder(getActivity());
     View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_current_page_share, null);
-
     setupView(view);
 
     builder.setView(view);
-    return builder.create();
+    Dialog dialog = builder.create();
+
+    // alert 의 기본 흰 배경 제거
+    dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+
+    return dialog;
   }
 
 //  @Nullable

+ 2 - 2
app/src/main/res/layout/dialog_current_page_share.xml

@@ -3,8 +3,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content">
 
   <android.support.constraint.ConstraintLayout
     android:id="@+id/constraintLayout"