From 305ea76e2aec03bcb597321262b8d8a98b8e3e9c Mon Sep 17 00:00:00 2001 From: yuxiaohui78 Date: Thu, 23 Aug 2018 11:23:56 -0500 Subject: [PATCH 01/11] Add the neutral button Add the neutral button --- .idea/modules.xml | 5 +- .../sweetalert/sample/SampleActivity.java | 33 +++++++++++ app/src/main/res/drawable/pill_icon.png | Bin 0 -> 6166 bytes app/src/main/res/layout/sample_activity.xml | 21 +++++++ .../cazaea/sweetalert/SweetAlertDialog.java | 55 ++++++++++++++++++ library/src/main/res/layout/alert_dialog.xml | 8 +++ library/src/main/res/values/strings.xml | 1 + 7 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/pill_icon.png diff --git a/.idea/modules.xml b/.idea/modules.xml index 68a39ce..dca0d95 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,9 +2,12 @@ + + - + + \ No newline at end of file diff --git a/app/src/main/java/com/cazaea/sweetalert/sample/SampleActivity.java b/app/src/main/java/com/cazaea/sweetalert/sample/SampleActivity.java index 7760917..f074e48 100644 --- a/app/src/main/java/com/cazaea/sweetalert/sample/SampleActivity.java +++ b/app/src/main/java/com/cazaea/sweetalert/sample/SampleActivity.java @@ -6,6 +6,7 @@ import android.os.Handler; import android.view.View; import android.widget.Switch; +import android.widget.Toast; import com.cazaea.sweetalert.SweetAlertDialog; @@ -25,11 +26,43 @@ public void onCreate(Bundle savedInstanceState) { findViewById(R.id.warning_cancel_test).setOnClickListener(this); findViewById(R.id.custom_img_test).setOnClickListener(this); findViewById(R.id.progress_dialog).setOnClickListener(this); + findViewById(R.id.three_button).setOnClickListener(this); } @Override public void onClick(View v) { switch (v.getId()) { + case R.id.three_button: + new SweetAlertDialog(this, SweetAlertDialog.CUSTOM_IMAGE_TYPE) + .setCustomImage(R.drawable.pill_icon) + .setTitleText("3:00PM") + .setContentText("Asprin 50 mg. Take 2 pills") + .setNeutralText("Later") + .setCancelText("Skip it") + .setConfirmText("Take it!") + .setNeutralClickListener(new SweetAlertDialog.OnSweetClickListener() { + @Override + public void onClick(SweetAlertDialog sweetAlertDialog) { + Toast.makeText(SampleActivity.this, "Take it later!", Toast.LENGTH_SHORT).show(); + sweetAlertDialog.dismiss(); + } + }) + .setCancelClickListener(new SweetAlertDialog.OnSweetClickListener() { + @Override + public void onClick(SweetAlertDialog sweetAlertDialog) { + Toast.makeText(SampleActivity.this, "Skip it!", Toast.LENGTH_SHORT).show(); + sweetAlertDialog.dismiss(); + } + }) + .setConfirmClickListener(new SweetAlertDialog.OnSweetClickListener() { + @Override + public void onClick(SweetAlertDialog sweetAlertDialog) { + Toast.makeText(SampleActivity.this, "Take it now!", Toast.LENGTH_SHORT).show(); + sweetAlertDialog.dismiss(); + } + }) + .show(); + break; case R.id.basic_test: // default title "Here's a message!" SweetAlertDialog sd = new SweetAlertDialog(this); diff --git a/app/src/main/res/drawable/pill_icon.png b/app/src/main/res/drawable/pill_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e8ab98eea1d0fd770385586a47cff3d3051cb64f GIT binary patch literal 6166 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 QcmCm<7+IVzHgJykAE0@{(f|Me literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/sample_activity.xml b/app/src/main/res/layout/sample_activity.xml index 9d42335..c495df6 100644 --- a/app/src/main/res/layout/sample_activity.xml +++ b/app/src/main/res/layout/sample_activity.xml @@ -19,6 +19,8 @@ android:contentDescription="@string/app_name" android:src="@drawable/logo_big" /> + + + + +