From 11c5f2da4c9e869682482cd1b9a960e3cc7391bc Mon Sep 17 00:00:00 2001 From: Maple Shao <939078792@qq.com> Date: Thu, 6 Dec 2018 15:42:43 +0800 Subject: [PATCH] add AlertNumberPickerDialog. --- .idea/inspectionProfiles/Project_Default.xml | 36 --- .idea/misc.xml | 8 +- .idea/vcs.xml | 2 +- app/build.gradle | 10 +- .../com/maple/iosdialog/MainActivity.java | 28 +++ app/src/main/res/layout/activity_main.xml | 42 ++-- build.gradle | 2 +- msdialog/build.gradle | 12 +- msdialog/src/main/AndroidManifest.xml | 10 +- .../java/com/maple/msdialog/AlertDialog.java | 8 +- .../com/maple/msdialog/AlertEditDialog.java | 4 +- .../msdialog/AlertNumberPickerDialog.java | 233 ++++++++++++++++++ .../java/com/maple/msdialog/BaseDialog.java | 11 +- .../drawable/actionsheet_middle_selector.xml | 18 +- .../drawable/actionsheet_single_selector.xml | 16 +- .../drawable/alertdialog_left_selector.xml | 12 +- .../drawable/alertdialog_right_selector.xml | 12 +- ...dialog_bg.xml => shape_alertdialog_bg.xml} | 6 +- .../res/layout/view_action_sheet_dialog.xml | 23 +- .../src/main/res/layout/view_alert_dialog.xml | 44 ++-- .../res/layout/view_alert_edit_dialog.xml | 50 ++-- .../res/layout/view_number_picker_dialog.xml | 84 +++++++ msdialog/src/main/res/values/strings.xml | 5 + 23 files changed, 495 insertions(+), 181 deletions(-) delete mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 msdialog/src/main/java/com/maple/msdialog/AlertNumberPickerDialog.java rename msdialog/src/main/res/drawable/{shap_alertdialog_bg.xml => shape_alertdialog_bg.xml} (53%) create mode 100644 msdialog/src/main/res/layout/view_number_picker_dialog.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 6560a98..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 99202cc..e0d5b93 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,22 +5,26 @@ diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index d3a648a..00e246b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '28.0.2' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.maple.iosdialog" minSdkVersion 19 - targetSdkVersion 26 - versionCode 10 - versionName "1.2.1" + targetSdkVersion 28 + versionCode 11 + versionName "1.2.2" } buildTypes { release { diff --git a/app/src/main/java/com/maple/iosdialog/MainActivity.java b/app/src/main/java/com/maple/iosdialog/MainActivity.java index e81101f..88653b9 100644 --- a/app/src/main/java/com/maple/iosdialog/MainActivity.java +++ b/app/src/main/java/com/maple/iosdialog/MainActivity.java @@ -6,11 +6,13 @@ 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; import com.maple.msdialog.AlertDialog; import com.maple.msdialog.AlertEditDialog; +import com.maple.msdialog.AlertNumberPickerDialog; /** * Custom Dialog Demo @@ -226,6 +228,32 @@ public void callBack(String str) { .show(); } + // --------------------------------- Number Picker Dialog ----------------------------------------- + String[] city = {"北京", "上海", "天津", "杭州", "苏州", "深圳"}; + String curSelect = city[0]; + + public void npOne(View view) { + new AlertNumberPickerDialog(mContext) + .setScaleWidth(0.8) + .setCancelable(false) + .setTitle("选择城市") + .setNumberValues(city, 2, new NumberPicker.OnValueChangeListener() { + @Override + public void onValueChange(NumberPicker picker, int oldVal, int newVal) { + curSelect = city[newVal]; + } + }) + .setNumberValueSuffix("市") + .setLeftButton("Cancel", null) + .setRightButton("OK", new View.OnClickListener() { + @Override + public void onClick(View v) { + showToast(curSelect); + } + }) + .show(); + + } // ----------------------------------- other methods ------------------------------------------- private void showToast(String msg) { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6ae6a0a..19f7ecf 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,8 +1,8 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="10dp"> + android:textSize="18sp" />