diff --git a/android/app/build.gradle b/android/app/build.gradle index 33158d2..1117778 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,4 +1,5 @@ apply plugin: "com.android.application" +apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" import com.android.build.OutputFile @@ -141,6 +142,7 @@ dependencies { compile "com.android.support:appcompat-v7:23.0.1" compile "com.facebook.react:react-native:+" // From node_modules compile 'com.facebook.fresco:animated-gif:1.0.1' // for gif support + compile project(':react-native-vector-icons') } // Run this once to be able to run the application with BUCK diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index c9c8fa0..4dbf1fa 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ - + + android:windowSoftInputMode="adjustPan"> diff --git a/android/app/src/main/assets/fonts/Entypo.ttf b/android/app/src/main/assets/fonts/Entypo.ttf new file mode 100644 index 0000000..1c8f5e9 Binary files /dev/null and b/android/app/src/main/assets/fonts/Entypo.ttf differ diff --git a/android/app/src/main/assets/fonts/EvilIcons.ttf b/android/app/src/main/assets/fonts/EvilIcons.ttf new file mode 100644 index 0000000..b270f98 Binary files /dev/null and b/android/app/src/main/assets/fonts/EvilIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Feather.ttf b/android/app/src/main/assets/fonts/Feather.ttf new file mode 100644 index 0000000..244854c Binary files /dev/null and b/android/app/src/main/assets/fonts/Feather.ttf differ diff --git a/android/app/src/main/assets/fonts/FontAwesome.ttf b/android/app/src/main/assets/fonts/FontAwesome.ttf new file mode 100644 index 0000000..35acda2 Binary files /dev/null and b/android/app/src/main/assets/fonts/FontAwesome.ttf differ diff --git a/android/app/src/main/assets/fonts/Foundation.ttf b/android/app/src/main/assets/fonts/Foundation.ttf new file mode 100644 index 0000000..6cce217 Binary files /dev/null and b/android/app/src/main/assets/fonts/Foundation.ttf differ diff --git a/android/app/src/main/assets/fonts/Ionicons.ttf b/android/app/src/main/assets/fonts/Ionicons.ttf new file mode 100644 index 0000000..307ad88 Binary files /dev/null and b/android/app/src/main/assets/fonts/Ionicons.ttf differ diff --git a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf new file mode 100644 index 0000000..82524a0 Binary files /dev/null and b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/MaterialIcons.ttf b/android/app/src/main/assets/fonts/MaterialIcons.ttf new file mode 100644 index 0000000..7015564 Binary files /dev/null and b/android/app/src/main/assets/fonts/MaterialIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf new file mode 100644 index 0000000..09f5a96 Binary files /dev/null and b/android/app/src/main/assets/fonts/Octicons.ttf differ diff --git a/android/app/src/main/assets/fonts/SimpleLineIcons.ttf b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf new file mode 100644 index 0000000..6ecb686 Binary files /dev/null and b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Sunflower-Bold.ttf b/android/app/src/main/assets/fonts/Sunflower-Bold.ttf new file mode 100644 index 0000000..d2ce7fa Binary files /dev/null and b/android/app/src/main/assets/fonts/Sunflower-Bold.ttf differ diff --git a/android/app/src/main/assets/fonts/Sunflower-Light.ttf b/android/app/src/main/assets/fonts/Sunflower-Light.ttf new file mode 100644 index 0000000..d448009 Binary files /dev/null and b/android/app/src/main/assets/fonts/Sunflower-Light.ttf differ diff --git a/android/app/src/main/assets/fonts/Sunflower-Medium.ttf b/android/app/src/main/assets/fonts/Sunflower-Medium.ttf new file mode 100644 index 0000000..ad37058 Binary files /dev/null and b/android/app/src/main/assets/fonts/Sunflower-Medium.ttf differ diff --git a/android/app/src/main/assets/fonts/Zocial.ttf b/android/app/src/main/assets/fonts/Zocial.ttf new file mode 100644 index 0000000..e4ae46c Binary files /dev/null and b/android/app/src/main/assets/fonts/Zocial.ttf differ diff --git a/android/app/src/main/java/com/nexto/MainApplication.java b/android/app/src/main/java/com/nexto/MainApplication.java index bef6983..bc930ff 100644 --- a/android/app/src/main/java/com/nexto/MainApplication.java +++ b/android/app/src/main/java/com/nexto/MainApplication.java @@ -1,8 +1,12 @@ package com.nexto; +import com.oblador.vectoricons.VectorIconsPackage; + import android.app.Application; import com.facebook.react.ReactApplication; +import com.oblador.vectoricons.VectorIconsPackage; +import com.oblador.vectoricons.VectorIconsPackage; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; import com.facebook.react.shell.MainReactPackage; @@ -22,7 +26,8 @@ public class MainApplication extends Application implements ReactApplication { @Override protected List getPackages() { return Arrays.asList( - new MainReactPackage() + new MainReactPackage(), + new VectorIconsPackage() ); } diff --git a/android/settings.gradle b/android/settings.gradle index 24d2cee..07a54c6 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,3 +1,5 @@ rootProject.name = 'Nexto' +include ':react-native-vector-icons' +project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android') include ':app' diff --git a/app/assets/fonts/Sunflower-Bold.ttf b/app/assets/fonts/Sunflower-Bold.ttf new file mode 100644 index 0000000..d2ce7fa Binary files /dev/null and b/app/assets/fonts/Sunflower-Bold.ttf differ diff --git a/app/assets/fonts/Sunflower-Light.ttf b/app/assets/fonts/Sunflower-Light.ttf new file mode 100644 index 0000000..d448009 Binary files /dev/null and b/app/assets/fonts/Sunflower-Light.ttf differ diff --git a/app/assets/fonts/Sunflower-Medium.ttf b/app/assets/fonts/Sunflower-Medium.ttf new file mode 100644 index 0000000..ad37058 Binary files /dev/null and b/app/assets/fonts/Sunflower-Medium.ttf differ diff --git a/app/assets/images/homeBg.jpg b/app/assets/images/homeBg.jpg new file mode 100644 index 0000000..c520cd0 Binary files /dev/null and b/app/assets/images/homeBg.jpg differ diff --git a/app/assets/images/inboxIcon.jpg b/app/assets/images/inboxIcon.jpg deleted file mode 100644 index 9a49930..0000000 Binary files a/app/assets/images/inboxIcon.jpg and /dev/null differ diff --git a/app/assets/loading.gif b/app/assets/images/loading.gif similarity index 100% rename from app/assets/loading.gif rename to app/assets/images/loading.gif diff --git a/app/assets/images/menuIcon.png b/app/assets/images/menuIcon.png deleted file mode 100644 index ae9b91a..0000000 Binary files a/app/assets/images/menuIcon.png and /dev/null differ diff --git a/app/assets/images/sendIcon.png b/app/assets/images/sendIcon.png deleted file mode 100644 index 3ca41fa..0000000 Binary files a/app/assets/images/sendIcon.png and /dev/null differ diff --git a/app/screens/home.js b/app/screens/home.js index 6b31191..48de1e4 100644 --- a/app/screens/home.js +++ b/app/screens/home.js @@ -14,10 +14,11 @@ import { import { Actions } from 'react-native-router-flux'; +import { Fonts } from '../utils/Fonts.js'; const windowWidth = Dimensions.get('window').width; const windowHeight = Dimensions.get('window').height; -const backgroundLink = 'https://cdn.shopify.com/s/files/1/2567/6484/products/Polygon_Esprit_geometric_white_and_gold_5.jpg?v=1517325402'; +const backgroundLink = '../assets/images/homeBg.jpg'; type Props = {}; export default class Home extends Component { @@ -28,7 +29,7 @@ export default class Home extends Component { render() { return ( - + Nexto spontaneous connection @@ -60,11 +61,13 @@ const homeStyles = { color: 'grey', fontSize: 50, textAlign: 'center', - zIndex: 100 + zIndex: 100, + fontFamily: Fonts.Sunflower }, motto: { color: '#0e8f9e', - fontSize: 18 + fontSize: 18, + fontFamily: Fonts.Sunflower }, connect: { backgroundColor: '#0e8f9e', diff --git a/app/screens/main.js b/app/screens/main.js index f4d92f6..5c81f46 100644 --- a/app/screens/main.js +++ b/app/screens/main.js @@ -11,6 +11,7 @@ import { import { Actions } from 'react-native-router-flux'; +import { Fonts } from '../utils/Fonts.js'; // imported components for different sections in main component import Navbar from './main/navbar.js'; @@ -45,16 +46,16 @@ const styles = { container: { flex: 18, flexDirection: 'column', - justifyContent: 'space-between' + justifyContent: 'space-between', + position: 'relative' }, navbar: { flex: 2 }, chat: { - flex: 15, - backgroundColor: 'white' + flex: 15 }, adspace: { - flex: 1 + flex: 2 } } diff --git a/app/screens/main/chat.js b/app/screens/main/chat.js index d44fdbd..415b50f 100644 --- a/app/screens/main/chat.js +++ b/app/screens/main/chat.js @@ -12,16 +12,58 @@ import { import { Actions } from 'react-native-router-flux'; +import Icon from 'react-native-vector-icons/MaterialIcons'; +import { Fonts } from '../../utils/Fonts.js'; const windowWidth = Dimensions.get('window').width; const windowHeight = Dimensions.get('window').height; type Props = {}; export default class Chat extends Component { + constructor(props) { + super(props); + var exMessages = [ + { + id: 1, + text: "hey anyone wanna study 61A" + }, + { + id: 2, + text: "Yea im down" + } + ]; + this.state = { + messageToSend : '', + messagesDOM: exMessages.map( + (msg) => {msg.text} + ) + }; + } + + messageInput = (text) => { + console.log('changing state of messageToSend'); + this.setState({ + messageToSend : text + }); + console.log(this.state.messageToSend); + } + render() { + console.log(this.state.messagesDOM); return ( - + + + {this.state.messagesDOM.length == 0 ? + ( + No one's talkin around you! Start it up! + ) + : + ( + {this.state.messagesDOM} + ) + } @@ -30,13 +72,15 @@ export default class Chat extends Component { - @@ -53,8 +97,17 @@ const styles = { backgroundColor: '#e8ebef' }, chatField: { - flex: 8 + flex: 8, + flexDirection: 'column', + justifyContent: 'flex-end', + alignItems: 'center' }, + chatFieldEmpty: { + flex: 8, + flexDirection: 'column', + justifyContent: 'center', + alignItems: 'center' + }, inputMsgField: { flex: 1, flexDirection: 'row', @@ -72,8 +125,11 @@ const styles = { flex: 6, alignSelf: 'flex-end' }, + inputField : { + fontSize: 18, + fontFamily: Fonts.SunflowerLight + }, sendIcon: { - height: 30, - width: 30 + fontSize: 25 } } diff --git a/app/screens/main/navbar.js b/app/screens/main/navbar.js index ac41c28..a1fe474 100644 --- a/app/screens/main/navbar.js +++ b/app/screens/main/navbar.js @@ -11,6 +11,8 @@ import { import { Actions } from 'react-native-router-flux'; +import Icon from 'react-native-vector-icons/MaterialIcons'; +import { Fonts } from '../../utils/Fonts.js'; const windowWidth = Dimensions.get('window').width; const windowHeight = Dimensions.get('window').height; @@ -21,19 +23,19 @@ export default class Navbar extends Component { return ( - - Main Chat + Chat online - @@ -54,8 +56,8 @@ const styles = { justifyContent: 'center' }, menuIcon: { - height: 50, - width: 50 + fontSize: 30, + color: 'white' }, headerTxt: { flex: 7, @@ -64,14 +66,16 @@ const styles = { }, head: { fontSize: 20, - color: 'white' + color: 'white', + fontFamily: Fonts.Sunflower }, status: { fontSize: 13, - color: 'white' + color: 'white', + fontFamily: Fonts.Sunflower }, inboxIcon: { - height: 40, - width: 40 + fontSize: 25, + color: 'white' } } diff --git a/app/utils/Fonts.js b/app/utils/Fonts.js new file mode 100644 index 0000000..262e075 --- /dev/null +++ b/app/utils/Fonts.js @@ -0,0 +1,4 @@ +export const Fonts = { + Sunflower : 'Sunflower-Medium', + SunflowerLight : 'Sunflower-Light' +} diff --git a/ios/Nexto.xcodeproj/project.pbxproj b/ios/Nexto.xcodeproj/project.pbxproj index ef6c9ab..487598a 100644 --- a/ios/Nexto.xcodeproj/project.pbxproj +++ b/ios/Nexto.xcodeproj/project.pbxproj @@ -5,7 +5,6 @@ }; objectVersion = 46; objects = { - /* Begin PBXBuildFile section */ 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; @@ -38,6 +37,21 @@ 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; + 044E9B3439174DD6A06FD306 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DF6B684DFFB46648B990022 /* libRNVectorIcons.a */; }; + 8E13715B88114289B3478BF8 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 30B8219C992441238B7A3CC3 /* Entypo.ttf */; }; + E3457227633F4E878F4CC0CC /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E8BEC994BFDE4A70AC10B468 /* EvilIcons.ttf */; }; + EB6D3BA0B8F546C99C0B9674 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4397813CE7E748C6A0D73A1F /* Feather.ttf */; }; + 2F50378B9E284EB5A1819DBD /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0167A9675C0F41089B2ABC0F /* FontAwesome.ttf */; }; + FE7ACB58E7834B4AB08CED67 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 207722383A464F6ABA03CDE4 /* Foundation.ttf */; }; + E555644A1C44489D9463FEA0 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9097825F02F24A9C8F721309 /* Ionicons.ttf */; }; + 8C43D362726E48F98E9D2F5F /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 792ABCE28E334902837AD696 /* MaterialCommunityIcons.ttf */; }; + 332AEC5A536B43B08CDB9F1E /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6B5A8805E6884466B94BC2F3 /* MaterialIcons.ttf */; }; + 13FF410448F749A4BD4D275D /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5FD41736B515419999163C80 /* Octicons.ttf */; }; + E9B94F6443E544879C7C368B /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C749DCD8741F4D9E9E649C1A /* SimpleLineIcons.ttf */; }; + 1CA106AFC0134E3EB11B3A73 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 99DE5FB93C4A4F3BB7F21DC0 /* Zocial.ttf */; }; + E6CE4C9E77E94D47BAC97E48 /* Sunflower-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 888EBBB9C2644F7BA1DA20F0 /* Sunflower-Bold.ttf */; }; + 2C56BD85C0514ADEB5492343 /* Sunflower-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0A832156A25C44219D3322EB /* Sunflower-Light.ttf */; }; + 431EB10EAF874768AF164A41 /* Sunflower-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C74E215F6DC640C1BA5635D1 /* Sunflower-Medium.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -343,6 +357,22 @@ 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = ""; }; + A224EAC6EC5D4956A83EB24B /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; name = "RNVectorIcons.xcodeproj"; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; + 9DF6B684DFFB46648B990022 /* libRNVectorIcons.a */ = {isa = PBXFileReference; name = "libRNVectorIcons.a"; path = "libRNVectorIcons.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; + 30B8219C992441238B7A3CC3 /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + E8BEC994BFDE4A70AC10B468 /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 4397813CE7E748C6A0D73A1F /* Feather.ttf */ = {isa = PBXFileReference; name = "Feather.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 0167A9675C0F41089B2ABC0F /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 207722383A464F6ABA03CDE4 /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 9097825F02F24A9C8F721309 /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 792ABCE28E334902837AD696 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 6B5A8805E6884466B94BC2F3 /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 5FD41736B515419999163C80 /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C749DCD8741F4D9E9E649C1A /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 99DE5FB93C4A4F3BB7F21DC0 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 888EBBB9C2644F7BA1DA20F0 /* Sunflower-Bold.ttf */ = {isa = PBXFileReference; name = "Sunflower-Bold.ttf"; path = "../app/assets/fonts/Sunflower-Bold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 0A832156A25C44219D3322EB /* Sunflower-Light.ttf */ = {isa = PBXFileReference; name = "Sunflower-Light.ttf"; path = "../app/assets/fonts/Sunflower-Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C74E215F6DC640C1BA5635D1 /* Sunflower-Medium.ttf */ = {isa = PBXFileReference; name = "Sunflower-Medium.ttf"; path = "../app/assets/fonts/Sunflower-Medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -371,6 +401,7 @@ 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, + 044E9B3439174DD6A06FD306 /* libRNVectorIcons.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -557,6 +588,7 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, + A224EAC6EC5D4956A83EB24B /* RNVectorIcons.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -578,6 +610,7 @@ 00E356EF1AD99517003FC87E /* NextoTests */, 83CBBA001A601CBA00E9B192 /* Products */, 2D16E6871FA4F8E400B85C8A /* Frameworks */, + 2BD8375BEFF24B5AB11757CD /* Resources */, ); indentWidth = 2; sourceTree = ""; @@ -604,6 +637,28 @@ name = Products; sourceTree = ""; }; + 2BD8375BEFF24B5AB11757CD /* Resources */ = { + isa = "PBXGroup"; + children = ( + 30B8219C992441238B7A3CC3 /* Entypo.ttf */, + E8BEC994BFDE4A70AC10B468 /* EvilIcons.ttf */, + 4397813CE7E748C6A0D73A1F /* Feather.ttf */, + 0167A9675C0F41089B2ABC0F /* FontAwesome.ttf */, + 207722383A464F6ABA03CDE4 /* Foundation.ttf */, + 9097825F02F24A9C8F721309 /* Ionicons.ttf */, + 792ABCE28E334902837AD696 /* MaterialCommunityIcons.ttf */, + 6B5A8805E6884466B94BC2F3 /* MaterialIcons.ttf */, + 5FD41736B515419999163C80 /* Octicons.ttf */, + C749DCD8741F4D9E9E649C1A /* SimpleLineIcons.ttf */, + 99DE5FB93C4A4F3BB7F21DC0 /* Zocial.ttf */, + 888EBBB9C2644F7BA1DA20F0 /* Sunflower-Bold.ttf */, + 0A832156A25C44219D3322EB /* Sunflower-Light.ttf */, + C74E215F6DC640C1BA5635D1 /* Sunflower-Medium.ttf */, + ); + name = Resources; + sourceTree = ""; + path = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -685,7 +740,7 @@ 83CBB9F71A601CBA00E9B192 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 610; ORGANIZATIONNAME = Facebook; TargetAttributes = { 00E356ED1AD99517003FC87E = { @@ -1050,6 +1105,20 @@ files = ( 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, + 8E13715B88114289B3478BF8 /* Entypo.ttf in Resources */, + E3457227633F4E878F4CC0CC /* EvilIcons.ttf in Resources */, + EB6D3BA0B8F546C99C0B9674 /* Feather.ttf in Resources */, + 2F50378B9E284EB5A1819DBD /* FontAwesome.ttf in Resources */, + FE7ACB58E7834B4AB08CED67 /* Foundation.ttf in Resources */, + E555644A1C44489D9463FEA0 /* Ionicons.ttf in Resources */, + 8C43D362726E48F98E9D2F5F /* MaterialCommunityIcons.ttf in Resources */, + 332AEC5A536B43B08CDB9F1E /* MaterialIcons.ttf in Resources */, + 13FF410448F749A4BD4D275D /* Octicons.ttf in Resources */, + E9B94F6443E544879C7C368B /* SimpleLineIcons.ttf in Resources */, + 1CA106AFC0134E3EB11B3A73 /* Zocial.ttf in Resources */, + E6CE4C9E77E94D47BAC97E48 /* Sunflower-Bold.ttf in Resources */, + 2C56BD85C0514ADEB5492343 /* Sunflower-Light.ttf in Resources */, + 431EB10EAF874768AF164A41 /* Sunflower-Medium.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1181,6 +1250,14 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Nexto.app/Nexto"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager", + ); }; name = Debug; }; @@ -1198,6 +1275,14 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Nexto.app/Nexto"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager", + ); }; name = Release; }; @@ -1216,6 +1301,10 @@ ); PRODUCT_NAME = Nexto; VERSIONING_SYSTEM = "apple-generic"; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager", + ); }; name = Debug; }; @@ -1233,6 +1322,10 @@ ); PRODUCT_NAME = Nexto; VERSIONING_SYSTEM = "apple-generic"; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager", + ); }; name = Release; }; @@ -1259,6 +1352,14 @@ SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.2; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager", + ); }; name = Debug; }; @@ -1285,6 +1386,14 @@ SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.2; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager", + ); }; name = Release; }; @@ -1310,6 +1419,14 @@ SDKROOT = appletvos; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Nexto-tvOS.app/Nexto-tvOS"; TVOS_DEPLOYMENT_TARGET = 10.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager", + ); }; name = Debug; }; @@ -1335,6 +1452,14 @@ SDKROOT = appletvos; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Nexto-tvOS.app/Nexto-tvOS"; TVOS_DEPLOYMENT_TARGET = 10.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager", + ); }; name = Release; }; diff --git a/ios/Nexto/Info.plist b/ios/Nexto/Info.plist index ccfaeb3..6bfdb34 100644 --- a/ios/Nexto/Info.plist +++ b/ios/Nexto/Info.plist @@ -39,9 +39,8 @@ UIViewControllerBasedStatusBarAppearance NSLocationWhenInUseUsageDescription - + NSAppTransportSecurity - NSExceptionDomains @@ -52,5 +51,22 @@ + UIAppFonts + + Entypo.ttf + EvilIcons.ttf + Feather.ttf + FontAwesome.ttf + Foundation.ttf + Ionicons.ttf + MaterialCommunityIcons.ttf + MaterialIcons.ttf + Octicons.ttf + SimpleLineIcons.ttf + Zocial.ttf + Sunflower-Bold.ttf + Sunflower-Light.ttf + Sunflower-Medium.ttf + diff --git a/package-lock.json b/package-lock.json index 00026da..c9f9f26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7357,6 +7357,38 @@ "prop-types": "15.6.1" } }, + "react-native-vector-icons": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-4.6.0.tgz", + "integrity": "sha512-rpfhfPiXCK2PX1nrNhdxSMrEGB/Gw/SvKoPM0G2wAkSoqynnes19K0VYI+Up7DqR1rFIpE4hP2erpT1tNx2tfg==", + "requires": { + "lodash": "4.17.5", + "prop-types": "15.6.1", + "yargs": "8.0.2" + }, + "dependencies": { + "yargs": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", + "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", + "requires": { + "camelcase": "4.1.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "read-pkg-up": "2.0.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "7.0.0" + } + } + } + }, "react-navigation": { "version": "1.0.0-beta.22", "resolved": "https://registry.npmjs.org/react-navigation/-/react-navigation-1.0.0-beta.22.tgz", diff --git a/package.json b/package.json index 4609915..5c3188c 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,11 @@ "name": "Nexto", "version": "0.0.1", "private": true, + "rnpm": { + "assets" : [ + "./app/assets/fonts/" + ] + }, "scripts": { "start": "node node_modules/react-native/local-cli/cli.js start", "test": "jest" @@ -9,7 +14,8 @@ "dependencies": { "react": "16.3.1", "react-native": "^0.55.3", - "react-native-router-flux": "^4.0.0-beta.28" + "react-native-router-flux": "^4.0.0-beta.28", + "react-native-vector-icons": "^4.6.0" }, "devDependencies": { "babel-jest": "22.4.3",