Merge branch 'react-icons' into 'master'

Added react-native-vector-icons

See merge request !12

ios/ThaliApp/Info.plist

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+  <dict>
     <key>CFBundleDevelopmentRegion</key>
     <string>en</string>
     <key>CFBundleDisplayName</key>
@@ -39,9 +39,8 @@
     <key>UIViewControllerBasedStatusBarAppearance</key>
     <false/>
     <key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
+    <string/>
     <key>NSAppTransportSecurity</key>
-	<!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/ -->
     <dict>
       <key>NSExceptionDomains</key>
       <dict>
@@ -52,5 +51,18 @@
         </dict>
       </dict>
     </dict>
-</dict>
+    <key>UIAppFonts</key>
+    <array>
+      <string>Entypo.ttf</string>
+      <string>EvilIcons.ttf</string>
+      <string>FontAwesome.ttf</string>
+      <string>Foundation.ttf</string>
+      <string>Ionicons.ttf</string>
+      <string>MaterialCommunityIcons.ttf</string>
+      <string>MaterialIcons.ttf</string>
+      <string>Octicons.ttf</string>
+      <string>SimpleLineIcons.ttf</string>
+      <string>Zocial.ttf</string>
+    </array>
+  </dict>
 </plist>
\ No newline at end of file

ios/ThaliAppTests/ThaliAppTests.m

@@ -37,7 +37,7 @@
 
 - (void)testRendersWelcomeScreen
 {
-  UIViewController *vc = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
+  UIViewController *vc = [[[RCTSharedApplication() delegate] window] rootViewController];
   NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS];
   BOOL foundElement = NO;
 

package.json

@@ -20,8 +20,9 @@
   "dependencies": {
     "prop-types": "^15.5.8",
     "react": "16.0.0-alpha.6",
-    "react-native": "^0.43.3",
+    "react-native": "0.44.0",
     "react-native-drawer": "^2.3.0",
+    "react-native-vector-icons": "^4.0.1",
     "react-redux": "^5.0.2",
     "redux": "^3.6.0",
     "redux-thunk": "^2.2.0"
@@ -42,6 +43,7 @@
     "react-native-git-upgrade": "^0.2.7",
     "react-native-web": "^0.0.81",
     "react-test-renderer": "^15.5.4",
+    "url-loader": "^0.5.8",
     "webpack": "^2.3.3"
   }
 }

webpack.config.js

+const path = require('path');
+
 module.exports = {
   entry: './index.web.js',
   output: {
@@ -15,6 +17,11 @@ module.exports = {
         include: /node_modules\/react-native-/,
         loader: 'babel-loader',
       },
+      {
+        test: /\.ttf$/,
+        loader: 'url-loader',
+        include: path.resolve(__dirname, 'node_modules/react-native-vector-icons'),
+      },
     ],
   },
   resolve: {