From 9a6f2d7f9f151effe3464905587e5d39d4fb0764 Mon Sep 17 00:00:00 2001
From: "pengfei.zhou" <pengfeizhou@foxmail.com>
Date: Wed, 20 Nov 2019 20:16:55 +0800
Subject: [PATCH] feat:add Android alert

---
 .../java/pub/doric/plugin/ModalPlugin.java    | 40 +++++++++++++++++++
 .../doric/src/main/res/values-v21/styles.xml  |  5 +++
 Android/doric/src/main/res/values/styles.xml  | 15 +++++++
 demo/src/ModalDemo.ts                         | 26 ++++++++++++
 js-framework/src/util/modal.ts                | 28 ++++++++++++-
 5 files changed, 112 insertions(+), 2 deletions(-)
 create mode 100644 Android/doric/src/main/res/values-v21/styles.xml
 create mode 100644 Android/doric/src/main/res/values/styles.xml

diff --git a/Android/doric/src/main/java/pub/doric/plugin/ModalPlugin.java b/Android/doric/src/main/java/pub/doric/plugin/ModalPlugin.java
index 2122f284..518f58ba 100644
--- a/Android/doric/src/main/java/pub/doric/plugin/ModalPlugin.java
+++ b/Android/doric/src/main/java/pub/doric/plugin/ModalPlugin.java
@@ -15,10 +15,14 @@
  */
 package pub.doric.plugin;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.text.TextUtils;
 import android.view.Gravity;
 import android.widget.Toast;
 
 import pub.doric.DoricContext;
+import pub.doric.R;
 import pub.doric.extension.bridge.DoricPlugin;
 import pub.doric.extension.bridge.DoricMethod;
 import pub.doric.extension.bridge.DoricPromise;
@@ -29,6 +33,7 @@ import com.github.pengfeizhou.jscore.ArchiveException;
 import com.github.pengfeizhou.jscore.JSDecoder;
 import com.github.pengfeizhou.jscore.JSObject;
 import com.github.pengfeizhou.jscore.JSValue;
+import com.github.pengfeizhou.jscore.JavaValue;
 
 /**
  * @Description: Doric
@@ -68,4 +73,39 @@ public class ModalPlugin extends DoricJavaPlugin {
             e.printStackTrace();
         }
     }
+
+    @DoricMethod(name = "alert", thread = ThreadMode.UI)
+    public void alert(JSDecoder decoder, final DoricPromise promise) {
+        try {
+            JSObject jsObject = decoder.decode().asObject();
+            JSValue titleVal = jsObject.getProperty("title");
+            JSValue msgVal = jsObject.getProperty("msg");
+            JSValue okBtn = jsObject.getProperty("okLabel");
+
+            AlertDialog.Builder builder = new AlertDialog.Builder(getDoricContext().getContext(), R.style.Theme_Doric_Modal_Alert);
+            if (titleVal.isString()) {
+                builder.setTitle(titleVal.asString().value());
+            }
+            String btnTitle = getDoricContext().getContext().getString(android.R.string.ok);
+            if (okBtn.isString()) {
+                btnTitle = okBtn.asString().value();
+            }
+            builder.setMessage(msgVal.asString().value())
+                    .setPositiveButton(btnTitle, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            promise.resolve();
+                        }
+                    });
+            builder.setCancelable(false);
+            try {
+                builder.show();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } catch (ArchiveException e) {
+            e.printStackTrace();
+            promise.reject(new JavaValue(e.getLocalizedMessage()));
+        }
+    }
 }
diff --git a/Android/doric/src/main/res/values-v21/styles.xml b/Android/doric/src/main/res/values-v21/styles.xml
new file mode 100644
index 00000000..5c99d8c1
--- /dev/null
+++ b/Android/doric/src/main/res/values-v21/styles.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Doric.Modal" parent="android:Theme.Material.Light.Dialog.Alert" />
+</resources>
\ No newline at end of file
diff --git a/Android/doric/src/main/res/values/styles.xml b/Android/doric/src/main/res/values/styles.xml
new file mode 100644
index 00000000..9ba3f2f0
--- /dev/null
+++ b/Android/doric/src/main/res/values/styles.xml
@@ -0,0 +1,15 @@
+<resources>
+
+    <style name="Theme.Doric.Modal" parent="android:style/Theme.Holo.Light.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+    </style>
+
+    <style name="Theme.Doric.Modal.Alert" parent="Theme.Doric.Modal" />
+
+    <style name="Theme.Doric.Modal.Confirm" parent="Theme.Doric.Modal" />
+
+    <style name="Theme.Doric.Modal.Prompt" parent="Theme.Doric.Modal" />
+
+    <style name="Theme.Doric.Modal.Prompt.EditText" parent="Theme.AppCompat.Light" />
+</resources>
+
diff --git a/demo/src/ModalDemo.ts b/demo/src/ModalDemo.ts
index 2ffb536f..d395ad0f 100644
--- a/demo/src/ModalDemo.ts
+++ b/demo/src/ModalDemo.ts
@@ -51,6 +51,32 @@ class ModalDemo extends Panel {
                     modal(context).toast('This is a toast.', Gravity.Center)
                 }
             } as IText),
+            text({
+                text: "Alert",
+                layoutConfig: layoutConfig().w(LayoutSpec.AT_MOST),
+                textSize: 30,
+                textColor: Color.WHITE,
+                bgColor: colors[2],
+                textAlignment: Gravity.Center,
+                height: 50,
+            }),
+            label('Click me').apply({
+                width: 200,
+                height: 50,
+                bgColor: colors[0],
+                textSize: 30,
+                textColor: Color.WHITE,
+                layoutConfig: layoutConfig().exactly(),
+                onClick: () => {
+                    modal(context).alert({
+                        msg: 'This is alert.',
+                        title: 'Alert title',
+                        okLabel: "OkLabel"
+                    }).then(e => {
+                        modal(context).toast('Clicked OK.')
+                    })
+                }
+            } as IText),
         ]).apply({
             layoutConfig: layoutConfig().atmost().h(LayoutSpec.WRAP_CONTENT),
             gravity: Gravity.Center,
diff --git a/js-framework/src/util/modal.ts b/js-framework/src/util/modal.ts
index dd44af54..a20b95b9 100644
--- a/js-framework/src/util/modal.ts
+++ b/js-framework/src/util/modal.ts
@@ -1,8 +1,21 @@
+/*
+ * Copyright [2019] [Doric.Pub]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import { BridgeContext } from "../runtime/global";
 import { Gravity } from "./gravity";
 
-
-
 export function modal(context: BridgeContext) {
     return {
         toast: (msg: string, gravity: Gravity = Gravity.Bottom) => {
@@ -11,5 +24,16 @@ export function modal(context: BridgeContext) {
                 gravity: gravity.toModel(),
             })
         },
+        alert: (arg: string | {
+            title: string,
+            msg: string,
+            okLabel?: string,
+        }) => {
+            if (typeof arg === 'string') {
+                return context.modal.alert({ msg: arg })
+            } else {
+                return context.modal.alert(arg)
+            }
+        },
     }
 }
\ No newline at end of file