deprecate previous handler that not contains negative param

Author: fchauveau

library/src/main/java/com/codetroopers/betterpickers/hmspicker/HmsPickerBuilder.java

@@ -19,6 +19,7 @@ public class HmsPickerBuilder {
     private Fragment targetFragment;
     private int mReference;
     private Vector<HmsPickerDialogHandler> mHmsPickerDialogHandlers = new Vector<HmsPickerDialogHandler>();
+    private Vector<HmsPickerDialogFragment.HmsPickerDialogHandlerV2> mHmsPickerDialogHandlerV2s = new Vector<HmsPickerDialogFragment.HmsPickerDialogHandlerV2>();
     private int mHours;
     private int mMinutes;
     private int mSeconds;
@@ -84,6 +85,32 @@ public HmsPickerBuilder setReference(int reference) {
         return this;
     }
 
+    /**
+     * @param handler an Object implementing the appropriate Picker Handler
+     * @return the current Builder object
+     * @Deprecated : use HmsPickerDialogHandlerV2 that return negative/positive status
+     * <p/>
+     * Attach universal objects as additional handlers for notification when the Picker is set. For most use cases, this
+     * method is not necessary as attachment to an Activity or Fragment is done automatically.  If, however, you would
+     * like additional objects to subscribe to this Picker being set, attach Handlers here.
+     */
+    public HmsPickerBuilder addHmsPickerDialogHandler(HmsPickerDialogHandler handler) {
+        this.mHmsPickerDialogHandlers.add(handler);
+        return this;
+    }
+
+    /**
+     * @param handler the Object to remove
+     * @return the current Builder object
+     * @Deprecated : use HmsPickerDialogHandlerV2 that return negative/positive status
+     * <p/>
+     * Remove objects previously added as handlers.
+     */
+    public HmsPickerBuilder removeHmsPickerDialogHandler(HmsPickerDialogHandler handler) {
+        this.mHmsPickerDialogHandlers.remove(handler);
+        return this;
+    }
+
     /**
      * Attach universal objects as additional handlers for notification when the Picker is set. For most use cases, this
      * method is not necessary as attachment to an Activity or Fragment is done automatically.  If, however, you would
@@ -92,8 +119,8 @@ public HmsPickerBuilder setReference(int reference) {
      * @param handler an Object implementing the appropriate Picker Handler
      * @return the current Builder object
      */
-    public HmsPickerBuilder addHmsPickerDialogHandler(HmsPickerDialogHandler handler) {
-        this.mHmsPickerDialogHandlers.add(handler);
+    public HmsPickerBuilder addHmsPickerDialogHandler(HmsPickerDialogFragment.HmsPickerDialogHandlerV2 handler) {
+        this.mHmsPickerDialogHandlerV2s.add(handler);
         return this;
     }
 
@@ -103,15 +130,15 @@ public HmsPickerBuilder addHmsPickerDialogHandler(HmsPickerDialogHandler handler
      * @param handler the Object to remove
      * @return the current Builder object
      */
-    public HmsPickerBuilder removeHmsPickerDialogHandler(HmsPickerDialogHandler handler) {
-        this.mHmsPickerDialogHandlers.remove(handler);
+    public HmsPickerBuilder removeHmsPickerDialogHandler(HmsPickerDialogFragment.HmsPickerDialogHandlerV2 handler) {
+        this.mHmsPickerDialogHandlerV2s.remove(handler);
         return this;
     }
 
     /**
      * Set some initial values for the picker
      *
-     * @param hours the initial hours value
+     * @param hours   the initial hours value
      * @param minutes the initial minutes value
      * @param seconds the initial seconds value
      * @return the current Builder object
@@ -168,6 +195,7 @@ public void show() {
             fragment.setTargetFragment(targetFragment, 0);
         }
         fragment.setHmsPickerDialogHandlers(mHmsPickerDialogHandlers);
+        fragment.setHmsPickerDialogHandlersV2(mHmsPickerDialogHandlerV2s);
 
         if ((mHours | mMinutes | mSeconds) != 0) {
             fragment.setTime(mHours, mMinutes, mSeconds);

library/src/main/java/com/codetroopers/betterpickers/hmspicker/HmsPickerDialogFragment.java

@@ -30,7 +30,9 @@ public class HmsPickerDialogFragment extends DialogFragment {
     private int mTheme = -1;
     private ColorStateList mTextColor;
     private int mDialogBackgroundResId;
+    @Deprecated
     private Vector<HmsPickerDialogHandler> mHmsPickerDialogHandlers = new Vector<HmsPickerDialogHandler>();
+    private Vector<HmsPickerDialogHandlerV2> mHmsPickerDialogHandlerV2s = new Vector<HmsPickerDialogHandlerV2>();
     private int mHours;
     private int mMinutes;
     private int mSeconds;
@@ -112,6 +114,10 @@ public void onClick(View view) {
                 for (HmsPickerDialogHandler handler : mHmsPickerDialogHandlers) {
                     handler.onDialogHmsSet(mReference, mPicker.getHours(), mPicker.getMinutes(), mPicker.getSeconds());
                 }
+                for (HmsPickerDialogHandlerV2 handler : mHmsPickerDialogHandlerV2s) {
+                    handler.onDialogHmsSet(mReference, mPicker.isNegative(), mPicker.getHours(), mPicker.getMinutes(), mPicker.getSeconds());
+                }
+
                 final Activity activity = getActivity();
                 final Fragment fragment = getTargetFragment();
 
@@ -156,22 +162,34 @@ public interface HmsPickerDialogHandlerV2 {
     }
 
     /**
+     * @Deprecated : use HmsPickerDialogHandlerV2 that return negative/positive status
      * This interface allows objects to register for the Picker's set action.
      */
+    @Deprecated
     public interface HmsPickerDialogHandler {
 
+        @Deprecated
         void onDialogHmsSet(int reference, int hours, int minutes, int seconds);
     }
 
     /**
-     * Attach a Vector of handlers to be notified in addition to the Fragment's Activity and target Fragment.
-     *
      * @param handlers a Vector of handlers
+     * @Deprecated : use HmsPickerDialogHandlerV2 that return negative/positive status
+     * Attach a Vector of handlers to be notified in addition to the Fragment's Activity and target Fragment.
      */
+    @Deprecated
     public void setHmsPickerDialogHandlers(Vector<HmsPickerDialogHandler> handlers) {
         mHmsPickerDialogHandlers = handlers;
     }
 
+    /**
+     * @param handlers a Vector of handlers
+     * Attach a Vector of handlers to be notified in addition to the Fragment's Activity and target Fragment.
+     */
+    public void setHmsPickerDialogHandlersV2(Vector<HmsPickerDialogHandlerV2> handlers) {
+        mHmsPickerDialogHandlerV2s = handlers;
+    }
+
     public void setTime(int hours, int minutes, int seconds) {
         this.mHours = hours;
         this.mMinutes = minutes;

sample/src/main/AndroidManifest.xml

@@ -265,7 +265,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.hmspicker.SampleHmsBasicNegativeDurationUsage"
+            android:name=".activity.hmspicker.SampleHmsNegativeDurationUsage"
             android:label="HMS/Negative Duration">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

sample/src/main/java/com/codetroopers/betterpickers/sample/activity/hmspicker/SampleHmsBasicUsage.java

@@ -13,7 +13,7 @@
 /**
  * User: derek Date: 3/17/13 Time: 3:59 PM
  */
-public class SampleHmsBasicUsage extends BaseSampleActivity implements HmsPickerDialogFragment.HmsPickerDialogHandler {
+public class SampleHmsBasicUsage extends BaseSampleActivity implements HmsPickerDialogFragment.HmsPickerDialogHandlerV2 {
 
     private TextView mResultTextView;
 
@@ -39,7 +39,7 @@ public void onClick(View v) {
     }
 
     @Override
-    public void onDialogHmsSet(int reference, int hours, int minutes, int seconds) {
-        mResultTextView.setText(getString(R.string.hms_picker_result_value_multiline, hours, minutes, seconds));
+    public void onDialogHmsSet(int reference, boolean isNegative, int hours, int minutes, int seconds) {
+        mResultTextView.setText(getString(R.string.hms_picker_result_value_multiline, hours, minutes, seconds, isNegative));
     }
 }

sample/src/main/java/com/codetroopers/betterpickers/sample/activity/hmspicker/SampleHmsListAdapter.java

@@ -33,7 +33,7 @@ public void onCreate(Bundle savedInstanceState) {
         list.setAdapter(new SampleAdapter(this, getSupportFragmentManager()));
     }
 
-    private class SampleAdapter extends BaseAdapter implements HmsPickerDialogFragment.HmsPickerDialogHandler {
+    private class SampleAdapter extends BaseAdapter implements HmsPickerDialogFragment.HmsPickerDialogHandlerV2 {
 
         private ArrayList<Hms> mHmses;
         private LayoutInflater mInflater;
@@ -115,7 +115,7 @@ public void onClick(View v) {
         }
 
         @Override
-        public void onDialogHmsSet(int reference, int hours, int minutes, int seconds) {
+        public void onDialogHmsSet(int reference, boolean isNegative, int hours, int minutes, int seconds) {
             Hms hms = new Hms();
             hms.hours = hours;
             hms.minutes = minutes;

sample/src/main/java/com/codetroopers/betterpickers/sample/activity/hmspicker/SampleHmsMultipleHandlers.java

@@ -14,8 +14,7 @@
 /**
  * User: derek Date: 3/17/13 Time: 3:59 PM
  */
-public class SampleHmsMultipleHandlers extends BaseSampleActivity
-        implements HmsPickerDialogFragment.HmsPickerDialogHandler {
+public class SampleHmsMultipleHandlers extends BaseSampleActivity implements HmsPickerDialogFragment.HmsPickerDialogHandlerV2 {
 
     private TextView mResultTextView;
 
@@ -51,7 +50,7 @@ public void onDialogHmsSet(int reference, int hours, int minutes, int seconds) {
     }
 
     @Override
-    public void onDialogHmsSet(int reference, int hours, int minutes, int seconds) {
-        mResultTextView.setText(getString(R.string.hms_picker_result_value_multiline, hours, minutes, seconds));
+    public void onDialogHmsSet(int reference, boolean isNegative, int hours, int minutes, int seconds) {
+        mResultTextView.setText(getString(R.string.hms_picker_result_value_multiline, hours, minutes, seconds, isNegative));
     }
 }

sample/src/main/java/com/codetroopers/betterpickers/sample/activity/hmspicker/SampleHmsMultipleReferences.java

@@ -12,8 +12,7 @@
 /**
  * User: derek Date: 3/17/13 Time: 3:59 PM
  */
-public class SampleHmsMultipleReferences extends BaseSampleActivity
-        implements HmsPickerDialogFragment.HmsPickerDialogHandler {
+public class SampleHmsMultipleReferences extends BaseSampleActivity implements HmsPickerDialogFragment.HmsPickerDialogHandlerV2 {
 
     private static final int BUTTON_ONE_REFERENCE = 0;
     private static final int BUTTON_TWO_REFERENCE = 1;
@@ -82,7 +81,7 @@ public void onClick(View v) {
     }
 
     @Override
-    public void onDialogHmsSet(int reference, int hours, int minutes, int seconds) {
+    public void onDialogHmsSet(int reference, boolean isNegative, int hours, int minutes, int seconds) {
         Button buttonToSet;
         switch (reference) {
             case BUTTON_ONE_REFERENCE:

sample/src/main/java/com/codetroopers/betterpickers/sample/activity/hmspicker/SampleHmsBasicNegativeDurationUsage.java renamed to sample/src/main/java/com/codetroopers/betterpickers/sample/activity/hmspicker/SampleHmsNegativeDurationUsage.java

@@ -13,7 +13,7 @@
 /**
  * User: derek Date: 3/17/13 Time: 3:59 PM
  */
-public class SampleHmsBasicNegativeDurationUsage extends BaseSampleActivity implements HmsPickerDialogFragment.HmsPickerDialogHandlerV2 {
+public class SampleHmsNegativeDurationUsage extends BaseSampleActivity implements HmsPickerDialogFragment.HmsPickerDialogHandlerV2 {
 
     private TextView mResultTextView;
 
@@ -41,7 +41,7 @@ public void onClick(View v) {
 
     @Override
     public void onDialogHmsSet(int reference, boolean isNegative, int hours, int minutes, int seconds) {
-        mResultTextView.setText(getString(R.string.hms_picker_result_value_multiline, (isNegative ? -1 : 1) * hours, (isNegative ? -1 : 1) * minutes, (isNegative ? -1 : 1) * seconds));
+        mResultTextView.setText(getString(R.string.hms_picker_result_value_multiline, hours, minutes, seconds, isNegative));
     }
 
 }

sample/src/main/java/com/codetroopers/betterpickers/sample/activity/hmspicker/SampleHmsThemeCustom.java

@@ -13,8 +13,7 @@
 /**
  * User: derek Date: 3/17/13 Time: 3:59 PM
  */
-public class SampleHmsThemeCustom extends BaseSampleActivity
-        implements HmsPickerDialogFragment.HmsPickerDialogHandler {
+public class SampleHmsThemeCustom extends BaseSampleActivity implements HmsPickerDialogFragment.HmsPickerDialogHandlerV2 {
 
     private TextView mResultTextView;
 
@@ -40,7 +39,7 @@ public void onClick(View v) {
     }
 
     @Override
-    public void onDialogHmsSet(int reference, int hours, int minutes, int seconds) {
-        mResultTextView.setText(getString(R.string.hms_picker_result_value_multiline, hours, minutes, seconds));
+    public void onDialogHmsSet(int reference, boolean isNegative, int hours, int minutes, int seconds) {
+        mResultTextView.setText(getString(R.string.hms_picker_result_value_multiline, hours, minutes, seconds, isNegative));
     }
 }

sample/src/main/java/com/codetroopers/betterpickers/sample/activity/hmspicker/SampleHmsThemeLight.java

@@ -13,8 +13,7 @@
 /**
  * User: derek Date: 3/17/13 Time: 3:59 PM
  */
-public class SampleHmsThemeLight extends BaseSampleActivity
-        implements HmsPickerDialogFragment.HmsPickerDialogHandler {
+public class SampleHmsThemeLight extends BaseSampleActivity implements HmsPickerDialogFragment.HmsPickerDialogHandlerV2 {
 
     private TextView mResultTextView;
 
@@ -40,7 +39,7 @@ public void onClick(View v) {
     }
 
     @Override
-    public void onDialogHmsSet(int reference, int hours, int minutes, int seconds) {
-        mResultTextView.setText(getString(R.string.hms_picker_result_value_multiline, hours, minutes, seconds));
+    public void onDialogHmsSet(int reference, boolean isNegative, int hours, int minutes, int seconds) {
+        mResultTextView.setText(getString(R.string.hms_picker_result_value_multiline, hours, minutes, seconds, isNegative));
     }
 }