diff --git a/.idea/misc.xml b/.idea/misc.xml index 299e423..b3ebd66 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -39,7 +39,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index abcbe87..3d01eff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion 28 - // buildToolsVersion '28.0.3' defaultConfig { applicationId "com.maple.iosdialog" @@ -17,6 +16,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { diff --git a/app/src/main/java/com/maple/iosdialog/MainActivity.java b/app/src/main/java/com/maple/iosdialog/MainActivity.java index 3628a9a..c4cd2d3 100644 --- a/app/src/main/java/com/maple/iosdialog/MainActivity.java +++ b/app/src/main/java/com/maple/iosdialog/MainActivity.java @@ -6,7 +6,6 @@ import android.os.Bundle; import android.text.TextUtils; import android.view.View; -import android.widget.NumberPicker; import android.widget.Toast; import com.maple.msdialog.ActionSheetDialog; @@ -39,13 +38,7 @@ public void asMessage(View view) { .setCancelable(false) .setCanceledOnTouchOutside(false) .setTitle("清空消息列表后，聊天记录依然保留，确定要清空消息列表？") - .addSheetItem("清空消息列表", Color.parseColor(DEF_RED), - new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - showToast("clear msg list"); - } - }) + .addSheetItem("清空消息列表", Color.parseColor(DEF_RED), which -> showToast("clear msg list")) .setCancelText("取 消") .show(); } @@ -54,48 +47,18 @@ public void asImage(View view) { new ActionSheetDialog(mContext) .setCancelable(false) .setCanceledOnTouchOutside(false) - .addSheetItem("发送给好友", Color.parseColor(DEF_BLUE), - new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - - } - }) - .addSheetItem("转载到空间相册", Color.parseColor(DEF_BLUE), - new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - - } - }) - .addSheetItem("上传到群相册", - new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - - } - }) - .addSheetItem("保存到手机", - new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - - } - }) - .addSheetItem("收藏", - new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - - } - }) - .addSheetItem("查看聊天图片", - new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - - } - }) + .addSheetItem("发送给好友", Color.parseColor(DEF_BLUE), index -> { + }) + .addSheetItem("转载到空间相册", Color.parseColor(DEF_BLUE), index -> { + }) + .addSheetItem("上传到群相册", index -> { + }) + .addSheetItem("保存到手机", index -> { + }) + .addSheetItem("收藏", index -> { + }) + .addSheetItem("查看聊天图片", which -> { + }) .show(); } @@ -104,66 +67,16 @@ public void asList(View view) { .setTitle("请选择操作") .setCancelable(false) .setCanceledOnTouchOutside(false) - .addSheetItem("条目一", Color.parseColor(DEF_RED), new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - showToast("item " + which); - } - }) - .addSheetItem("条目二", new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - showToast("item " + which); - } - }) - .addSheetItem("条目三", Color.BLUE, new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - showToast("item " + which); - } - }) - .addSheetItem("条目四", Color.CYAN, new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - showToast("item " + which); - } - }) - .addSheetItem("条目五", new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - showToast("item " + which); - } - }) - .addSheetItem("条目六", new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - showToast("item " + which); - } - }) - .addSheetItem("条目七", new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - showToast("item " + which); - } - }) - .addSheetItem("条目八", new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - showToast("item " + which); - } - }) - .addSheetItem("条目九", new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - showToast("item " + which); - } - }) - .addSheetItem("条目十", new ActionSheetDialog.OnSheetItemClickListener() { - @Override - public void onClick(int which) { - showToast("item " + which); - } - }).show(); + .addSheetItem("条目一", Color.parseColor(DEF_RED), which -> showToast("item " + which)) + .addSheetItem("条目二", which -> showToast("item " + which)) + .addSheetItem("条目三", Color.BLUE, which -> showToast("item " + which)) + .addSheetItem("条目四", Color.CYAN, which -> showToast("item " + which)) + .addSheetItem("条目五", which -> showToast("item " + which)) + .addSheetItem("条目六", which -> showToast("item " + which)) + .addSheetItem("条目七", which -> showToast("item " + which)) + .addSheetItem("条目八", which -> showToast("item " + which)) + .addSheetItem("条目九", which -> showToast("item " + which)) + .addSheetItem("条目十", which -> showToast("item " + which)).show(); } // ------------------------------------ Alert Dialog ------------------------------------------- @@ -174,12 +87,7 @@ public void adOne(View view) { .setTitle("退出当前账号") .setMessage("再连续登陆15天，就可变身为QQ达人。退出QQ可能会使你现有记录归零，确定退出？") .setLeftButton("取消", null) - .setRightButton("确认退出", new View.OnClickListener() { - @Override - public void onClick(View v) { - showToast("exit"); - } - }) + .setRightButton("确认退出", v -> showToast("exit")) .show(); } @@ -188,12 +96,7 @@ public void adTwo(View view) { .setCancelable(true) .setScaleWidth(0.7)// 设置宽度，占屏幕宽度百分比 .setMessage("你现在无法接收到新消息提醒。请到系统-设置-通知中开启消息提醒") - .setRightButton("确定", new View.OnClickListener() { - @Override - public void onClick(View v) { - showToast("OK"); - } - }) + .setRightButton("确定", v -> showToast("OK")) .show(); } @@ -204,27 +107,18 @@ public void aeOne(View view) { .setTitle("姓名") .setMessage("请输入您的真实姓名。") .setLeftButton("取消", null) - .setRightButton("确定", new AlertEditDialog.EditTextCallListener() { - @Override - public void callBack(String str) { - showToast(str); - } - }) + .setRightButton("确定", str -> showToast(str)) .show(); } public void aeTwo(View view) { new AlertEditDialog(mContext) .setMessage("给自己起一个好听的名字吧") - .setRightButton("确定", new AlertEditDialog.EditTextCallListener() { - @Override - public void callBack(String str) { - if (!TextUtils.isEmpty(str)) { - showToast(str); - } - } - } - ) + .setRightButton("确定", str -> { + if (!TextUtils.isEmpty(str)) { + showToast(str); + } + }) .show(); } @@ -240,19 +134,9 @@ public void npOne(View view) { defValue = numbers[index]; new AlertNumberPickerDialog(mContext) .setTitle("Number") - .setNumberValues(numbers, index, new NumberPicker.OnValueChangeListener() { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - defValue = numbers[newVal]; - } - }) + .setNumberValues(numbers, index, (picker, oldVal, newVal) -> defValue = numbers[newVal]) .setLeftButton("Cancel", null) - .setRightButton("OK", new View.OnClickListener() { - @Override - public void onClick(View v) { - showToast(defValue); - } - }) + .setRightButton("OK", v -> showToast(defValue)) .show(); } @@ -264,20 +148,10 @@ public void npTwo(View view) { .setScaleWidth(0.8) .setCancelable(false) .setTitle("选择城市") - .setNumberValues(numbers, index, new NumberPicker.OnValueChangeListener() { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - defValue = numbers[newVal]; - } - }) + .setNumberValues(numbers, index, (picker, oldVal, newVal) -> defValue = numbers[newVal]) .setNumberValueSuffix("市") .setLeftButton("取消", null) - .setRightButton("确定", new View.OnClickListener() { - @Override - public void onClick(View v) { - showToast(defValue); - } - }) + .setRightButton("确定", v -> showToast(defValue)) .show(); } diff --git a/msdialog/src/main/java/com/maple/msdialog/ActionSheetDialog.java b/msdialog/src/main/java/com/maple/msdialog/ActionSheetDialog.java index 06f726a..58e34e6 100644 --- a/msdialog/src/main/java/com/maple/msdialog/ActionSheetDialog.java +++ b/msdialog/src/main/java/com/maple/msdialog/ActionSheetDialog.java @@ -206,7 +206,7 @@ public void show() { // ---------------------------------------------------------------------------------------------------- public interface OnSheetItemClickListener { - void onClick(int which); + void onClick(int index); } public class SheetItem { diff --git a/msdialog/src/main/java/com/maple/msdialog/BaseDialog.java b/msdialog/src/main/java/com/maple/msdialog/BaseDialog.java index 54c855e..68decea 100644 --- a/msdialog/src/main/java/com/maple/msdialog/BaseDialog.java +++ b/msdialog/src/main/java/com/maple/msdialog/BaseDialog.java @@ -11,7 +11,7 @@ /** * @author maple - * @time 17/4/6 + * @time 2017/4/6 */ public class BaseDialog { public Context mContext;