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..26dea79 Binary files /dev/null and b/android/app/src/main/assets/fonts/FontAwesome.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..c4e4632 Binary files /dev/null and b/android/app/src/main/assets/fonts/Ionicons.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..0a62bb9 Binary files /dev/null and b/android/app/src/main/assets/fonts/Octicons.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/net/theorangeone/Sphere/MainActivity.java b/android/app/src/main/java/net/theorangeone/sphere/MainActivity.java similarity index 100% rename from android/app/src/main/java/net/theorangeone/Sphere/MainActivity.java rename to android/app/src/main/java/net/theorangeone/sphere/MainActivity.java diff --git a/android/settings.gradle b/android/settings.gradle index 454b271..e3d324e 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,3 +1,3 @@ -rootProject.name = 'Sphere' +rootProject.name = 'sphere' include ':app' diff --git a/ios/Sphere.xcodeproj/project.pbxproj b/ios/Sphere.xcodeproj/project.pbxproj index 52f7ad9..493fb30 100644 --- a/ios/Sphere.xcodeproj/project.pbxproj +++ b/ios/Sphere.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 */; }; @@ -22,6 +21,15 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; + C200FE733CDD4A2FB3603718 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 241F48DCAD554FBAA1FE99DE /* libRNVectorIcons.a */; }; + E989F1D1122D47C0BD857E8D /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2D70717F7C164E6D907D6200 /* Entypo.ttf */; }; + FA01A0D51D5B4A3BBE7E698A /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 17D44F59FD7144978682FF31 /* EvilIcons.ttf */; }; + 7838A63045AB4CDA8E19E4FB /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 90FC9AAE15B5475D990B70B1 /* FontAwesome.ttf */; }; + 38211C72F97B4B7A94279CFF /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3BF762A1D1394762BECF4FD7 /* Foundation.ttf */; }; + F243A61034344F3284CBD1D0 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4631832BC49B4F5DB6B3FA81 /* Ionicons.ttf */; }; + 8F081F518B154728AE83C449 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5AC570600CDC4C0AA5759C55 /* MaterialIcons.ttf */; }; + 5B68C27C8F36405E84BA3154 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4DAEB1CB9F1348D797E1464C /* Octicons.ttf */; }; + A49DEBBF93AB45AE96992041 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 148C00397709478690F62517 /* Zocial.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -126,6 +134,16 @@ 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../node_modules/react-native/React/React.xcodeproj; sourceTree = ""; }; 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 = ""; }; + 0DCE331EC7744165A5CD6B84 /* 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; }; + 241F48DCAD554FBAA1FE99DE /* libRNVectorIcons.a */ = {isa = PBXFileReference; name = "libRNVectorIcons.a"; path = "libRNVectorIcons.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; + 2D70717F7C164E6D907D6200 /* 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; }; + 17D44F59FD7144978682FF31 /* 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; }; + 90FC9AAE15B5475D990B70B1 /* 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; }; + 3BF762A1D1394762BECF4FD7 /* 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; }; + 4631832BC49B4F5DB6B3FA81 /* 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; }; + 5AC570600CDC4C0AA5759C55 /* 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; }; + 4DAEB1CB9F1348D797E1464C /* 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; }; + 148C00397709478690F62517 /* 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; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -150,6 +168,7 @@ 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, + C200FE733CDD4A2FB3603718 /* libRNVectorIcons.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -272,6 +291,7 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, + 0DCE331EC7744165A5CD6B84 /* RNVectorIcons.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -291,6 +311,7 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */, 00E356EF1AD99517003FC87E /* SphereTests */, 83CBBA001A601CBA00E9B192 /* Products */, + DEE0D7AAFCE944A5B0019454 /* Resources */, ); indentWidth = 2; sourceTree = ""; @@ -305,6 +326,22 @@ name = Products; sourceTree = ""; }; + DEE0D7AAFCE944A5B0019454 /* Resources */ = { + isa = PBXGroup; + children = ( + 2D70717F7C164E6D907D6200 /* Entypo.ttf */, + 17D44F59FD7144978682FF31 /* EvilIcons.ttf */, + 90FC9AAE15B5475D990B70B1 /* FontAwesome.ttf */, + 3BF762A1D1394762BECF4FD7 /* Foundation.ttf */, + 4631832BC49B4F5DB6B3FA81 /* Ionicons.ttf */, + 5AC570600CDC4C0AA5759C55 /* MaterialIcons.ttf */, + 4DAEB1CB9F1348D797E1464C /* Octicons.ttf */, + 148C00397709478690F62517 /* Zocial.ttf */, + ); + name = Resources; + path = ""; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -350,7 +387,7 @@ 83CBB9F71A601CBA00E9B192 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 610; ORGANIZATIONNAME = Facebook; TargetAttributes = { 00E356ED1AD99517003FC87E = { @@ -507,6 +544,14 @@ files = ( 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, + E989F1D1122D47C0BD857E8D /* Entypo.ttf in Resources */, + FA01A0D51D5B4A3BBE7E698A /* EvilIcons.ttf in Resources */, + 7838A63045AB4CDA8E19E4FB /* FontAwesome.ttf in Resources */, + 38211C72F97B4B7A94279CFF /* Foundation.ttf in Resources */, + F243A61034344F3284CBD1D0 /* Ionicons.ttf in Resources */, + 8F081F518B154728AE83C449 /* MaterialIcons.ttf in Resources */, + 5B68C27C8F36405E84BA3154 /* Octicons.ttf in Resources */, + A49DEBBF93AB45AE96992041 /* Zocial.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -588,6 +633,10 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Sphere.app/Sphere"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); }; name = Debug; }; @@ -605,6 +654,10 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Sphere.app/Sphere"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); }; name = Release; }; @@ -617,6 +670,7 @@ "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", ); INFOPLIST_FILE = "Sphere/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -633,6 +687,7 @@ "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", ); INFOPLIST_FILE = "Sphere/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -679,6 +734,7 @@ "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -719,6 +775,7 @@ "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; diff --git a/ios/Sphere/Info.plist b/ios/Sphere/Info.plist index 91963b2..df389b1 100644 --- a/ios/Sphere/Info.plist +++ b/ios/Sphere/Info.plist @@ -1,48 +1,58 @@ - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - NSLocationWhenInUseUsageDescription - - NSAppTransportSecurity - - NSAllowsArbitraryLoads + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSRequiresIPhoneOS + UILaunchStoryboardName + LaunchScreen + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + NSLocationWhenInUseUsageDescription + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + UIAppFonts + + Entypo.ttf + EvilIcons.ttf + FontAwesome.ttf + Foundation.ttf + Ionicons.ttf + MaterialIcons.ttf + Octicons.ttf + Zocial.ttf + - - + \ No newline at end of file diff --git a/package.json b/package.json index 8cf5fa6..8220032 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "scripts": { "lint": "eslint 'app/' 'index.ios.js' 'index.android.js'", "start": "node node_modules/react-native/local-cli/cli.js start", - "test": "npm run lint" + "test": "npm run lint", + "link": "rnpm link" }, "dependencies": { "immutable": "=3.7.6", @@ -25,6 +26,7 @@ "eslint": "=1.10.3", "eslint-config": "git://github.com/oleous/eslint-config.git", "eslint-plugin-react": "=4.1.0", - "eslint-plugin-react-native": "=1.0.0" + "eslint-plugin-react-native": "=1.0.0", + "rnpm": "^1.4.1" } }