From 28a57ba9b7a0b9a9d75bd6767a7f0c11f0e5b22e Mon Sep 17 00:00:00 2001
From: Diego Nava <diegomorenonava@gmail.com>
Date: Tue, 24 May 2022 22:49:37 -0500
Subject: [PATCH 1/2] fix(android_imports): added missing '.android'

---
 src/DateTimePickerAndroid.js | 2 +-
 src/androidUtils.js          | 2 +-
 src/picker.android.js        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/DateTimePickerAndroid.js b/src/DateTimePickerAndroid.js
index a12da178..2e92310d 100644
--- a/src/DateTimePickerAndroid.js
+++ b/src/DateTimePickerAndroid.js
@@ -20,7 +20,7 @@ import {
   timeZoneOffsetDateSetter,
   validateAndroidProps,
 } from './androidUtils';
-import pickers from './picker';
+import pickers from './picker.android';
 
 function open(props: AndroidNativeProps) {
   const {
diff --git a/src/androidUtils.js b/src/androidUtils.js
index 8f63abc4..e3e137b3 100644
--- a/src/androidUtils.js
+++ b/src/androidUtils.js
@@ -3,7 +3,7 @@
  * @flow strict-local
  */
 import {ANDROID_DISPLAY, ANDROID_MODE, MIN_MS} from './constants';
-import pickers from './picker';
+import pickers from './picker.android';
 import type {AndroidNativeProps, DateTimePickerResult} from './types';
 import {sharedPropsValidation} from './utils';
 import invariant from 'invariant';
diff --git a/src/picker.android.js b/src/picker.android.js
index 4e29a58c..902dfdb3 100644
--- a/src/picker.android.js
+++ b/src/picker.android.js
@@ -2,8 +2,8 @@
  * @format
  * @flow strict-local
  */
-import DatePickerAndroid from './datepicker';
-import TimePickerAndroid from './timepicker';
+import DatePickerAndroid from './datepicker.android';
+import TimePickerAndroid from './timepicker.android';
 import {ANDROID_MODE} from './constants';
 
 const pickers = {

From 1dac7827eb18d2815b5181aad05df5264a976e5d Mon Sep 17 00:00:00 2001
From: Diego Nava <diegomorenonava@gmail.com>
Date: Thu, 26 May 2022 15:48:31 -0500
Subject: [PATCH 2/2] fix(config): fixed flow issues

a flow rule was causing a [cannot-resolve-module] error
added type any to picker.android due to unclear type
---
 .flowconfig           | 3 +--
 src/picker.android.js | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.flowconfig b/.flowconfig
index 4320b707..b6e62410 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -1,6 +1,4 @@
 [ignore]
-; We fork some components by platform
-.*/*[.]android.js
 
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/
@@ -30,6 +28,7 @@ format.bracket_spacing=false
 module.file_ext=.js
 module.file_ext=.json
 module.file_ext=.ios.js
+; module.file_ext=.android.js
 
 munge_underscores=true
 
diff --git a/src/picker.android.js b/src/picker.android.js
index 902dfdb3..68d710a7 100644
--- a/src/picker.android.js
+++ b/src/picker.android.js
@@ -6,7 +6,8 @@ import DatePickerAndroid from './datepicker.android';
 import TimePickerAndroid from './timepicker.android';
 import {ANDROID_MODE} from './constants';
 
-const pickers = {
+// $FlowFixMe Flow: Unclear type. Using `any`, `Object`, or `Function` types is not safe!
+const pickers: any = {
   [ANDROID_MODE.date]: DatePickerAndroid,
   [ANDROID_MODE.time]: TimePickerAndroid,
 };