Merge branch 'master' into release

Author: adids1221

.gitignore

@@ -20,18 +20,18 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-project.xcworkspace
 **/.xcode.env.local
 
 # Android/IntelliJ
 #
 build/
 .idea
 .gradle
+.kotlin
 local.properties
 *.iml
 *.hprof
-android/gradlew.bat
+packages/react-native-ui-lib/android/gradlew.bat
 expoDemo/android/gradlew.bat
 .cxx/
 *.keystore
@@ -77,12 +77,12 @@ dist
 dist-ts
 package-lock.json
 docs/components/**
-!scripts/build
+!packages/react-native-ui-lib/scripts/build
+demo/src/screens/incubatorScreens/IncubatorCalendarScreen/MockData.ts
 
 # Ruby / CocoaPods
 **/Pods/
 /vendor/bundle/
-/ios/Podfile.lock
 expoDemo/ios/Pods
 
 .reassure 

demo/src/screens/__tests__/__snapshots__/TextFieldScreen.spec.js.snap

@@ -4726,8 +4726,8 @@ exports[`TextField Screen renders screen 1`] = `
             hitSlop={
               {
                 "bottom": 7.5,
-                "left": 10,
-                "right": 10,
+                "left": 24,
+                "right": 24,
                 "top": 7.5,
               }
             }

demo/src/screens/componentScreens/FloatingButtonScreen.tsx

@@ -5,13 +5,15 @@ import {renderBooleanOption} from '../ExampleScreenPresenter';
 
 interface State {
   showButton: boolean;
+  showPrimary: boolean;
   showSecondary: boolean;
   showVertical: boolean;
 }
 
 export default class FloatingButtonScreen extends Component<{}, State> {
   state = {
     showButton: true,
+    showPrimary: true,
     showSecondary: true,
     showVertical: true,
     fullWidth: false
@@ -36,6 +38,7 @@ export default class FloatingButtonScreen extends Component<{}, State> {
         </Text>
         {renderBooleanOption.call(this, 'Show Floating Button', 'showButton')}
         {renderBooleanOption.call(this, 'Full Width Button', 'fullWidth')}
+        {renderBooleanOption.call(this, 'Show Primary Button', 'showPrimary')}
         {renderBooleanOption.call(this, 'Show Secondary Button', 'showSecondary')}
         {renderBooleanOption.call(this, 'Button Layout Vertical', 'showVertical')}
 
@@ -67,10 +70,14 @@ export default class FloatingButtonScreen extends Component<{}, State> {
         <FloatingButton
           visible={this.state.showButton}
           fullWidth={this.state.fullWidth}
-          button={{
-            label: 'Approve',
-            onPress: this.close
-          }}
+          button={
+            this.state.showPrimary
+              ? {
+                label: 'Approve',
+                onPress: this.close
+              }
+              : undefined
+          }
           secondaryButton={
             showSecondary
               ? {

demo/src/screens/incubatorScreens/IncubatorCalendarScreen/MockData.ts

@@ -1,5 +1,11 @@
 import _ from 'lodash';
-import {data} from './MockData';
+let data;
+try {
+  data = require('./MockData').data;
+} catch (error) {
+  console.warn('Error loading MockData', error);
+  data = [];
+}
 
 const PAGE_SIZE = 400;
 const FAKE_FETCH_TIME = 1500;

demo/src/screens/incubatorScreens/IncubatorCalendarScreen/MockServer.ts

@@ -20,6 +20,7 @@ import Hint from 'react-native-ui-lib/hint';
 import Icon from 'react-native-ui-lib/icon';
 import * as Incubator from 'react-native-ui-lib/incubator';
 import MaskedInput from 'react-native-ui-lib/maskedInput';
+import NumberInput from 'react-native-ui-lib/numberInput';
 import RadioButton from 'react-native-ui-lib/radioButton';
 import RadioGroup from 'react-native-ui-lib/radioGroup';
 import SegmentedControl from 'react-native-ui-lib/segmentedControl';
@@ -100,6 +101,7 @@ const ReactLiveScope = {
   Image,
   Incubator,
   MaskedInput,
+  NumberInput,
   RadioButton,
   RadioGroup,
   SegmentedControl,