Merge pull request #20 from AmitM30/dev

AmitM30 · web-flow · commit d717f9ef5d1e · 2019-04-30T15:32:29.000+05:30
Upgrade R, RN, RNN
diff --git a/README.md b/README.md
@@ -1,21 +1,22 @@
 # React Native Typescript Boilerplate
 
-![License](https://img.shields.io/github/license/AmitM30/react-native-typescript-boilerplate.svg) ![Travis](https://api.travis-ci.com/AmitM30/react-native-typescript-boilerplate.svg?branch=master)
+![Travis](https://api.travis-ci.com/AmitM30/react-native-typescript-boilerplate.svg?branch=master) ![License](https://img.shields.io/github/license/AmitM30/react-native-typescript-boilerplate.svg) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](./CONTRIBUTING.md)
 
 ### An opinionated [React Native](https://facebook.github.io/react-native/docs/getting-started) Starter Kit with [React Native Navigation](https://github.com/wix/react-native-navigation) + [Redux](https://github.com/reactjs/redux) + [TSLint](https://github.com/airbnb/javascript) to build iOS / Android apps using [TypeScript](https://github.com/Microsoft/TypeScript-React-Native-Starter)
 
 The project has been setup based off [RN Getting Started](https://facebook.github.io/react-native/docs/getting-started) and instructions from [Microsoft's Github TypeScript React Native Starter](https://github.com/Microsoft/TypeScript-React-Native-Starter) repo.
 
 This repo supports the latest version of React Native (v0.57.8+) supported by RNN (at the time of writing).
 
+**UPDATE** (8th March '19): RNN upgraded to v2.13.1 | RN to 0.58.6 | React to 16.8.4
+
 ### Who is this for?
 
-Someone looking to jumpstart building apps using RN and loves TS. The base setup has been taken care of, just `npm install` and get going.
+Someone looking to jumpstart building apps using RN and prefers TS. The base setup has been taken care of, just `yarn install` and get going from respective IDEs.
 
 You might also want to [rename](https://medium.com/the-react-native-log/how-to-rename-a-react-native-app-dafd92161c35) the app for your own use.
 
-_Disclaimer_:
-This is an **opinionated** approach to building apps with RN. The project structure is inspired by multiple production apps built by the contributors.
+> _Disclaimer_: This is an **opinionated** approach to building apps with RN. The project structure is inspired by multiple production apps built by the contributors.
 
 The project uses and encourages to use industry best practices / tools / libraries like RNN, redux, tslint, separation of concern and structure to build a maintainable app.
 
@@ -102,19 +103,13 @@ Launch application from XCode
 
 ###### Android
 
-For android, you will need to first create the bundle:
-
-```
-react-native bundle --platform ios --entry-file index.js --bundle-output ./ios/main.jsbundle --assets-dest ./ --dev false
-```
-
-then run the Metro Bundler from the terminal
+For android, run the Metro Bundler from the terminal
 
 ```
 npm run start
 ```
 
-and the launch from IDE.
+and then launch from IDE.
 
 #### Lint
 
@@ -172,6 +167,7 @@ Please check out [Contributing](https://github.com/AmitM30/react-native-typescri
 #### Authors
 
 - [**Anurag Chutani**](https://github.com/a7urag) - _Android Setup_
+- [**Brian Varley**](https://github.com/BrianJVarley) - _Windows Setup_
 
 See also the list of [contributors](https://github.com/AmitM30/react-native-typescript-boilerplate/contributors) who participated in this project.
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -147,7 +147,7 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-    implementation "com.facebook.react:react-native:0.57.8"  // From node_modules
+    implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation project(':react-native-navigation')
 
     implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "27.0.3"
+        buildToolsVersion = "28.0.3"
         minSdkVersion = 19
         compileSdkVersion = 28
         targetSdkVersion = 26
@@ -15,7 +15,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/metro.config.js b/metro.config.js
@@ -0,0 +1,17 @@
+/**
+ * Metro configuration for React Native
+ * https://github.com/facebook/react-native
+ *
+ * @format
+ */
+
+module.exports = {
+  transformer: {
+    getTransformOptions: async () => ({
+      transform: {
+        experimentalImportSupport: false,
+        inlineRequires: false
+      }
+    })
+  }
+};
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "boilerplate",
     "react native navigation"
   ],
-  "version": "0.1.0",
+  "version": "v0.2.2",
   "author": {
     "name": "Amit Mangal",
     "email": "mangalamitash@gmail.com",
@@ -30,10 +30,10 @@
     "lint:fix": "cross-env-shell tslint --fix --project ./tsconfig.json"
   },
   "dependencies": {
-    "react": "16.6.3",
-    "react-native": "0.57.8",
-    "react-native-navigation": "^2.8.0",
-    "react-redux": "^6.0.0",
+    "react": "^16.8.6",
+    "react-native": "^0.59.5",
+    "react-native-navigation": "^2.18.3",
+    "react-redux": "^7.0.3",
     "redux": "^4.0.1",
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.3.0"
@@ -54,23 +54,23 @@
     "babel-preset-airbnb": "^3.2.0",
     "babel-preset-react-native": "^4.0.1",
     "cross-env": "^5.2.0",
-    "eslint": "^5.12.1",
+    "eslint": "^5.16.0",
     "eslint-config-airbnb": "^17.1.0",
     "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-jest": "^22.1.2",
     "eslint-plugin-jsx-a11y": "^6.1.2",
     "eslint-plugin-react": "^7.12.2",
     "eslint-watch": "^4.0.2",
-    "jest": "24.0.0",
+    "jest": "^24.7.1",
     "metro-react-native-babel-preset": "^0.51.1",
     "react-addons-test-utils": "^15.6.2",
     "react-native-typescript-transformer": "^1.2.11",
     "react-test-renderer": "16.6.3",
     "regenerator-runtime": "^0.13.1",
     "ts-jest": "^23.10.5",
-    "tslint": "^5.12.1",
+    "tslint": "^5.16.0",
     "tslint-config-airbnb": "^5.11.1",
-    "typescript": "^3.2.4"
+    "typescript": "^3.4.5"
   },
   "jest": {
     "preset": "react-native",
diff --git a/src/navigators/navigation.tsx b/src/navigators/navigation.tsx
@@ -26,24 +26,24 @@ export const tabbedNavigation = () =>
                     passProps: {
                       text: 'This is Home',
                     },
-                    options: {
-                      topBar: {
-                        visible: false,
-                        drawBehind: true,
-                        animate: true,
-                      },
-                      bottomTab: {
-                        fontSize: 12,
-                        text: 'Home',
-                        textColor: TYPOGRAPHY.COLOR.Primary,
-                        selectedTextColor: TYPOGRAPHY.COLOR.Secondary,
-                        icon: require('../view/assets/images/tabbar/home.png'),
-                        selectedIcon: require('../view/assets/images/tabbar/home.png'),
-                      },
-                    },
                   },
                 },
               ],
+              options: {
+                topBar: {
+                  visible: false,
+                  drawBehind: true,
+                  animate: true,
+                },
+                bottomTab: {
+                  fontSize: 12,
+                  text: 'Home',
+                  textColor: TYPOGRAPHY.COLOR.Primary,
+                  selectedTextColor: TYPOGRAPHY.COLOR.Secondary,
+                  icon: require('../view/assets/images/tabbar/home.png'),
+                  selectedIcon: require('../view/assets/images/tabbar/home.png'),
+                },
+              },
             },
           },
           {
@@ -52,35 +52,27 @@ export const tabbedNavigation = () =>
                 {
                   component: {
                     name: SCREENS.Settings,
-                    options: {
-                      topBar: {
-                        visible: false,
-                        drawBehind: true,
-                        animate: true,
-                      },
-                      bottomTab: {
-                        text: 'Settings',
-                        fontSize: 12,
-                        textColor: TYPOGRAPHY.COLOR.Primary,
-                        selectedTextColor: TYPOGRAPHY.COLOR.Secondary,
-                        icon: require('../view/assets/images/tabbar/settings.png'),
-                        selectedIcon: require('../view/assets/images/tabbar/settings.png'),
-                      },
-                    },
                   },
                 },
               ],
+              options: {
+                topBar: {
+                  visible: false,
+                  drawBehind: true,
+                  animate: true,
+                },
+                bottomTab: {
+                  text: 'Settings',
+                  fontSize: 12,
+                  textColor: TYPOGRAPHY.COLOR.Primary,
+                  selectedTextColor: TYPOGRAPHY.COLOR.Secondary,
+                  icon: require('../view/assets/images/tabbar/settings.png'),
+                  selectedIcon: require('../view/assets/images/tabbar/settings.png'),
+                },
+              },
             },
           },
         ],
-        options: {
-          bottomTabs: {
-            visible: true,
-            titleDisplayMode: 'alwaysShow',
-            backgroundColor: TYPOGRAPHY.COLOR.Default,
-            drawBehind: true,
-          },
-        },
       },
     },
   });
diff --git a/src/view/assets/images/sample/1.png b/src/view/assets/images/sample/1.png
diff --git a/src/view/assets/images/sample/2.png b/src/view/assets/images/sample/2.png
diff --git a/yarn.lock b/yarn.lock
