WIP

Author: wood1986

.gitignore

@@ -59,3 +59,5 @@ buck-out/
 
 # CocoaPods
 example/ios/Pods/
+
+.xcode.env

README.md

@@ -2,9 +2,9 @@
 
 See this [issue](https://github.com/react-native-datetimepicker/datetimepicker/issues/313).
 
-### Backers
+### Financial backers
 
-Support us with a monthly donation and help us continue our activities. [Become a backer on OpenCollective](https://opencollective.com/react-native-datetimepicker) or [sponsor us on GitHub Sponsors](https://github.com/sponsors/react-native-datetimepicker).
+Support us with a monthly donation to help us keep the module maintained. [Become a backer on OpenCollective](https://opencollective.com/react-native-datetimepicker) or [sponsor us on GitHub Sponsors](https://github.com/sponsors/react-native-datetimepicker).
 
 <a href="https://opencollective.com/react-native-datetimepicker/donate" target="_blank">
   <img src="https://opencollective.com/react-native-datetimepicker/backers.svg?width=890" width=890 />

android/src/main/java/com/reactcommunity/rndatetimepicker/Common.java

@@ -18,8 +18,13 @@
 import androidx.fragment.app.FragmentManager;
 
 import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReadableMap;
 
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.HashSet;
 import java.util.Locale;
+import java.util.TimeZone;
 
 public class Common {
 
@@ -28,6 +33,7 @@ public class Common {
   public static final String NEGATIVE = "negative";
   public static final String LABEL = "label";
   public static final String TEXT_COLOR = "textColor";
+  private static final HashSet TIMEZONE_IDS = new HashSet<>(Arrays.asList(TimeZone.getAvailableIDs()));
 
   public static void dismissDialog(FragmentActivity activity, String fragmentTag, Promise promise) {
     if (activity == null) {
@@ -63,21 +69,18 @@ public static int getDefaultDialogButtonTextColor(@NonNull Context activity) {
 
 	@NonNull
 	public static DialogInterface.OnShowListener setButtonTextColor(@NonNull final Context activityContext, final AlertDialog dialog, final Bundle args, final boolean needsColorOverride) {
-    return new DialogInterface.OnShowListener() {
-      @Override
-      public void onShow(DialogInterface dialogInterface) {
-        // change text color only if custom color is set or if spinner mode is set
-        // because spinner suffers from https://github.com/react-native-datetimepicker/datetimepicker/issues/543
-
-        Button positiveButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
-        Button negativeButton = dialog.getButton(AlertDialog.BUTTON_NEGATIVE);
-        Button neutralButton = dialog.getButton(AlertDialog.BUTTON_NEUTRAL);
-
-        int textColorPrimary = getDefaultDialogButtonTextColor(activityContext);
-        setTextColor(positiveButton, POSITIVE, args, needsColorOverride, textColorPrimary);
-        setTextColor(negativeButton, NEGATIVE, args, needsColorOverride, textColorPrimary);
-        setTextColor(neutralButton, NEUTRAL, args, needsColorOverride, textColorPrimary);
-      }
+    return dialogInterface -> {
+      // change text color only if custom color is set or if spinner mode is set
+      // because spinner suffers from https://github.com/react-native-datetimepicker/datetimepicker/issues/543
+
+      Button positiveButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
+      Button negativeButton = dialog.getButton(AlertDialog.BUTTON_NEGATIVE);
+      Button neutralButton = dialog.getButton(AlertDialog.BUTTON_NEUTRAL);
+
+      int textColorPrimary = getDefaultDialogButtonTextColor(activityContext);
+      setTextColor(positiveButton, POSITIVE, args, needsColorOverride, textColorPrimary);
+      setTextColor(negativeButton, NEGATIVE, args, needsColorOverride, textColorPrimary);
+      setTextColor(neutralButton, NEUTRAL, args, needsColorOverride, textColorPrimary);
     };
 	}
 
@@ -139,4 +142,67 @@ private static void setButtonLabel(Bundle buttonConfig, AlertDialog dialog, int
     }
     dialog.setButton(whichButton, buttonConfig.getString(LABEL), listener);
   }
+
+  public static TimeZone getTimeZone(Bundle args) {
+    if (args != null && args.containsKey(RNConstants.ARG_TZOFFSET_MINS)) {
+      final String[] ids = TimeZone.getAvailableIDs(args.getInt(RNConstants.ARG_TZOFFSET_MINS) * 60 * 1000);
+      if (ids.length > 0) {
+        return TimeZone.getTimeZone(ids[0]);
+      }
+    }
+
+    if (args != null && args.containsKey(RNConstants.ARG_TZ_NAME)) {
+      String timeZoneName = args.getString(RNConstants.ARG_TZ_NAME);
+      if (TIMEZONE_IDS.contains(timeZoneName)) {
+        return TimeZone.getTimeZone(timeZoneName);
+      }
+    }
+
+    return TimeZone.getDefault();
+  }
+
+  public static long clamp(final long value, final long min, final long max) {
+    return Math.min(Math.max(value, min), max);
+  }
+
+  public static long maxDateWithTimeZone(Bundle args) {
+    if (!args.containsKey(RNConstants.ARG_MAXDATE)) {
+      return Long.MAX_VALUE;
+    }
+
+    Calendar maxDate = Calendar.getInstance(getTimeZone(args));
+    maxDate.setTimeInMillis(args.getLong(RNConstants.ARG_MAXDATE));
+    maxDate.set(Calendar.HOUR_OF_DAY, 23);
+    maxDate.set(Calendar.MINUTE, 59);
+    maxDate.set(Calendar.SECOND, 59);
+    maxDate.set(Calendar.MILLISECOND, 999);
+    return maxDate.getTimeInMillis();
+  }
+
+  public static long minDateWithTimeZone(Bundle args) {
+    if (!args.containsKey(RNConstants.ARG_MINDATE)) {
+      return 0;
+    }
+
+    Calendar minDate = Calendar.getInstance(getTimeZone(args));
+    minDate.setTimeInMillis(args.getLong(RNConstants.ARG_MINDATE));
+    minDate.set(Calendar.HOUR_OF_DAY, 0);
+    minDate.set(Calendar.MINUTE, 0);
+    minDate.set(Calendar.SECOND, 0);
+    minDate.set(Calendar.MILLISECOND, 0);
+    return minDate.getTimeInMillis();
+  }
+
+  public static Bundle createFragmentArguments(ReadableMap options) {
+    final Bundle args = new Bundle();
+
+    if (options.hasKey(RNConstants.ARG_VALUE) && !options.isNull(RNConstants.ARG_VALUE)) {
+      args.putLong(RNConstants.ARG_VALUE, (long) options.getDouble(RNConstants.ARG_VALUE));
+    }
+    if (options.hasKey(RNConstants.ARG_TZ_NAME) && !options.isNull(RNConstants.ARG_TZ_NAME)) {
+      args.putString(RNConstants.ARG_TZ_NAME, options.getString(RNConstants.ARG_TZ_NAME));
+    }
+
+    return args;
+  }
 }

android/src/main/java/com/reactcommunity/rndatetimepicker/DatePickerModule.java

@@ -22,8 +22,6 @@
 import com.facebook.react.module.annotations.ReactModule;
 
 import static com.reactcommunity.rndatetimepicker.Common.dismissDialog;
-import static com.reactcommunity.rndatetimepicker.KeepDateInRangeListener.isDateAfterMaxDate;
-import static com.reactcommunity.rndatetimepicker.KeepDateInRangeListener.isDateBeforeMinDate;
 
 import java.util.Calendar;
 
@@ -41,8 +39,9 @@ public DatePickerModule(ReactApplicationContext reactContext) {
     super(reactContext);
   }
 
+  @NonNull
   @Override
-  public @NonNull String getName() {
+  public String getName() {
     return NAME;
   }
 
@@ -60,38 +59,21 @@ public DatePickerDialogListener(final Promise promise, Bundle arguments) {
     @Override
     public void onDateSet(DatePicker view, int year, int month, int day) {
       if (!mPromiseResolved && getReactApplicationContext().hasActiveReactInstance()) {
+        final RNDate date = new RNDate(mArgs);
+        Calendar calendar = Calendar.getInstance(Common.getTimeZone(mArgs));
+        calendar.set(year, month, day, date.hour(), date.minute(), 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
         WritableMap result = new WritableNativeMap();
         result.putString("action", RNConstants.ACTION_DATE_SET);
-        result.putInt("year", year);
-        result.putInt("month", month);
-        result.putInt("day", day);
-
-        // https://issuetracker.google.com/issues/169602180
-        // TODO revisit day, month, year with timezoneoffset fixes
-        if (isDateAfterMaxDate(mArgs, year, month, day)) {
-          Calendar maxDate = Calendar.getInstance();
-          maxDate.setTimeInMillis(mArgs.getLong(RNConstants.ARG_MAXDATE));
-
-          result.putInt("year", maxDate.get(Calendar.YEAR));
-          result.putInt("month", maxDate.get(Calendar.MONTH) );
-          result.putInt("day", maxDate.get(Calendar.DAY_OF_MONTH));
-        }
-
-        if (isDateBeforeMinDate(mArgs, year, month, day)) {
-          Calendar minDate = Calendar.getInstance();
-          minDate.setTimeInMillis(mArgs.getLong(RNConstants.ARG_MINDATE));
-
-          result.putInt("year", minDate.get(Calendar.YEAR));
-          result.putInt("month", minDate.get(Calendar.MONTH) );
-          result.putInt("day", minDate.get(Calendar.DAY_OF_MONTH));
-        }
+        result.putDouble("timestamp", calendar.getTimeInMillis());
 
         mPromise.resolve(result);
         mPromiseResolved = true;
       }
     }
 
-    @Override
+        @Override
     public void onDismiss(DialogInterface dialog) {
       if (!mPromiseResolved && getReactApplicationContext().hasActiveReactInstance()) {
         WritableMap result = new WritableNativeMap();
@@ -154,35 +136,32 @@ public void open(final ReadableMap options, final Promise promise) {
 
     final FragmentManager fragmentManager = activity.getSupportFragmentManager();
 
-    UiThreadUtil.runOnUiThread(new Runnable() {
-      @Override
-      public void run() {
-        RNDatePickerDialogFragment oldFragment =
-                (RNDatePickerDialogFragment) fragmentManager.findFragmentByTag(NAME);
+    UiThreadUtil.runOnUiThread(() -> {
+      RNDatePickerDialogFragment oldFragment =
+              (RNDatePickerDialogFragment) fragmentManager.findFragmentByTag(NAME);
 
-        if (oldFragment != null) {
-          oldFragment.update(createFragmentArguments(options));
-          return;
-        }
+      Bundle arguments = createFragmentArguments(options);
 
-        RNDatePickerDialogFragment fragment = new RNDatePickerDialogFragment();
+      if (oldFragment != null) {
+        oldFragment.update(arguments);
+        return;
+      }
 
-        fragment.setArguments(createFragmentArguments(options));
+      RNDatePickerDialogFragment fragment = new RNDatePickerDialogFragment();
 
-        final DatePickerDialogListener listener = new DatePickerDialogListener(promise, createFragmentArguments(options));
-        fragment.setOnDismissListener(listener);
-        fragment.setOnDateSetListener(listener);
-        fragment.setOnNeutralButtonActionListener(listener);
-        fragment.show(fragmentManager, NAME);
-      }
+      fragment.setArguments(arguments);
+
+      final DatePickerDialogListener listener = new DatePickerDialogListener(promise, arguments);
+      fragment.setOnDismissListener(listener);
+      fragment.setOnDateSetListener(listener);
+      fragment.setOnNeutralButtonActionListener(listener);
+      fragment.show(fragmentManager, NAME);
     });
   }
 
   private Bundle createFragmentArguments(ReadableMap options) {
-    final Bundle args = new Bundle();
-    if (options.hasKey(RNConstants.ARG_VALUE) && !options.isNull(RNConstants.ARG_VALUE)) {
-      args.putLong(RNConstants.ARG_VALUE, (long) options.getDouble(RNConstants.ARG_VALUE));
-    }
+    final Bundle args = Common.createFragmentArguments(options);
+
     if (options.hasKey(RNConstants.ARG_MINDATE) && !options.isNull(RNConstants.ARG_MINDATE)) {
       args.putLong(RNConstants.ARG_MINDATE, (long) options.getDouble(RNConstants.ARG_MINDATE));
     }
@@ -195,9 +174,7 @@ private Bundle createFragmentArguments(ReadableMap options) {
     if (options.hasKey(RNConstants.ARG_DIALOG_BUTTONS) && !options.isNull(RNConstants.ARG_DIALOG_BUTTONS)) {
       args.putBundle(RNConstants.ARG_DIALOG_BUTTONS, Arguments.toBundle(options.getMap(RNConstants.ARG_DIALOG_BUTTONS)));
     }
-    if (options.hasKey(RNConstants.ARG_TZOFFSET_MINS) && !options.isNull(RNConstants.ARG_TZOFFSET_MINS)) {
-      args.putLong(RNConstants.ARG_TZOFFSET_MINS, (long) options.getDouble(RNConstants.ARG_TZOFFSET_MINS));
-    }
+
     return args;
   }
 }

android/src/main/java/com/reactcommunity/rndatetimepicker/KeepDateInRangeListener.java

@@ -12,6 +12,7 @@ public final class RNConstants {
   public static final String ARG_DISPLAY = "display";
   public static final String ARG_DIALOG_BUTTONS = "dialogButtons";
   public static final String ARG_TZOFFSET_MINS = "timeZoneOffsetInMinutes";
+  public static final String ARG_TZ_NAME = "timeZoneName";
   public static final String ACTION_DATE_SET = "dateSetAction";
   public static final String ACTION_TIME_SET = "timeSetAction";
   public static final String ACTION_DISMISSED = "dismissedAction";

android/src/main/java/com/reactcommunity/rndatetimepicker/RNConstants.java

@@ -11,21 +11,14 @@ public RNDate(Bundle args) {
     now = Calendar.getInstance();
 
     if (args != null && args.containsKey(RNConstants.ARG_VALUE)) {
-      set(args.getLong(RNConstants.ARG_VALUE));
+      now.setTimeInMillis((args.getLong(RNConstants.ARG_VALUE)));
     }
 
-    if (args != null && args.containsKey(RNConstants.ARG_TZOFFSET_MINS)) {
-      now.setTimeZone(TimeZone.getTimeZone("GMT"));
-      Long timeZoneOffsetInMinutesFallback = args.getLong(RNConstants.ARG_TZOFFSET_MINS);
-      Integer timeZoneOffsetInMinutes = args.getInt(RNConstants.ARG_TZOFFSET_MINS, timeZoneOffsetInMinutesFallback.intValue());
-      now.add(Calendar.MILLISECOND, timeZoneOffsetInMinutes * 60000);
+    if (args != null && args.containsKey(RNConstants.ARG_TZ_NAME)) {
+      now.setTimeZone(Common.getTimeZone(args));
     }
   }
 
-  public void set(long value) {
-    now.setTimeInMillis(value);
-  }
-
   public int year() { return now.get(Calendar.YEAR); }
   public int month() { return now.get(Calendar.MONTH); }
   public int day() { return now.get(Calendar.DAY_OF_MONTH); }