Added new option ShowPickerAfterRecurrencePicker

- added new option to set if the date/time picker should be shown after the recurrencepicker
chrisonline · Jan 17, 2017 · 18a1d65 · 18a1d65
1 parent 3297076
commit 18a1d65
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/sublimepickerlibrary/src/main/java/com/appeaser/sublimepickerlibrary/SublimePicker.java b/sublimepickerlibrary/src/main/java/com/appeaser/sublimepickerlibrary/SublimePicker.java
@@ -110,6 +110,8 @@ public class SublimePicker extends FrameLayout
     // Keeps the start date / time if only RecurrencePicker is used
     private Calendar startDateTime;
 
+    private boolean mShowPickerAfterRecurrencePicker;
+
     // Listener for recurrence picker
     private final SublimeRecurrencePicker.OnRepeatOptionSetListener mRepeatOptionSetListener = new SublimeRecurrencePicker.OnRepeatOptionSetListener() {
         @Override
@@ -121,7 +123,8 @@ public void onRepeatOptionSet(SublimeRecurrencePicker.RecurrenceOption option, S
 
         @Override
         public void onDone() {
-            if (mDatePickerEnabled || mTimePickerEnabled) {
+            if (mShowPickerAfterRecurrencePicker &&
+                    (mDatePickerEnabled || mTimePickerEnabled)) {
                 updateCurrentPicker();
                 updateDisplay();
             } else { /* No other picker is activated. Dismiss. */
@@ -572,6 +575,7 @@ private void processOptions() {
         mDatePickerEnabled = mOptions.isDatePickerActive();
         mTimePickerEnabled = mOptions.isTimePickerActive();
         mRecurrencePickerEnabled = mOptions.isRecurrencePickerActive();
+        mShowPickerAfterRecurrencePicker = mOptions.getShowPickerAfterRecurrencePicker();
 
         if (mDatePickerEnabled) {
             //int[] dateParams = mOptions.getDateParams();

diff --git a/...pickerlibrary/src/main/java/com/appeaser/sublimepickerlibrary/helpers/SublimeOptions.java b/...pickerlibrary/src/main/java/com/appeaser/sublimepickerlibrary/helpers/SublimeOptions.java
@@ -54,6 +54,7 @@ public enum Picker {DATE_PICKER, TIME_PICKER, REPEAT_OPTION_PICKER, INVALID}
     private long mMinDate = Long.MIN_VALUE, mMaxDate = Long.MIN_VALUE;
     private boolean mAnimateLayoutChanges, mIs24HourView;
     private int mFirstDayOfWeek = Calendar.SUNDAY;
+    private boolean mShowPickerAfterRecurrencePicker = true;
 
     private SublimeRecurrencePicker.RecurrenceOption mRecurrenceOption
             = SublimeRecurrencePicker.RecurrenceOption.DOES_NOT_REPEAT;
@@ -221,6 +222,22 @@ public SublimeOptions setRecurrenceParams(SublimeRecurrencePicker.RecurrenceOpti
         return this;
     }
 
+    /**
+     * set if the date or time picker should be shown after close of the recurrence picker
+     * @param mShowPickerAfterRecurrencePicker <code>false</code> if it should not be shown
+     */
+    public void setShowPickerAfterRecurrencePicker(boolean mShowPickerAfterRecurrencePicker) {
+        this.mShowPickerAfterRecurrencePicker = mShowPickerAfterRecurrencePicker;
+    }
+
+    /**
+     * get if the date / time picker should be shown after the recurrence picker
+     * @return true or false
+     */
+    public boolean getShowPickerAfterRecurrencePicker() {
+        return mShowPickerAfterRecurrencePicker;
+    }
+
     @SuppressWarnings("unused")
     public String getRecurrenceRule() {
         return mRecurrenceRule == null ?