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

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

@@ -3,15 +3,10 @@
  */
 package kr.co.zumo.app.lifeplus.view.dialog;
 
-import android.graphics.drawable.ColorDrawable;
+import android.app.Dialog;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-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 android.support.v7.app.AlertDialog;
 
 import kr.co.zumo.app.R;
 
@@ -27,18 +22,20 @@ import kr.co.zumo.app.R;
  */
 public class LoadingDialog extends DialogBase {
 
-
   @Override
   protected void onActivityCreatedInternal() {
-    Window window = getDialog().getWindow();
-    window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
-    window.setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
+//    Window window = getDialog().getWindow();
+//    window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+//    window.setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
   }
 
-  @Nullable
+
+  @NonNull
   @Override
-  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.dialog_loading, container, false);
+  public Dialog onCreateDialog(Bundle savedInstanceState) {
+    android.support.v7.app.AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+    Dialog loadingDialog = super.onCreateDialog(savedInstanceState);
+    loadingDialog.setContentView(R.layout.dialog_loading);
+    return loadingDialog;
   }
-
 }

app/src/main/res/layout/dialog_loading.xml

@@ -6,6 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:background="@color/CB3FFFFFF"
+  tools:background="@color/C000000"
   app:layout_constraintBottom_toBottomOf="parent"
   app:layout_constraintEnd_toEndOf="parent"
   app:layout_constraintStart_toStartOf="parent"