Merge branch 'master' into release

Author: ethanshar

.flowconfig

@@ -56,7 +56,6 @@ untyped-type-import=warn
 nonstrict-import=warn
 deprecated-type=warn
 unsafe-getters-setters=warn
-inexact-spread=warn
 unnecessary-invariant=warn
 signature-verification-failure=warn
 deprecated-utility=error
@@ -71,4 +70,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.113.0
+^0.122.0

.github/pull_request_template.md

@@ -0,0 +1,5 @@
+## Description
+*Enter description to help the reviewer understand what's the change about...*
+
+## Changelog
+*Add a quick message for our users about this change*

.prettierrc

@@ -2,5 +2,8 @@
   "trailingComma": "none",
   "tabWidth": 2,
   "singleQuote": true,
-  "bracketSpacing": false
+  "bracketSpacing": false,
+  "arrowParens": "avoid",
+  "jsxBracketSameLine": false,
+  "printWidth": 120
 }

android/app/build.gradle

@@ -27,6 +27,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
+        multiDexEnabled true
     }
     splits {
         abi {
@@ -50,20 +51,13 @@ android {
         }
         release {
             // Caution! In production, you need to generate your own keystore file.
-            // see https://facebook.github.io/react-native/docs/signed-apk-android.
+            // see https://reactnative.dev/docs/signed-apk-android.
             signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
 
-    packagingOptions {
-        pickFirst "lib/armeabi-v7a/libc++_shared.so"
-        pickFirst "lib/arm64-v8a/libc++_shared.so"
-        pickFirst "lib/x86/libc++_shared.so"
-        pickFirst "lib/x86_64/libc++_shared.so"
-    }
-
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
@@ -92,6 +86,7 @@ dependencies {
 
     debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.flipper'
+        exclude group:'com.squareup.okhttp3', module:'okhttp'
     }
 
     debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {

android/build.gradle

@@ -2,10 +2,10 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "28.0.3"
+        buildToolsVersion = "29.0.2"
         minSdkVersion = 19
-        compileSdkVersion = 28
-        targetSdkVersion = 28
+        compileSdkVersion = 29
+        targetSdkVersion = 29
         RNNKotlinVersion = "1.3.61" // Or any version above 1.3.x
     }
     repositories {

android/gradle.properties

@@ -21,4 +21,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.33.1
+FLIPPER_VERSION=0.37.0

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/gradlew

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     https://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,7 +125,7 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
+# For Cygwin or MSYS, switch paths to Windows format before running java
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

demo/src/demoApp.js

@@ -93,18 +93,12 @@ function getDefaultNavigationStyle() {
       title: {
         color: Colors.white,
         fontSize: Typography.text60H.fontSize,
-        fontFamily: Constants.isAndroid
-          ? Typography.text65H.fontFamily
-          : '.SFUIText-Heavy',
-        fontWeight: 'heavy'
+        fontFamily: Typography.text65H.fontFamily
       },
       subtitle: {
         color: Colors.white,
         fontSize: Typography.text80T.fontSize,
-        fontFamily: Constants.isAndroid
-          ? Typography.text80.fontFamily
-          : '.SFUIText-Medium',
-        fontWeight: 'medium'
+        fontFamily: Typography.text80.fontFamily
       },
       backButton: {
         // visible: true,

demo/src/index.js

@@ -46,8 +46,11 @@ module.exports = {
       get DrawerScreen() {
         return require('./screens/componentScreens/DrawerScreen').default;
       },
-      get TagsInputScreen() {
-        return require('./screens/componentScreens/TagsInputScreen').default;
+      get ExpandableSectionScreen() {
+        return require('./screens/componentScreens/ExpandableSectionScreen').default;
+      },
+      get ChipsInputScreen() {
+        return require('./screens/componentScreens/ChipsInputScreen').default;
       },
       get HintsScreen() {
         return require('./screens/componentScreens/HintsScreen').default;
@@ -103,7 +106,7 @@ module.exports = {
       get TextScreen() {
         return require('./screens/componentScreens/TextScreen').default;
       },
-      // TODO: fix Expo issues (navigation) before un-commenting 
+      // TODO: fix Expo issues (navigation) before un-commenting
       // get TextFieldScreen() {
       //   return require('./screens/componentScreens/TextFieldScreen').default;
       // },
@@ -157,7 +160,7 @@ module.exports = {
       get LoadingScreen() {
         return require('./screens/componentScreens/LoadingScreen').default;
       },
-      // TODO: fix Expo issues (navigation) before un-commenting 
+      // TODO: fix Expo issues (navigation) before un-commenting
       // get ModalScreen() {
       //   return require('./screens/componentScreens/ModalScreen').default;
       // },

demo/src/screens/CustomScreen.js

@@ -31,6 +31,7 @@ export const navigationData = {
       {title: 'Cards', tags: 'cards feed', screen: 'unicorn.components.CardsScreen'},
       {title: 'Connection Status Bar', tags: 'connection status bar', screen: 'unicorn.components.ConnectionStatusBar'},
       {title: 'Chip', tags: 'chip', screen: 'unicorn.components.ChipScreen'},
+      {title: 'ExpandableSection', tags: 'expandable section', screen: 'unicorn.components.ExpandableSectionScreen'},
       // {title: 'Overlays', tags: 'overlay image', screen: 'unicorn.components.OverlaysScreen'},
       {title: 'Page Control', tags: 'page', screen: 'unicorn.components.PageControlScreen'},
       {title: 'ProgressBar', tags: 'progress bar animated', screen: 'unicorn.animations.ProgressBarScreen'},
@@ -57,7 +58,7 @@ export const navigationData = {
       {title: 'Stepper', tags: 'stepper form', screen: 'unicorn.components.StepperScreen'},
       {title: 'Slider', tags: 'slider', screen: 'unicorn.components.SliderScreen'},
       {title: 'Switch', tags: 'switch toggle', screen: 'unicorn.components.SwitchScreen'},
-      {title: 'TagsInput', tags: 'tags input form', screen: 'unicorn.components.TagsInputScreen'},
+      {title: 'ChipsInput', tags: 'chips tags input form', screen: 'unicorn.components.ChipsInputScreen'},
       {title: 'Masked Inputs', tags: 'text input form mask', screen: 'unicorn.components.MaskedInputScreen'}
     ]
   },

demo/src/screens/MenuStructure.js

@@ -33,7 +33,7 @@ export default class BadgesScreen extends Component {
         </Text>
         <View row center style={{alignItems: 'flex-start'}}>
           <View center paddingH-10>
-            <Badge label={this.state.value.toString()} backgroundColor={Colors.red30}/>
+            <Badge size={'default'} label={this.state.value.toString()} backgroundColor={Colors.red30}/>
             <Badge
               label={this.state.value.toString()}
               containerStyle={{marginTop: BadgesSpace}}
@@ -133,7 +133,7 @@ export default class BadgesScreen extends Component {
           <View style={styles.iconBadgeColumnContainer}>
             <Badge icon={star} borderRadius={6} iconStyle={{backgroundColor: Colors.red30}}/>
             <Text text80 style={{marginTop: 10}}>
-              border radius (6)
+              border radius
             </Text>
           </View>
         </View>

demo/src/screens/componentScreens/BadgesScreen.js renamed to demo/src/screens/componentScreens/BadgesScreen.tsx

@@ -1,21 +1,21 @@
 import React, {Component} from 'react';
 import {StyleSheet, ScrollView} from 'react-native';
-import {View, Colors, Text, Typography, TagsInput} from 'react-native-ui-lib'; // eslint-disable-line
+import {View, Colors, Text, Typography, ChipsInput} from 'react-native-ui-lib'; // eslint-disable-line
 
 
-export default class TagsInputScreen extends Component {
+export default class ChipsInputScreen extends Component {
   constructor(props) {
     super(props);
 
     this.state = {
       tags: [{label: 'Amit'}, {label: 'Ethan', invalid: true}],
-      tags2: ['Tags', 'Input'],
+      tags2: ['Chips', 'Input'],
       tags3: ['Non', 'Removable', 'Tags']
     };
   }
 
   onTagPress = (tagIndex, markedTagIndex) => {
-    this.customTagsInput.markTagIndex(tagIndex === markedTagIndex ? undefined : tagIndex);
+    this.customChipsInput.markTagIndex(tagIndex === markedTagIndex ? undefined : tagIndex);
   };
 
   renderCustomTag(tag, index, shouldMarkToRemove) {
@@ -31,24 +31,24 @@ export default class TagsInputScreen extends Component {
       <ScrollView keyboardShouldPersistTaps="never">
         <View style={styles.container}>
           <Text text40 marginB-20>
-            TagsInput
+            ChipsInput
           </Text>
 
-          <TagsInput containerStyle={{marginBottom: 25}} placeholder="Enter Tags" tags={this.state.tags2}/>
+          <ChipsInput containerStyle={{marginBottom: 25}} placeholder="Enter Tags" tags={this.state.tags2}/>
 
-          <TagsInput containerStyle={{marginBottom: 25}} placeholder="Enter Tags" tags={this.state.tags}
+          <ChipsInput containerStyle={{marginBottom: 25}} placeholder="Enter Tags" tags={this.state.tags}
                      validationErrorMessage="error validation message" />
 
-          <TagsInput
+          <ChipsInput
             containerStyle={{marginBottom: 25}}
             placeholder="Editing disabled"
             tags={this.state.tags3}
             disableTagRemoval
             disableTagAdding
           />
 
-          <TagsInput
-            ref={r => (this.customTagsInput = r)}
+          <ChipsInput
+            ref={r => (this.customChipsInput = r)}
             containerStyle={{marginBottom: 25}}
             placeholder="With custom tags"
             tags={this.state.tags}