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

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

@@ -0,0 +1,52 @@
+package kr.co.zumo.app.lifeplus.view.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.widget.ImageView;
+
+import kr.co.zumo.app.R;
+
+/**
+ * CurrentPageShareDialog
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-26]   [최초 작성]
+ * @since 2018-10-26
+ */
+public class CurrentPageShareDialog extends DialogBase {
+
+
+  private ImageView imageViewCancel;
+
+
+  @Nullable
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    return inflater.inflate(R.layout.dialog_current_page_share, container, false);
+  }
+
+  @Override
+  public void onActivityCreated(Bundle savedInstanceState) {
+    super.onActivityCreated(savedInstanceState);
+
+    Window window = getDialog().getWindow();
+    window.setBackgroundDrawableResource(R.color.C99000000);
+
+    imageViewCancel = getView().findViewById(R.id.image_view_cancel);
+    imageViewCancel.setOnClickListener(view -> {
+      dismiss();
+    });
+
+
+  }
+
+}
+

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

@@ -26,9 +26,10 @@ public class DialogID {
   public final static int ADD_REGISTRATION = 4;
   public static final int ALERT = 5;
   public static final int PROMOTION = 6;
+  public static final int SHARE = 7;
 
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({NONE, CONFIRM, /*INPUT_PIN,*/ WEB, ADD_REGISTRATION, ALERT, PROMOTION})
+  @IntDef({NONE, CONFIRM, /*INPUT_PIN,*/ WEB, ADD_REGISTRATION, ALERT, PROMOTION, SHARE})
   public @interface ID {}
 
 }

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

@@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 
@@ -42,6 +43,10 @@ public class PromotionDialog extends DialogBase{
   @Override
   public void onActivityCreated(Bundle savedInstanceState) {
     super.onActivityCreated(savedInstanceState);
+
+    Window window = getDialog().getWindow();
+    window.setBackgroundDrawableResource(R.color.C66000000);
+
     doDataSetting();
     mainBannerView = getView().findViewById(R.id.promotion_banner);
     imageViewCancel = getView().findViewById(R.id.image_view_cancel);

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

@@ -5,6 +5,7 @@ package kr.co.zumo.app.lifeplus.view.dialog.factory;
 
 import kr.co.zumo.app.lifeplus.view.dialog.AddRegistrationDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
+import kr.co.zumo.app.lifeplus.view.dialog.CurrentPageShareDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.CustomAlertDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
@@ -42,6 +43,9 @@ public class BasicDialogFactory implements IDialogFactory {
       case DialogID.PROMOTION:
         dialog = new PromotionDialog();
         break;
+      case DialogID.SHARE:
+        dialog = new CurrentPageShareDialog();
+        break;
       default:
         throw new Error("Unsupported dialog.");
     }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainPresenter.java

@@ -14,10 +14,9 @@ import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
 import kr.co.zumo.app.lifeplus.view.dialog.IAttribute;
 import kr.co.zumo.app.lifeplus.view.dialog.IDialogResultListener;
-import kr.co.zumo.app.lifeplus.view.dialog.PromotionDialog;
+import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 import kr.co.zumo.app.lifeplus.view.screen.factory.BasicFragmentFactory;
 import kr.co.zumo.app.lifeplus.view.screen.factory.SignUpZumoFragmentFactory;
-import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
  * MainPresenter
@@ -32,7 +31,6 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 public class MainPresenter extends Presenter<MainModel, IMainView> {
 
   DialogBase alertDialog;
-  DialogBase promotionDialog;
 
   public MainPresenter(MainModel model, IMainView view) {
     super(model, view);
@@ -42,21 +40,21 @@ public class MainPresenter extends Presenter<MainModel, IMainView> {
   protected void startInternal() {
     //프로모션 팝업
 
-    promotionDialog = DialogBuilder.create(DialogID.PROMOTION)
-      .listener(new IDialogResultListener() {
-        @Override
-        public void onDialogResult(DialogBase dialog, Event event) {
-
-        }
-
-        @Override
-        public void onDialogCanceled(DialogBase dialog) {
-
-        }
-      })
-      .attribute((IAttribute<PromotionDialog>) dialog -> {
-      })
-      .show();
+//    alertDialog = DialogBuilder.create(DialogID.PROMOTION)
+//      .listener(new IDialogResultListener() {
+//        @Override
+//        public void onDialogResult(DialogBase dialog, Event event) {
+//
+//        }
+//
+//        @Override
+//        public void onDialogCanceled(DialogBase dialog) {
+//
+//        }
+//      })
+//      .attribute((IAttribute<PromotionDialog>) dialog -> {
+//      })
+//      .show();
 
   }
 

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

@@ -7,6 +7,7 @@
   android:layout_height="match_parent">
 
   <android.support.constraint.ConstraintLayout
+    android:background="@color/CFFFFFF"
     android:id="@+id/constraintLayout"
     android:layout_width="273dp"
     android:layout_height="163dp"
@@ -25,7 +26,7 @@
       android:textSize="17.5sp"
       app:layout_constraintStart_toStartOf="@+id/image_view_kakao"
       app:layout_constraintTop_toTopOf="parent"
-      tools:text="현재 페이지 공유"/>
+      android:text="현재 페이지 공유"/>
 
     <ImageView
       android:id="@+id/image_view_kakao"

app/src/main/res/values/colors.xml

@@ -6,6 +6,10 @@
   <color name="CCCCCCC">#CCCCCC</color>
   <color name="CFFFFFF">#FFFFFF</color>
   <color name="C000000">#000000</color>
+  <!--opacity 40%-->
+  <color name="C66000000">#66000000</color>
+ <!--opacity 60%-->
+  <color name="C99000000">#99000000</color>
   <color name="CF44336">#F44336</color>
   <color name="C999999">#999999</color>
   <color name="CF12815">#f12815</color>