diff options
27 files changed, 340 insertions, 79 deletions
diff --git a/android/app/build.gradle b/android/app/build.gradle index d0d5909..6f546cf 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -126,6 +126,8 @@ android { } dependencies { + compile project(':react-native-vector-icons') + compile project(':react-native-config') compile fileTree(dir: "libs", include: ["*.jar"]) compile "com.android.support:appcompat-v7:23.0.1" compile "com.facebook.react:react-native:+" // From node_modules diff --git a/android/app/src/main/assets/fonts/Andale Mono.ttf b/android/app/src/main/assets/fonts/Andale Mono.ttf Binary files differnew file mode 100644 index 0000000..e766a6e --- /dev/null +++ b/android/app/src/main/assets/fonts/Andale Mono.ttf diff --git a/android/app/src/main/assets/fonts/Arial Black.ttf b/android/app/src/main/assets/fonts/Arial Black.ttf Binary files differnew file mode 100644 index 0000000..8877277 --- /dev/null +++ b/android/app/src/main/assets/fonts/Arial Black.ttf diff --git a/android/app/src/main/assets/fonts/Arial.ttf b/android/app/src/main/assets/fonts/Arial.ttf Binary files differnew file mode 100644 index 0000000..ab68fb1 --- /dev/null +++ b/android/app/src/main/assets/fonts/Arial.ttf diff --git a/android/app/src/main/assets/fonts/Comic Sans MS.ttf b/android/app/src/main/assets/fonts/Comic Sans MS.ttf Binary files differnew file mode 100644 index 0000000..831e3d8 --- /dev/null +++ b/android/app/src/main/assets/fonts/Comic Sans MS.ttf diff --git a/android/app/src/main/assets/fonts/Courier New.ttf b/android/app/src/main/assets/fonts/Courier New.ttf Binary files differnew file mode 100644 index 0000000..633899d --- /dev/null +++ b/android/app/src/main/assets/fonts/Courier New.ttf diff --git a/android/app/src/main/assets/fonts/Entypo.ttf b/android/app/src/main/assets/fonts/Entypo.ttf Binary files differnew file mode 100644 index 0000000..1c8f5e9 --- /dev/null +++ b/android/app/src/main/assets/fonts/Entypo.ttf diff --git a/android/app/src/main/assets/fonts/EvilIcons.ttf b/android/app/src/main/assets/fonts/EvilIcons.ttf Binary files differnew file mode 100644 index 0000000..b270f98 --- /dev/null +++ b/android/app/src/main/assets/fonts/EvilIcons.ttf diff --git a/android/app/src/main/assets/fonts/FontAwesome.ttf b/android/app/src/main/assets/fonts/FontAwesome.ttf Binary files differnew file mode 100644 index 0000000..f221e50 --- /dev/null +++ b/android/app/src/main/assets/fonts/FontAwesome.ttf diff --git a/android/app/src/main/assets/fonts/Foundation.ttf b/android/app/src/main/assets/fonts/Foundation.ttf Binary files differnew file mode 100644 index 0000000..6cce217 --- /dev/null +++ b/android/app/src/main/assets/fonts/Foundation.ttf diff --git a/android/app/src/main/assets/fonts/Georgia.ttf b/android/app/src/main/assets/fonts/Georgia.ttf Binary files differnew file mode 100644 index 0000000..d157006 --- /dev/null +++ b/android/app/src/main/assets/fonts/Georgia.ttf diff --git a/android/app/src/main/assets/fonts/Ionicons.ttf b/android/app/src/main/assets/fonts/Ionicons.ttf Binary files differnew file mode 100644 index 0000000..307ad88 --- /dev/null +++ b/android/app/src/main/assets/fonts/Ionicons.ttf diff --git a/android/app/src/main/assets/fonts/MaterialIcons.ttf b/android/app/src/main/assets/fonts/MaterialIcons.ttf Binary files differnew file mode 100644 index 0000000..7015564 --- /dev/null +++ b/android/app/src/main/assets/fonts/MaterialIcons.ttf diff --git a/android/app/src/main/assets/fonts/Microsoft Sans Serif.ttf b/android/app/src/main/assets/fonts/Microsoft Sans Serif.ttf Binary files differnew file mode 100644 index 0000000..8cb1d92 --- /dev/null +++ b/android/app/src/main/assets/fonts/Microsoft Sans Serif.ttf diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf Binary files differnew file mode 100644 index 0000000..0a62bb9 --- /dev/null +++ b/android/app/src/main/assets/fonts/Octicons.ttf diff --git a/android/app/src/main/assets/fonts/Roboto.ttf b/android/app/src/main/assets/fonts/Roboto.ttf Binary files differnew file mode 100755 index 0000000..3e6e2e7 --- /dev/null +++ b/android/app/src/main/assets/fonts/Roboto.ttf diff --git a/android/app/src/main/assets/fonts/Roboto_medium.ttf b/android/app/src/main/assets/fonts/Roboto_medium.ttf Binary files differnew file mode 100755 index 0000000..aa00de0 --- /dev/null +++ b/android/app/src/main/assets/fonts/Roboto_medium.ttf diff --git a/android/app/src/main/assets/fonts/SF-UI-Text-Regular.otf b/android/app/src/main/assets/fonts/SF-UI-Text-Regular.otf Binary files differnew file mode 100644 index 0000000..a36c8f6 --- /dev/null +++ b/android/app/src/main/assets/fonts/SF-UI-Text-Regular.otf diff --git a/android/app/src/main/assets/fonts/Skia.ttf b/android/app/src/main/assets/fonts/Skia.ttf Binary files differnew file mode 100644 index 0000000..8bb197b --- /dev/null +++ b/android/app/src/main/assets/fonts/Skia.ttf diff --git a/android/app/src/main/assets/fonts/Times New Roman.ttf b/android/app/src/main/assets/fonts/Times New Roman.ttf Binary files differnew file mode 100644 index 0000000..d7969c3 --- /dev/null +++ b/android/app/src/main/assets/fonts/Times New Roman.ttf diff --git a/android/app/src/main/assets/fonts/Zocial.ttf b/android/app/src/main/assets/fonts/Zocial.ttf Binary files differnew file mode 100644 index 0000000..e4ae46c --- /dev/null +++ b/android/app/src/main/assets/fonts/Zocial.ttf diff --git a/android/app/src/main/java/com/stronglifters/MainApplication.java b/android/app/src/main/java/com/stronglifters/MainApplication.java index a829c5b..7827338 100644 --- a/android/app/src/main/java/com/stronglifters/MainApplication.java +++ b/android/app/src/main/java/com/stronglifters/MainApplication.java @@ -4,6 +4,8 @@ import android.app.Application; import android.util.Log; import com.facebook.react.ReactApplication; +import com.oblador.vectoricons.VectorIconsPackage; +import com.lugg.ReactNativeConfig.ReactNativeConfigPackage; import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; @@ -24,7 +26,9 @@ public class MainApplication extends Application implements ReactApplication { @Override protected List<ReactPackage> getPackages() { return Arrays.<ReactPackage>asList( - new MainReactPackage() + new MainReactPackage(), + new VectorIconsPackage(), + new ReactNativeConfigPackage() ); } }; diff --git a/android/settings.gradle b/android/settings.gradle index 7a7a9cd..8932dbd 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,3 +1,7 @@ rootProject.name = 'StrongLifters' +include ':react-native-vector-icons' +project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android') +include ':react-native-config' +project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android') include ':app' diff --git a/ios/StrongLifters.xcodeproj/project.pbxproj b/ios/StrongLifters.xcodeproj/project.pbxproj index 9d07242..f43f5d3 100644 --- a/ios/StrongLifters.xcodeproj/project.pbxproj +++ b/ios/StrongLifters.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 */; }; @@ -24,6 +23,28 @@ 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; + F8C54714CB1A4CCDAF106977 /* libReactNativeConfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A0A6BDF02DFF4E92A99FB2EF /* libReactNativeConfig.a */; }; + A49D8DF465AA4955A8BD8BFF /* Andale Mono.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9B5E5FB2B4C94FA39A8E9EB5 /* Andale Mono.ttf */; }; + 5975450B9F4B401BBEB6F8B8 /* Arial Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEF2CE3FF6C84648AE3370CB /* Arial Black.ttf */; }; + D64BA58508A04EF485D386EB /* Arial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F2C00C181EC3401798D27DD4 /* Arial.ttf */; }; + 8F67A2101F8142C585643364 /* Comic Sans MS.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 44D7C3BE785143449C3E5BB0 /* Comic Sans MS.ttf */; }; + D4C6B7844B2448A19CDC65E8 /* Courier New.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0916D313502547E89177D259 /* Courier New.ttf */; }; + 704024CCD5704B0597EF8417 /* Georgia.ttf in Resources */ = {isa = PBXBuildFile; fileRef = AD66EEAC4EC140C8AB9C344D /* Georgia.ttf */; }; + 6ABBCE827CC641209FB913B3 /* Microsoft Sans Serif.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1FBDCAFF6D014CC29E7A273D /* Microsoft Sans Serif.ttf */; }; + D9CBF8C090C34CE1AD9AD6F8 /* Roboto_medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 42737D9219EE450DB5031E8D /* Roboto_medium.ttf */; }; + 0CAAB0544B03435ABB623AC8 /* Roboto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C2B8EE6268994AAEA1234B7F /* Roboto.ttf */; }; + F9E393B1F9C047FC8153CB9D /* SF-UI-Text-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 358410884F0E4DB8B879E468 /* SF-UI-Text-Regular.otf */; }; + FABE0133F92140FE96A1F47F /* Skia.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B8CD6B4D47874A9894059E6B /* Skia.ttf */; }; + 7E4854E6828C4FD49EF9AA84 /* Times New Roman.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C0CBA4B690D2436796D3D703 /* Times New Roman.ttf */; }; + 8943FE0C9BF6410985082DD6 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A3BE86B68436497A9E5C32E4 /* libRNVectorIcons.a */; }; + 6C222C11852544D5BE2678E2 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E5D1636BE312436C9D19B544 /* Entypo.ttf */; }; + BD431D13A7C0451980949491 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 37DED1C24C36448CA6A47620 /* EvilIcons.ttf */; }; + 550CE4F9312248B49CDE52B3 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 49AD6462C70D4A20A2C5F43B /* FontAwesome.ttf */; }; + DDA48035171D4BA0995B5E5D /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BD9EA57CA92B4C67A7F63BED /* Foundation.ttf */; }; + 0111B293F5D04EC2BC0DE294 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 44C72ADE63674C5784AE1673 /* Ionicons.ttf */; }; + E48347B5F63D4440ABBD39A3 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B7AB0D1B6591425F9B21644C /* MaterialIcons.ttf */; }; + 248F49D1607040A39085987F /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C084BC3828F64A06B50D22A6 /* Octicons.ttf */; }; + 7036AFC4EABB432DB1089017 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = AE4DD0111C30434E9EB957E1 /* Zocial.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -143,6 +164,30 @@ 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; }; + 1ABE40419C334291B1632D80 /* ReactNativeConfig.xcodeproj */ = {isa = PBXFileReference; name = "ReactNativeConfig.xcodeproj"; path = "../node_modules/react-native-config/ios/ReactNativeConfig.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; + A0A6BDF02DFF4E92A99FB2EF /* libReactNativeConfig.a */ = {isa = PBXFileReference; name = "libReactNativeConfig.a"; path = "libReactNativeConfig.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; + 9B5E5FB2B4C94FA39A8E9EB5 /* Andale Mono.ttf */ = {isa = PBXFileReference; name = "Andale Mono.ttf"; path = "../node_modules/native-base/Fonts/Andale Mono.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + EEF2CE3FF6C84648AE3370CB /* Arial Black.ttf */ = {isa = PBXFileReference; name = "Arial Black.ttf"; path = "../node_modules/native-base/Fonts/Arial Black.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + F2C00C181EC3401798D27DD4 /* Arial.ttf */ = {isa = PBXFileReference; name = "Arial.ttf"; path = "../node_modules/native-base/Fonts/Arial.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 44D7C3BE785143449C3E5BB0 /* Comic Sans MS.ttf */ = {isa = PBXFileReference; name = "Comic Sans MS.ttf"; path = "../node_modules/native-base/Fonts/Comic Sans MS.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 0916D313502547E89177D259 /* Courier New.ttf */ = {isa = PBXFileReference; name = "Courier New.ttf"; path = "../node_modules/native-base/Fonts/Courier New.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + AD66EEAC4EC140C8AB9C344D /* Georgia.ttf */ = {isa = PBXFileReference; name = "Georgia.ttf"; path = "../node_modules/native-base/Fonts/Georgia.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 1FBDCAFF6D014CC29E7A273D /* Microsoft Sans Serif.ttf */ = {isa = PBXFileReference; name = "Microsoft Sans Serif.ttf"; path = "../node_modules/native-base/Fonts/Microsoft Sans Serif.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 42737D9219EE450DB5031E8D /* Roboto_medium.ttf */ = {isa = PBXFileReference; name = "Roboto_medium.ttf"; path = "../node_modules/native-base/Fonts/Roboto_medium.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C2B8EE6268994AAEA1234B7F /* Roboto.ttf */ = {isa = PBXFileReference; name = "Roboto.ttf"; path = "../node_modules/native-base/Fonts/Roboto.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 358410884F0E4DB8B879E468 /* SF-UI-Text-Regular.otf */ = {isa = PBXFileReference; name = "SF-UI-Text-Regular.otf"; path = "../node_modules/native-base/Fonts/SF-UI-Text-Regular.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + B8CD6B4D47874A9894059E6B /* Skia.ttf */ = {isa = PBXFileReference; name = "Skia.ttf"; path = "../node_modules/native-base/Fonts/Skia.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C0CBA4B690D2436796D3D703 /* Times New Roman.ttf */ = {isa = PBXFileReference; name = "Times New Roman.ttf"; path = "../node_modules/native-base/Fonts/Times New Roman.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 2CDB2DED7A5A456B9FCC2746 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; name = "RNVectorIcons.xcodeproj"; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; + A3BE86B68436497A9E5C32E4 /* libRNVectorIcons.a */ = {isa = PBXFileReference; name = "libRNVectorIcons.a"; path = "libRNVectorIcons.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; + E5D1636BE312436C9D19B544 /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 37DED1C24C36448CA6A47620 /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 49AD6462C70D4A20A2C5F43B /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + BD9EA57CA92B4C67A7F63BED /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 44C72ADE63674C5784AE1673 /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + B7AB0D1B6591425F9B21644C /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C084BC3828F64A06B50D22A6 /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + AE4DD0111C30434E9EB957E1 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -169,6 +214,8 @@ 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, + F8C54714CB1A4CCDAF106977 /* libReactNativeConfig.a in Frameworks */, + 8943FE0C9BF6410985082DD6 /* libRNVectorIcons.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -301,6 +348,8 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, + 1ABE40419C334291B1632D80 /* ReactNativeConfig.xcodeproj */, + 2CDB2DED7A5A456B9FCC2746 /* RNVectorIcons.xcodeproj */, ); name = Libraries; sourceTree = "<group>"; @@ -320,6 +369,7 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */, 00E356EF1AD99517003FC87E /* StrongLiftersTests */, 83CBBA001A601CBA00E9B192 /* Products */, + 67129D77A3F24E87A2A5A100 /* Resources */, ); indentWidth = 2; sourceTree = "<group>"; @@ -334,6 +384,34 @@ name = Products; sourceTree = "<group>"; }; + 67129D77A3F24E87A2A5A100 /* Resources */ = { + isa = PBXGroup; + children = ( + 9B5E5FB2B4C94FA39A8E9EB5 /* Andale Mono.ttf */, + EEF2CE3FF6C84648AE3370CB /* Arial Black.ttf */, + F2C00C181EC3401798D27DD4 /* Arial.ttf */, + 44D7C3BE785143449C3E5BB0 /* Comic Sans MS.ttf */, + 0916D313502547E89177D259 /* Courier New.ttf */, + AD66EEAC4EC140C8AB9C344D /* Georgia.ttf */, + 1FBDCAFF6D014CC29E7A273D /* Microsoft Sans Serif.ttf */, + 42737D9219EE450DB5031E8D /* Roboto_medium.ttf */, + C2B8EE6268994AAEA1234B7F /* Roboto.ttf */, + 358410884F0E4DB8B879E468 /* SF-UI-Text-Regular.otf */, + B8CD6B4D47874A9894059E6B /* Skia.ttf */, + C0CBA4B690D2436796D3D703 /* Times New Roman.ttf */, + E5D1636BE312436C9D19B544 /* Entypo.ttf */, + 37DED1C24C36448CA6A47620 /* EvilIcons.ttf */, + 49AD6462C70D4A20A2C5F43B /* FontAwesome.ttf */, + BD9EA57CA92B4C67A7F63BED /* Foundation.ttf */, + 44C72ADE63674C5784AE1673 /* Ionicons.ttf */, + B7AB0D1B6591425F9B21644C /* MaterialIcons.ttf */, + C084BC3828F64A06B50D22A6 /* Octicons.ttf */, + AE4DD0111C30434E9EB957E1 /* Zocial.ttf */, + ); + name = Resources; + path = ""; + sourceTree = "<group>"; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -379,7 +457,7 @@ 83CBB9F71A601CBA00E9B192 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 610; ORGANIZATIONNAME = Facebook; TargetAttributes = { 00E356ED1AD99517003FC87E = { @@ -554,6 +632,26 @@ files = ( 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, + A49D8DF465AA4955A8BD8BFF /* Andale Mono.ttf in Resources */, + 5975450B9F4B401BBEB6F8B8 /* Arial Black.ttf in Resources */, + D64BA58508A04EF485D386EB /* Arial.ttf in Resources */, + 8F67A2101F8142C585643364 /* Comic Sans MS.ttf in Resources */, + D4C6B7844B2448A19CDC65E8 /* Courier New.ttf in Resources */, + 704024CCD5704B0597EF8417 /* Georgia.ttf in Resources */, + 6ABBCE827CC641209FB913B3 /* Microsoft Sans Serif.ttf in Resources */, + D9CBF8C090C34CE1AD9AD6F8 /* Roboto_medium.ttf in Resources */, + 0CAAB0544B03435ABB623AC8 /* Roboto.ttf in Resources */, + F9E393B1F9C047FC8153CB9D /* SF-UI-Text-Regular.otf in Resources */, + FABE0133F92140FE96A1F47F /* Skia.ttf in Resources */, + 7E4854E6828C4FD49EF9AA84 /* Times New Roman.ttf in Resources */, + 6C222C11852544D5BE2678E2 /* Entypo.ttf in Resources */, + BD431D13A7C0451980949491 /* EvilIcons.ttf in Resources */, + 550CE4F9312248B49CDE52B3 /* FontAwesome.ttf in Resources */, + DDA48035171D4BA0995B5E5D /* Foundation.ttf in Resources */, + 0111B293F5D04EC2BC0DE294 /* Ionicons.ttf in Resources */, + E48347B5F63D4440ABBD39A3 /* MaterialIcons.ttf in Resources */, + 248F49D1607040A39085987F /* Octicons.ttf in Resources */, + 7036AFC4EABB432DB1089017 /* Zocial.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -630,6 +728,11 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StrongLifters.app/StrongLifters"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); }; name = Debug; }; @@ -643,6 +746,11 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StrongLifters.app/StrongLifters"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); }; name = Release; }; @@ -719,6 +827,8 @@ "$(inherited)", "$(SRCROOT)/../node_modules/react-native/React/**", "$(SRCROOT)/../node_modules/react-native/ReactCommon/**", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -759,6 +869,8 @@ "$(inherited)", "$(SRCROOT)/../node_modules/react-native/React/**", "$(SRCROOT)/../node_modules/react-native/ReactCommon/**", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; diff --git a/ios/StrongLifters/Info.plist b/ios/StrongLifters/Info.plist index 2fb6a11..982d483 100644 --- a/ios/StrongLifters/Info.plist +++ b/ios/StrongLifters/Info.plist @@ -1,54 +1,76 @@ <?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> - <key>CFBundleDevelopmentRegion</key> - <string>en</string> - <key>CFBundleExecutable</key> - <string>$(EXECUTABLE_NAME)</string> - <key>CFBundleIdentifier</key> - <string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>$(PRODUCT_NAME)</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>1.0</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleVersion</key> - <string>1</string> - <key>LSRequiresIPhoneOS</key> - <true/> - <key>UILaunchStoryboardName</key> - <string>LaunchScreen</string> - <key>UIRequiredDeviceCapabilities</key> - <array> - <string>armv7</string> - </array> - <key>UISupportedInterfaceOrientations</key> - <array> - <string>UIInterfaceOrientationPortrait</string> - <string>UIInterfaceOrientationLandscapeLeft</string> - <string>UIInterfaceOrientationLandscapeRight</string> - </array> - <key>UIViewControllerBasedStatusBarAppearance</key> - <false/> - <key>NSLocationWhenInUseUsageDescription</key> - <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> - <key>localhost</key> - <dict> - <key>NSExceptionAllowsInsecureHTTPLoads</key> - <true/> - </dict> - </dict> - </dict> -</dict> -</plist> + <dict> + <key>CFBundleDevelopmentRegion</key> + <string>en</string> + <key>CFBundleExecutable</key> + <string>$(EXECUTABLE_NAME)</string> + <key>CFBundleIdentifier</key> + <string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>$(PRODUCT_NAME)</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>1.0</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleVersion</key> + <string>1</string> + <key>LSRequiresIPhoneOS</key> + <true/> + <key>UILaunchStoryboardName</key> + <string>LaunchScreen</string> + <key>UIRequiredDeviceCapabilities</key> + <array> + <string>armv7</string> + </array> + <key>UISupportedInterfaceOrientations</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + <string>UIInterfaceOrientationLandscapeLeft</string> + <string>UIInterfaceOrientationLandscapeRight</string> + </array> + <key>UIViewControllerBasedStatusBarAppearance</key> + <false/> + <key>NSLocationWhenInUseUsageDescription</key> + <string/> + <key>NSAppTransportSecurity</key> + <dict> + <key>NSExceptionDomains</key> + <dict> + <key>localhost</key> + <dict> + <key>NSExceptionAllowsInsecureHTTPLoads</key> + <true/> + </dict> + </dict> + </dict> + <key>UIAppFonts</key> + <array> + <string>Andale Mono.ttf</string> + <string>Arial Black.ttf</string> + <string>Arial.ttf</string> + <string>Comic Sans MS.ttf</string> + <string>Courier New.ttf</string> + <string>Georgia.ttf</string> + <string>Microsoft Sans Serif.ttf</string> + <string>Roboto_medium.ttf</string> + <string>Roboto.ttf</string> + <string>SF-UI-Text-Regular.otf</string> + <string>Skia.ttf</string> + <string>Times New Roman.ttf</string> + <string>Entypo.ttf</string> + <string>EvilIcons.ttf</string> + <string>FontAwesome.ttf</string> + <string>Foundation.ttf</string> + <string>Ionicons.ttf</string> + <string>MaterialIcons.ttf</string> + <string>Octicons.ttf</string> + <string>Zocial.ttf</string> + </array> + </dict> +</plist>
\ No newline at end of file diff --git a/package.json b/package.json index 16d2bfb..9e05c4b 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,26 @@ { - "name": "StrongLifters", - "version": "0.0.1", - "private": true, - "scripts": { - "start": "node node_modules/react-native/local-cli/cli.js start", - "test": "jest" - }, - "dependencies": { - "react": "15.4.1", - "react-native": "0.39.2" - }, - "devDependencies": { - "babel-jest": "18.0.0", - "babel-preset-react-native": "1.9.1", - "jest": "18.0.0", - "react-test-renderer": "15.4.1" - }, - "jest": { - "preset": "react-native" - } -}
\ No newline at end of file + "name": "StrongLifters", + "version": "0.0.1", + "private": true, + "scripts": { + "start": "node node_modules/react-native/local-cli/cli.js start", + "test": "jest" + }, + "dependencies": { + "moment": "^2.17.1", + "native-base": "^0.5.18", + "react": "15.4.1", + "react-native": "0.39.2", + "react-native-config": "^0.2.1", + "tcomb-form-native": "^0.6.3" + }, + "devDependencies": { + "babel-jest": "18.0.0", + "babel-preset-react-native": "1.9.1", + "jest": "18.0.0", + "react-test-renderer": "15.4.1" + }, + "jest": { + "preset": "react-native" + } +} @@ -936,6 +936,10 @@ ci-info@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534" +clamp@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/clamp/-/clamp-1.0.1.tgz#66a0e64011816e37196828fdc8c8c147312c8634" + cli-cursor@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" @@ -987,6 +991,30 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" +color-convert@^1.3.0: + version "1.8.2" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.8.2.tgz#be868184d7c8631766d54e7078e2672d7c7e3339" + dependencies: + color-name "^1.1.1" + +color-name@^1.0.0, color-name@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689" + +color-string@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991" + dependencies: + color-name "^1.0.0" + +color@~0.11.1: + version "0.11.4" + resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764" + dependencies: + clone "^1.0.2" + color-convert "^1.3.0" + color-string "^0.3.0" + colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -2379,7 +2407,7 @@ lodash._root@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" -lodash.assign@^4.2.0: +lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" @@ -2453,10 +2481,14 @@ lodash@^3.5.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.14.0, lodash@^4.16.6, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.6.1: +lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.16.6, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.6.1: version "4.17.2" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42" +lodash@~4.11.1: + version "4.11.2" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.11.2.tgz#d6b4338b110a58e21dae5cebcfdbbfd2bc4cdb3b" + longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -2615,7 +2647,7 @@ mkdirp@0.5.x, mkdirp@^0.5.1: dependencies: minimist "0.0.8" -moment@2.x.x: +moment@2.x.x, moment@^2.17.1: version "2.17.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82" @@ -2663,6 +2695,18 @@ mute-stream@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" +native-base@^0.5.18: + version "0.5.18" + resolved "https://registry.yarnpkg.com/native-base/-/native-base-0.5.18.tgz#37bb080cd5d456d2f1135670819d063c8fbcc275" + dependencies: + clamp "^1.0.1" + color "~0.11.1" + lodash "~4.11.1" + react-native-checkbox "~1.0.8" + react-native-easy-grid "0.1.7" + react-native-keyboard-aware-scroll-view "0.2.0" + react-native-vector-icons "2.x.x" + natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -2981,6 +3025,33 @@ react-deep-force-update@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-1.0.1.tgz#f911b5be1d2a6fe387507dd6e9a767aa2924b4c7" +react-native-checkbox@~1.0.8: + version "1.0.17" + resolved "https://registry.yarnpkg.com/react-native-checkbox/-/react-native-checkbox-1.0.17.tgz#94c61f190ef728c38763f48cd7ab91a6ad9fd4e2" + +react-native-config@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/react-native-config/-/react-native-config-0.2.1.tgz#8331c050b8f487019b1baed93451f06ae5848926" + +react-native-easy-grid@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/react-native-easy-grid/-/react-native-easy-grid-0.1.7.tgz#44205cc39adff32a8a20efa8451d76a4499f0a3f" + dependencies: + lodash "^4.11.1" + +react-native-keyboard-aware-scroll-view@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/react-native-keyboard-aware-scroll-view/-/react-native-keyboard-aware-scroll-view-0.2.0.tgz#d9a94b358cbf92693750b16b4364d64d70060f20" + dependencies: + react-timer-mixin "^0.13.3" + +react-native-vector-icons@2.x.x: + version "2.1.0" + resolved "https://registry.yarnpkg.com/react-native-vector-icons/-/react-native-vector-icons-2.1.0.tgz#37ff40e2fc753a56624846e7471282b818b92edc" + dependencies: + lodash "^4.0.0" + yargs "^4.7.0" + react-native@0.39.2: version "0.39.2" resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.39.2.tgz#c73ed67ff25ea8e31643ac6ef2d60a88f26d12c1" @@ -3071,7 +3142,7 @@ react-test-renderer@15.4.1: version "15.4.1" resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.4.1.tgz#e38cd7057868d4a655d3764689735b4b97260706" -react-timer-mixin@^0.13.2: +react-timer-mixin@^0.13.2, react-timer-mixin@^0.13.3: version "0.13.3" resolved "https://registry.yarnpkg.com/react-timer-mixin/-/react-timer-mixin-0.13.3.tgz#0da8b9f807ec07dc3e854d082c737c65605b3d22" @@ -3544,6 +3615,22 @@ supports-color@^3.1.2: version "3.2.1" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.1.tgz#8549dd1d01fa9f893c18cc9ab0b106b4d9b168cb" +tcomb-form-native@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/tcomb-form-native/-/tcomb-form-native-0.6.3.tgz#fe4673aaaa99c70d5ad1d60371622940f60ead05" + dependencies: + tcomb-validation "^3.0.0" + +tcomb-validation@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/tcomb-validation/-/tcomb-validation-3.3.0.tgz#29ada8534203500e90b245eedd0e1a80f1909ba2" + dependencies: + tcomb "^3.0.0" + +tcomb@^3.0.0: + version "3.2.15" + resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-3.2.15.tgz#09e40f447976d1d9c07ff465b8377342a8fe67e1" + temp@0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59" @@ -3850,12 +3937,38 @@ yallist@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.0.0.tgz#306c543835f09ee1a4cb23b7bce9ab341c91cdd4" +yargs-parser@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" + dependencies: + camelcase "^3.0.0" + lodash.assign "^4.0.6" + yargs-parser@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.0.tgz#6ced869cd05a3dca6a1eaee38b68aeed4b0b4101" dependencies: camelcase "^3.0.0" +yargs@^4.7.0: + version "4.8.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0" + dependencies: + cliui "^3.2.0" + decamelize "^1.1.1" + get-caller-file "^1.0.1" + lodash.assign "^4.0.3" + os-locale "^1.4.0" + read-pkg-up "^1.0.1" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^1.0.1" + which-module "^1.0.0" + window-size "^0.2.0" + y18n "^3.2.1" + yargs-parser "^2.4.1" + yargs@^6.3.0, yargs@^6.4.0: version "6.5.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.5.0.tgz#a902e23a1f0fe912b2a03f6131b7ed740c9718ff" |