Merge branch 'master' into ios-maestro

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
         with:
           node-version: 12
           registry-url: https://registry.npmjs.org/

.github/workflows/test-js.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
 
       - name: Install npm dependencies
         run: yarn install --frozen-lockfile

README.md

@@ -52,25 +52,33 @@ The second option is to use the inlined picker. Place it in a View or a custom m
 
 ## Installation
 
-1. Download package with npm or yarn
+1. Download package
 
-```
+```sh
+# npm
 npm install react-native-date-picker
-```
 
-```
+# yarn
 yarn add react-native-date-picker
+
+# pnpm
+pnpm add react-native-date-picker
 ```
 
-2. Install pods
+2. Install pods (skip for expo projects)
 
 ```
 cd ios && pod install
 ```
 
 3. Rebuild the project
 
-```
+```sh
+# expo projects
+npx expo run:android
+npx expo run:ios
+
+# non-expo projects
 npx react-native run-android
 npx react-native run-ios
 ```
@@ -195,7 +203,7 @@ This package supports automatic linking. Usually, the only thing you need to do
 
 ### How do i change the date order? (To YYYY-MM-DD etc)
 
-The order is determined by the `locale` prop. Set for instance `locale='fr'`to get the french preference.
+The order is determined by the `locale` prop. Set for instance `locale='fr'`to get the french preference. ⚠️ Setting the `locale` to a different id won't change the title, confirm button and cancel button texts language.
 
 ### How do i change the 12/24h or AM/PM format?
 

android/src/main/java/com/henninghall/date_picker/State.java

@@ -1,5 +1,7 @@
 package com.henninghall.date_picker;
 
+import android.util.Log;
+
 import com.facebook.react.bridge.Dynamic;
 import com.henninghall.date_picker.models.Is24HourSource;
 import com.henninghall.date_picker.models.Mode;
@@ -103,16 +105,21 @@ public Calendar getMaximumDate() {
     }
 
     public TimeZone getTimeZone() {
-        String offsetString = timezoneOffsetInMinutesProp.getValue();
-        if(offsetString == null || offsetString.equals("")) return TimeZone.getDefault();
-        int offset = Integer.parseInt(offsetString);
-        int totalOffsetMinutes = Math.abs(offset);
-        char offsetDirection = offset < 0 ? '-' : '+';
-        int offsetHours = (int) Math.floor(totalOffsetMinutes / 60f);
-        int offsetMinutes = totalOffsetMinutes - offsetHours * 60;
-        String timeZoneId = "GMT" + offsetDirection + offsetHours + ":" + Utils.toPaddedMinutes(offsetMinutes);
-        TimeZone zone = TimeZone.getTimeZone(timeZoneId);
-        return zone;
+        try{
+            String offsetString = timezoneOffsetInMinutesProp.getValue();
+            if(offsetString == null || offsetString.equals("")) return TimeZone.getDefault();
+            int offset = Integer.parseInt(offsetString);
+            int totalOffsetMinutes = Math.abs(offset);
+            char offsetDirection = offset < 0 ? '-' : '+';
+            int offsetHours = (int) Math.floor(totalOffsetMinutes / 60f);
+            int offsetMinutes = totalOffsetMinutes - offsetHours * 60;
+            String timeZoneId = "GMT" + offsetDirection + offsetHours + ":" + Utils.toPaddedMinutes(offsetMinutes);
+            TimeZone zone = TimeZone.getTimeZone(timeZoneId);
+            return zone;
+        } catch (Exception e){
+            e.printStackTrace();
+            return TimeZone.getDefault();
+        }
     }
 
     public String getIsoDate() {

examples/Rn073/.bundle/config

@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1

examples/Rn073/.eslintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: '@react-native',
+};

examples/Rn073/.gitignore

@@ -0,0 +1,67 @@
+# OSX
+#
+.DS_Store
+
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+ios/.xcode.env.local
+
+# Android/IntelliJ
+#
+build/
+.idea
+.gradle
+local.properties
+*.iml
+*.hprof
+.cxx/
+*.keystore
+!debug.keystore
+
+# node.js
+#
+node_modules/
+npm-debug.log
+yarn-error.log
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/
+
+**/fastlane/report.xml
+**/fastlane/Preview.html
+**/fastlane/screenshots
+**/fastlane/test_output
+
+# Bundle artifact
+*.jsbundle
+
+# Ruby / CocoaPods
+/ios/Pods/
+/vendor/bundle/
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
+
+# testing
+/coverage
+

examples/Rn073/.prettierrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  arrowParens: 'avoid',
+  bracketSameLine: true,
+  bracketSpacing: false,
+  singleQuote: true,
+  trailingComma: 'all',
+};

examples/Rn073/.watchmanconfig

@@ -0,0 +1 @@
+{}

examples/Rn073/App.tsx

@@ -0,0 +1,120 @@
+/**
+ * Sample React Native App
+ * https://github.com/facebook/react-native
+ *
+ * @format
+ */
+
+import React from 'react';
+import type {PropsWithChildren} from 'react';
+import {
+  SafeAreaView,
+  ScrollView,
+  StatusBar,
+  StyleSheet,
+  Text,
+  useColorScheme,
+  View,
+} from 'react-native';
+
+import {
+  Colors,
+  DebugInstructions,
+  Header,
+  LearnMoreLinks,
+  ReloadInstructions,
+} from 'react-native/Libraries/NewAppScreen';
+import DatePicker from 'react-native-date-picker';
+
+type SectionProps = PropsWithChildren<{
+  title: string;
+}>;
+
+function Section({children, title}: SectionProps): React.JSX.Element {
+  const isDarkMode = useColorScheme() === 'dark';
+  return (
+    <View style={styles.sectionContainer}>
+      <DatePicker date={new Date()} />
+      <Text
+        style={[
+          styles.sectionTitle,
+          {
+            color: isDarkMode ? Colors.white : Colors.black,
+          },
+        ]}>
+        {title}
+      </Text>
+      <Text
+        style={[
+          styles.sectionDescription,
+          {
+            color: isDarkMode ? Colors.light : Colors.dark,
+          },
+        ]}>
+        {children}
+      </Text>
+    </View>
+  );
+}
+
+function App(): React.JSX.Element {
+  const isDarkMode = useColorScheme() === 'dark';
+
+  const backgroundStyle = {
+    backgroundColor: isDarkMode ? Colors.darker : Colors.lighter,
+  };
+
+  return (
+    <SafeAreaView style={backgroundStyle}>
+      <StatusBar
+        barStyle={isDarkMode ? 'light-content' : 'dark-content'}
+        backgroundColor={backgroundStyle.backgroundColor}
+      />
+      <ScrollView
+        contentInsetAdjustmentBehavior="automatic"
+        style={backgroundStyle}>
+        <Header />
+        <View
+          style={{
+            backgroundColor: isDarkMode ? Colors.black : Colors.white,
+          }}>
+          <Section title="Step One">
+            Edit <Text style={styles.highlight}>App.tsx</Text> to change this
+            screen and then come back to see your edits.
+          </Section>
+          <Section title="See Your Changes">
+            <ReloadInstructions />
+          </Section>
+          <Section title="Debug">
+            <DebugInstructions />
+          </Section>
+          <Section title="Learn More">
+            Read the docs to discover what to do next:
+          </Section>
+          <LearnMoreLinks />
+        </View>
+      </ScrollView>
+    </SafeAreaView>
+  );
+}
+
+const styles = StyleSheet.create({
+  sectionContainer: {
+    marginTop: 32,
+    paddingHorizontal: 24,
+  },
+  sectionTitle: {
+    fontSize: 24,
+    fontWeight: '600',
+  },
+  sectionDescription: {
+    marginTop: 8,
+    fontSize: 18,
+    fontWeight: '400',
+  },
+  highlight: {
+    fontWeight: '700',
+  },
+});
+
+export default App;

examples/Rn073/Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby ">= 2.6.10"
+
+gem 'cocoapods', '~> 1.13'
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'