diff --git a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf index c9a3a3055..82524a0c1 100644 Binary files a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf and b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf index 09e2b2d79..ff0dda184 100644 Binary files a/android/app/src/main/assets/fonts/Octicons.ttf and b/android/app/src/main/assets/fonts/Octicons.ttf differ diff --git a/android/app/src/main/assets/fonts/Roboto.ttf b/android/app/src/main/assets/fonts/Roboto.ttf new file mode 100644 index 000000000..3e6e2e761 Binary files /dev/null and b/android/app/src/main/assets/fonts/Roboto.ttf differ diff --git a/android/app/src/main/assets/fonts/Roboto_medium.ttf b/android/app/src/main/assets/fonts/Roboto_medium.ttf new file mode 100644 index 000000000..aa00de0ef Binary files /dev/null and b/android/app/src/main/assets/fonts/Roboto_medium.ttf differ diff --git a/android/app/src/main/assets/fonts/SimpleLineIcons.ttf b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf old mode 100644 new mode 100755 diff --git a/android/app/src/main/assets/fonts/rubicon-icon-font.ttf b/android/app/src/main/assets/fonts/rubicon-icon-font.ttf new file mode 100644 index 000000000..25e7d92e3 Binary files /dev/null and b/android/app/src/main/assets/fonts/rubicon-icon-font.ttf differ diff --git a/ios/NativebaseKitchenSink.xcodeproj/project.pbxproj b/ios/NativebaseKitchenSink.xcodeproj/project.pbxproj index 031a2bd27..6e21acbe0 100644 --- a/ios/NativebaseKitchenSink.xcodeproj/project.pbxproj +++ b/ios/NativebaseKitchenSink.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 */; }; @@ -13,7 +12,7 @@ 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; }; 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; }; 00E356F31AD99517003FC87E /* NativebaseKitchenSinkTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* NativebaseKitchenSinkTests.m */; }; - 0B12548BCC1B455C9F600C84 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A085D7C5C846401F986FFFFF /* Octicons.ttf */; }; + 0EF3325B743A4EF2B3718196 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 85D96A764A8149ED99B10527 /* MaterialCommunityIcons.ttf */; }; 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; }; 139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; }; 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; }; @@ -23,9 +22,6 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; - 14CEBD94DA7942B1964C8B5E /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FE92126F28B64A0685DAB03A /* Foundation.ttf */; }; - 19897E95710B481AB86E7889 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D241C61A156E43E99A086E74 /* Zocial.ttf */; }; - 2BBFCA3BF3204B9CADB283CD /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F5E7ED5A8DCA4CF3AE729F6C /* FontAwesome.ttf */; }; 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; @@ -39,17 +35,24 @@ 2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; }; 2DCD954D1E0B4F2C00145EB5 /* NativebaseKitchenSinkTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* NativebaseKitchenSinkTests.m */; }; 2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; }; - 34D5DD3C198243C0AA8A05D5 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 61B8BB1244F849A1A770FE3C /* MaterialIcons.ttf */; }; - 3853B536E3604863A31D0805 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 03C28FDF5D3E464495172B50 /* Ionicons.ttf */; }; - 4E7314BAA3A94DA6A3446E33 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CF6FBF3102FA49AEB144CA79 /* MaterialCommunityIcons.ttf */; }; + 34FA0D11FAE14FAC9C264D39 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3ACA626C99824131BBEAC637 /* MaterialIcons.ttf */; }; + 466CF669EA0D4609BBD06181 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9D076C5E2DF142D5B4574685 /* Octicons.ttf */; }; + 5786051A4B594FCB8977713E /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6B9ACC88A1D94C1D858C63B3 /* Foundation.ttf */; }; + 5E125AA5B01F455BB5CAD582 /* Roboto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 13552BB66062491DA8131FFD /* Roboto.ttf */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; - 64F9CD6A8B4841748B3EB08C /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B8C760012D3B43B497E5C5B4 /* SimpleLineIcons.ttf */; }; - 70A6DD027EBE4A67B51F4585 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F222846A31D4949B72E7CF6 /* libRNVectorIcons.a */; }; + 5F237B12255E40FA92A6E957 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7795DBBA5F8F4796B380FB37 /* Ionicons.ttf */; }; + 7BE401F7AF664E37B542A34F /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5D76E3EE355147FD8E25CA41 /* FontAwesome.ttf */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; - A585BF05656A47288E5D4B0B /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CB0605F2059E4106908CAA8B /* EvilIcons.ttf */; }; + 8BD92CD51DA149668180DE16 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 83668B9A4A7442818413AC45 /* Zocial.ttf */; }; + AA15FF3932C748138A3AF0C0 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 07395F4C325144468821E6DF /* libRNVectorIcons.a */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; - C320B4F54AF141D0B8918DE4 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5F6A95BFB6E5405BBA55B927 /* Feather.ttf */; }; - FD2DDDAE727B4D798BBDB430 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 09E70D889BFA46DA82494470 /* Entypo.ttf */; }; + B4DF4854CF774934869A1F8F /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 211AEDA2A43F472EB2BB536D /* SimpleLineIcons.ttf */; }; + B7A94CE4CDC54A27B4B0B976 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 74352E0B4E8C4670A749E6D3 /* Feather.ttf */; }; + BB058B5FBBAC42BA90C707E7 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5595094016D0408EB7D48A8F /* EvilIcons.ttf */; }; + CBCBAAAE8BA048AEAA3BB950 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A7A1AB6C475148E296D243FA /* Entypo.ttf */; }; + E8DD21E9CA1640DCAFE81227 /* Roboto_medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1827C8513B5F4D8ABB8C1D37 /* Roboto_medium.ttf */; }; + FEE27B69DB084A3BB4C83D79 /* rubicon-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F94F17E83AE04FDB92E6453E /* rubicon-icon-font.ttf */; }; + 59B449F8C9224D4E90D1D29C /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9B54B0A913A94E3AB4509EA9 /* MaterialCommunityIcons.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -319,9 +322,9 @@ remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteInfo = RCTText; }; - 942ED5DB20B2A4C2007EE472 /* PBXContainerItemProxy */ = { + 94E1676520D7D164007E5BB2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 64EE8379A5D041AAA5486F89 /* RNVectorIcons.xcodeproj */; + containerPortal = 38876C40702B4D4689D0EC4D /* RNVectorIcons.xcodeproj */; proxyType = 2; remoteGlobalIDString = 5DBEB1501B18CEA900B34395; remoteInfo = RNVectorIcons; @@ -345,8 +348,9 @@ 00E356EE1AD99517003FC87E /* NativebaseKitchenSinkTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NativebaseKitchenSinkTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* NativebaseKitchenSinkTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NativebaseKitchenSinkTests.m; sourceTree = ""; }; - 03C28FDF5D3E464495172B50 /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; }; - 09E70D889BFA46DA82494470 /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; + 07395F4C325144468821E6DF /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = ""; }; + 0897A3678CC444538A5E9B29 /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/native-base/Fonts/EvilIcons.ttf"; sourceTree = ""; }; + 13552BB66062491DA8131FFD /* Roboto.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Roboto.ttf; path = "../node_modules/native-base/Fonts/Roboto.ttf"; sourceTree = ""; }; 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = ""; }; 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* NativebaseKitchenSink.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NativebaseKitchenSink.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -357,24 +361,36 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = NativebaseKitchenSink/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = NativebaseKitchenSink/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; + 15DEC935A8EB4C30AD1B1FCA /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/native-base/Fonts/Foundation.ttf"; sourceTree = ""; }; + 1827C8513B5F4D8ABB8C1D37 /* Roboto_medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Roboto_medium.ttf; path = "../node_modules/native-base/Fonts/Roboto_medium.ttf"; sourceTree = ""; }; + 211AEDA2A43F472EB2BB536D /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; }; + 25787B1DC406446FA0FA1797 /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/native-base/Fonts/MaterialIcons.ttf"; sourceTree = ""; }; 2D02E47B1E0B4A5D006451C7 /* NativebaseKitchenSink-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "NativebaseKitchenSink-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 2D02E4901E0B4A5D006451C7 /* NativebaseKitchenSink-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "NativebaseKitchenSink-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 38876C40702B4D4689D0EC4D /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = ""; }; + 3ACA626C99824131BBEAC637 /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; }; + 3DA0A2B80C844B3FAB3EB976 /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/native-base/Fonts/FontAwesome.ttf"; sourceTree = ""; }; + 49891D833C414C5EB50754C9 /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/native-base/Fonts/Entypo.ttf"; sourceTree = ""; }; + 54AFBAD4B52048F486EB5CF4 /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/native-base/Fonts/Octicons.ttf"; sourceTree = ""; }; + 5595094016D0408EB7D48A8F /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; }; + 5D76E3EE355147FD8E25CA41 /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; }; 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; - 5F6A95BFB6E5405BBA55B927 /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; }; - 61B8BB1244F849A1A770FE3C /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; }; - 64EE8379A5D041AAA5486F89 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = ""; }; + 6B9ACC88A1D94C1D858C63B3 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; }; + 74352E0B4E8C4670A749E6D3 /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; }; + 7795DBBA5F8F4796B380FB37 /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; - 7F222846A31D4949B72E7CF6 /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; - A085D7C5C846401F986FFFFF /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; }; + 83668B9A4A7442818413AC45 /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; }; + 85D96A764A8149ED99B10527 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; }; + 97B17CCEECAE4A758765BBC2 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/native-base/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; }; + 9D076C5E2DF142D5B4574685 /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; }; + 9F62B0E7BB624D58A407A576 /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/native-base/Fonts/Zocial.ttf"; sourceTree = ""; }; + A7A1AB6C475148E296D243FA /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = ""; }; - B8C760012D3B43B497E5C5B4 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; }; - CB0605F2059E4106908CAA8B /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; }; - CF6FBF3102FA49AEB144CA79 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; }; - D241C61A156E43E99A086E74 /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; }; - F5E7ED5A8DCA4CF3AE729F6C /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; }; - FE92126F28B64A0685DAB03A /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; }; + B08D11426BB343DBB2BF3771 /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/native-base/Fonts/Ionicons.ttf"; sourceTree = ""; }; + F94F17E83AE04FDB92E6453E /* rubicon-icon-font.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "rubicon-icon-font.ttf"; path = "../node_modules/native-base/Fonts/rubicon-icon-font.ttf"; sourceTree = ""; }; + 9B54B0A913A94E3AB4509EA9 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../node_modules/native-base/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -403,7 +419,7 @@ 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, - 70A6DD027EBE4A67B51F4585 /* libRNVectorIcons.a in Frameworks */, + AA15FF3932C748138A3AF0C0 /* libRNVectorIcons.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -560,17 +576,30 @@ 2EF298FCC0D844C499678F18 /* Resources */ = { isa = PBXGroup; children = ( - 09E70D889BFA46DA82494470 /* Entypo.ttf */, - CB0605F2059E4106908CAA8B /* EvilIcons.ttf */, - 5F6A95BFB6E5405BBA55B927 /* Feather.ttf */, - F5E7ED5A8DCA4CF3AE729F6C /* FontAwesome.ttf */, - FE92126F28B64A0685DAB03A /* Foundation.ttf */, - 03C28FDF5D3E464495172B50 /* Ionicons.ttf */, - CF6FBF3102FA49AEB144CA79 /* MaterialCommunityIcons.ttf */, - 61B8BB1244F849A1A770FE3C /* MaterialIcons.ttf */, - A085D7C5C846401F986FFFFF /* Octicons.ttf */, - B8C760012D3B43B497E5C5B4 /* SimpleLineIcons.ttf */, - D241C61A156E43E99A086E74 /* Zocial.ttf */, + 49891D833C414C5EB50754C9 /* Entypo.ttf */, + 0897A3678CC444538A5E9B29 /* EvilIcons.ttf */, + 3DA0A2B80C844B3FAB3EB976 /* FontAwesome.ttf */, + 15DEC935A8EB4C30AD1B1FCA /* Foundation.ttf */, + B08D11426BB343DBB2BF3771 /* Ionicons.ttf */, + 25787B1DC406446FA0FA1797 /* MaterialIcons.ttf */, + 54AFBAD4B52048F486EB5CF4 /* Octicons.ttf */, + 1827C8513B5F4D8ABB8C1D37 /* Roboto_medium.ttf */, + 13552BB66062491DA8131FFD /* Roboto.ttf */, + F94F17E83AE04FDB92E6453E /* rubicon-icon-font.ttf */, + 97B17CCEECAE4A758765BBC2 /* SimpleLineIcons.ttf */, + 9F62B0E7BB624D58A407A576 /* Zocial.ttf */, + A7A1AB6C475148E296D243FA /* Entypo.ttf */, + 5595094016D0408EB7D48A8F /* EvilIcons.ttf */, + 74352E0B4E8C4670A749E6D3 /* Feather.ttf */, + 5D76E3EE355147FD8E25CA41 /* FontAwesome.ttf */, + 6B9ACC88A1D94C1D858C63B3 /* Foundation.ttf */, + 7795DBBA5F8F4796B380FB37 /* Ionicons.ttf */, + 85D96A764A8149ED99B10527 /* MaterialCommunityIcons.ttf */, + 3ACA626C99824131BBEAC637 /* MaterialIcons.ttf */, + 9D076C5E2DF142D5B4574685 /* Octicons.ttf */, + 211AEDA2A43F472EB2BB536D /* SimpleLineIcons.ttf */, + 83668B9A4A7442818413AC45 /* Zocial.ttf */, + 9B54B0A913A94E3AB4509EA9 /* MaterialCommunityIcons.ttf */, ); name = Resources; sourceTree = ""; @@ -608,7 +637,7 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, - 64EE8379A5D041AAA5486F89 /* RNVectorIcons.xcodeproj */, + 38876C40702B4D4689D0EC4D /* RNVectorIcons.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -652,15 +681,15 @@ 942ED5B220B2A4B9007EE472 /* Recovered References */ = { isa = PBXGroup; children = ( - 7F222846A31D4949B72E7CF6 /* libRNVectorIcons.a */, + 07395F4C325144468821E6DF /* libRNVectorIcons.a */, ); name = "Recovered References"; sourceTree = ""; }; - 942ED5D820B2A4C0007EE472 /* Products */ = { + 94E1676220D7D164007E5BB2 /* Products */ = { isa = PBXGroup; children = ( - 942ED5DC20B2A4C2007EE472 /* libRNVectorIcons.a */, + 94E1676620D7D164007E5BB2 /* libRNVectorIcons.a */, ); name = Products; sourceTree = ""; @@ -834,8 +863,8 @@ ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, { - ProductGroup = 942ED5D820B2A4C0007EE472 /* Products */; - ProjectRef = 64EE8379A5D041AAA5486F89 /* RNVectorIcons.xcodeproj */; + ProductGroup = 94E1676220D7D164007E5BB2 /* Products */; + ProjectRef = 38876C40702B4D4689D0EC4D /* RNVectorIcons.xcodeproj */; }, ); projectRoot = ""; @@ -1101,11 +1130,11 @@ remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 942ED5DC20B2A4C2007EE472 /* libRNVectorIcons.a */ = { + 94E1676620D7D164007E5BB2 /* libRNVectorIcons.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libRNVectorIcons.a; - remoteRef = 942ED5DB20B2A4C2007EE472 /* PBXContainerItemProxy */; + remoteRef = 94E1676520D7D164007E5BB2 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = { @@ -1131,17 +1160,21 @@ files = ( 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, - FD2DDDAE727B4D798BBDB430 /* Entypo.ttf in Resources */, - A585BF05656A47288E5D4B0B /* EvilIcons.ttf in Resources */, - C320B4F54AF141D0B8918DE4 /* Feather.ttf in Resources */, - 2BBFCA3BF3204B9CADB283CD /* FontAwesome.ttf in Resources */, - 14CEBD94DA7942B1964C8B5E /* Foundation.ttf in Resources */, - 3853B536E3604863A31D0805 /* Ionicons.ttf in Resources */, - 4E7314BAA3A94DA6A3446E33 /* MaterialCommunityIcons.ttf in Resources */, - 34D5DD3C198243C0AA8A05D5 /* MaterialIcons.ttf in Resources */, - 0B12548BCC1B455C9F600C84 /* Octicons.ttf in Resources */, - 64F9CD6A8B4841748B3EB08C /* SimpleLineIcons.ttf in Resources */, - 19897E95710B481AB86E7889 /* Zocial.ttf in Resources */, + E8DD21E9CA1640DCAFE81227 /* Roboto_medium.ttf in Resources */, + 5E125AA5B01F455BB5CAD582 /* Roboto.ttf in Resources */, + FEE27B69DB084A3BB4C83D79 /* rubicon-icon-font.ttf in Resources */, + CBCBAAAE8BA048AEAA3BB950 /* Entypo.ttf in Resources */, + BB058B5FBBAC42BA90C707E7 /* EvilIcons.ttf in Resources */, + B7A94CE4CDC54A27B4B0B976 /* Feather.ttf in Resources */, + 7BE401F7AF664E37B542A34F /* FontAwesome.ttf in Resources */, + 5786051A4B594FCB8977713E /* Foundation.ttf in Resources */, + 5F237B12255E40FA92A6E957 /* Ionicons.ttf in Resources */, + 0EF3325B743A4EF2B3718196 /* MaterialCommunityIcons.ttf in Resources */, + 34FA0D11FAE14FAC9C264D39 /* MaterialIcons.ttf in Resources */, + 466CF669EA0D4609BBD06181 /* Octicons.ttf in Resources */, + B4DF4854CF774934869A1F8F /* SimpleLineIcons.ttf in Resources */, + 8BD92CD51DA149668180DE16 /* Zocial.ttf in Resources */, + 59B449F8C9224D4E90D1D29C /* MaterialCommunityIcons.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/NativebaseKitchenSink/Info.plist b/ios/NativebaseKitchenSink/Info.plist index ac31fd251..5d2b546c1 100644 --- a/ios/NativebaseKitchenSink/Info.plist +++ b/ios/NativebaseKitchenSink/Info.plist @@ -39,7 +39,7 @@ UIViewControllerBasedStatusBarAppearance NSLocationWhenInUseUsageDescription - + NSAppTransportSecurity NSExceptionDomains @@ -62,6 +62,9 @@ MaterialCommunityIcons.ttf MaterialIcons.ttf Octicons.ttf + Roboto_medium.ttf + Roboto.ttf + rubicon-icon-font.ttf SimpleLineIcons.ttf Zocial.ttf diff --git a/package.json b/package.json index 961194be0..78f0455cb 100644 --- a/package.json +++ b/package.json @@ -32,10 +32,9 @@ "color": "1.0.3", "lodash": "4.13.1", "moment": "2.13.0", - "native-base": "2.5.2", + "native-base": "2.6.1", "react": "16.3.1", "react-native": "0.55.4", - "react-native-vector-icons": "4.5.0", "react-navigation": "1.5.0" } } diff --git a/screenshots/android/header-transparent.png b/screenshots/android/header-transparent.png deleted file mode 100644 index cfe2872c0..000000000 Binary files a/screenshots/android/header-transparent.png and /dev/null differ diff --git a/screenshots/ios/date-picker.gif b/screenshots/ios/date-picker.gif index 3d431df99..87b3a952c 100644 Binary files a/screenshots/ios/date-picker.gif and b/screenshots/ios/date-picker.gif differ diff --git a/screenshots/ios/header-transparent.png b/screenshots/ios/header-transparent.png index 3cf4d9e5c..bde17676e 100644 Binary files a/screenshots/ios/header-transparent.png and b/screenshots/ios/header-transparent.png differ diff --git a/src/App.js b/src/App.js index 85b533f2f..e041b201d 100644 --- a/src/App.js +++ b/src/App.js @@ -50,6 +50,7 @@ import IconInput from "./screens/form/iconInput"; import SuccessInput from "./screens/form/success"; import ErrorInput from "./screens/form/error"; import DisabledInput from "./screens/form/disabledInput"; +import PickerInput from "./screens/form/pickerInput"; import Icons from "./screens/icon/icon"; import BasicIcon from "./screens/icon/basic"; import StateIcon from "./screens/icon/state"; @@ -235,6 +236,7 @@ const AppNavigator = StackNavigator( SuccessInput: { screen: SuccessInput }, ErrorInput: { screen: ErrorInput }, DisabledInput: { screen: DisabledInput }, + PickerInput: { screen: PickerInput }, TextArea: { screen: TextArea }, Icons: { screen: Icons }, diff --git a/src/screens/Header/header-transparent.js b/src/screens/Header/header-transparent.js index ae87a4e44..ae1d7bbba 100644 --- a/src/screens/Header/header-transparent.js +++ b/src/screens/Header/header-transparent.js @@ -1,5 +1,4 @@ import React, { Component } from "react"; -import { Dimensions, ImageBackground } from "react-native"; import { Container, Header, @@ -12,39 +11,26 @@ import { Right, Body } from "native-base"; -import styles from "./styles"; - -const deviceWidth = Dimensions.get("window").width; -const deviceHeight = Dimensions.get("window").height; -const cardImage = require("../../../assets/header-transparent.jpg"); class HeaderTransparent extends Component { render() { return ( - - -
- - - - - Transparent Header - - -
+ +
+ + + + + Transparent Header + + +
- - Header with transparent prop - -
+ + Header with transparent prop +
); } diff --git a/src/screens/accordion/accordion-custom-header-content.js b/src/screens/accordion/accordion-custom-header-content.js index c42258e81..40aa896b1 100644 --- a/src/screens/accordion/accordion-custom-header-content.js +++ b/src/screens/accordion/accordion-custom-header-content.js @@ -33,7 +33,7 @@ const dataArray = [ ]; class AccordionCustomHeaderContent extends Component { - _renderHeader(title) { + _renderHeader(title, expanded) { return ( {" "}{title} - + {expanded + ? + : } ); } diff --git a/src/screens/accordion/accordion-default.js b/src/screens/accordion/accordion-default.js index b8802f9b3..51e9a39e4 100644 --- a/src/screens/accordion/accordion-default.js +++ b/src/screens/accordion/accordion-default.js @@ -46,7 +46,7 @@ class AccordionDefault extends Component { - + ); diff --git a/src/screens/form/index.js b/src/screens/form/index.js index 6321c3534..46b128772 100644 --- a/src/screens/form/index.js +++ b/src/screens/form/index.js @@ -52,6 +52,10 @@ const datas = [ route: "IconInput", text: "Icon Textbox" }, + { + route: "PickerInput", + text: "Textbox with Picker" + }, { route: "SuccessInput", text: "Success Input Textbox" diff --git a/src/screens/form/pickerInput.js b/src/screens/form/pickerInput.js new file mode 100644 index 000000000..06b0d6e80 --- /dev/null +++ b/src/screens/form/pickerInput.js @@ -0,0 +1,73 @@ +import React, { Component } from "react"; +import { + Container, + Header, + Title, + Content, + Button, + Icon, + Form, + Body, + Left, + Right, + Label, + Item, + Picker +} from "native-base"; +import styles from "./styles"; + +class PickerInput extends Component { + constructor(props) { + super(props); + this.state = { + selected2: undefined + }; + } + onValueChange2(value: string) { + this.setState({ + selected2: value + }); + } + render() { + return ( + +
+ + + + + Picker Input + + +
+ + +
+ + } + style={{ width: undefined }} + placeholder="Select your SIM" + placeholderStyle={{ color: "#bfc6ea" }} + placeholderIconColor="#007aff" + selectedValue={this.state.selected2} + onValueChange={this.onValueChange2.bind(this)} + > + + + + + + + +
+
+
+ ); + } +} + +export default PickerInput; diff --git a/src/theme/components/Card.js b/src/theme/components/Card.js index 4b39ca7af..dce9e268d 100644 --- a/src/theme/components/Card.js +++ b/src/theme/components/Card.js @@ -7,7 +7,9 @@ export default (variables = variable) => { shadowOffset: null, shadowOpacity: null, shadowRadius: null, - elevation: null + elevation: null, + backgroundColor: "transparent", + borderWidth: 0 }, ".noShadow": { shadowColor: null, diff --git a/src/theme/components/CardItem.js b/src/theme/components/CardItem.js index 190871f7c..3b613962f 100644 --- a/src/theme/components/CardItem.js +++ b/src/theme/components/CardItem.js @@ -48,7 +48,7 @@ export default (variables = variable) => { "NativeBase.Button": { ".transparent": { ...transparentBtnCommon, - paddingRight: variables.listItemPadding + 5 + paddingRight: variables.cardItemPadding + 5 } }, flex: 1, @@ -78,7 +78,7 @@ export default (variables = variable) => { "NativeBase.Button": { ".transparent": { ...transparentBtnCommon, - paddingRight: variables.listItemPadding + 5, + paddingRight: variables.cardItemPadding + 5, alignSelf: "stretch" } }, @@ -140,7 +140,7 @@ export default (variables = variable) => { borderBottomWidth: variables.borderWidth }, borderBottomWidth: null, - paddingVertical: variables.listItemPadding + 5 + paddingVertical: variables.cardItemPadding + 5 }, ".footer": { "NativeBase.Text": { @@ -185,8 +185,8 @@ export default (variables = variable) => { flexDirection: "row", alignItems: "center", borderRadius: 2, - padding: variables.listItemPadding + 5, - paddingVertical: variables.listItemPadding, + padding: variables.cardItemPadding + 5, + paddingVertical: variables.cardItemPadding, backgroundColor: variables.cardDefaultBg }; diff --git a/src/theme/components/Header.js b/src/theme/components/Header.js index 1168befa7..4352485b5 100644 --- a/src/theme/components/Header.js +++ b/src/theme/components/Header.js @@ -46,7 +46,9 @@ export default (variables = variable) => { shadowColor: null, shadowOffset: null, shadowRadius: null, - shadowOpacity: null + shadowOpacity: null, + paddingTop: platform === "android" ? StatusBar.currentHeight : undefined, + height: platform === "android" ? variables.toolbarHeight + StatusBar.currentHeight : variables.toolbarHeight }, ".noShadow": { elevation: 0, diff --git a/src/theme/components/Item.js b/src/theme/components/Item.js index 313b12053..1e54e0406 100644 --- a/src/theme/components/Item.js +++ b/src/theme/components/Item.js @@ -68,7 +68,7 @@ export default (variables = variable) => { }, ".multiline": { paddingTop: Platform.OS === "ios" ? 9 : undefined, - paddingBottom: Platform.OS === "ios" ? 9 : undefined, + paddingBottom: Platform.OS === "ios" ? 9 : undefined } }, flexDirection: null, @@ -219,6 +219,9 @@ export default (variables = variable) => { color: "#384850" } }, + ".picker": { + marginLeft: 0 + }, borderWidth: variables.borderWidth * 2, borderTopWidth: 0, diff --git a/src/theme/variables/commonColor.js b/src/theme/variables/commonColor.js index ec7d1a33a..a037ec68b 100644 --- a/src/theme/variables/commonColor.js +++ b/src/theme/variables/commonColor.js @@ -88,6 +88,7 @@ export default { cardDefaultBg: "#fff", cardBorderColor: "#ccc", cardBorderRadius: 2, + cardItemPadding: platform === "ios" ? 10 : 12, // CheckBox CheckboxRadius: platform === "ios" ? 13 : 0, @@ -153,14 +154,10 @@ export default { iosStatusbar: "dark-content", toolbarDefaultBorder: platform === "ios" ? "#a7a6ab" : "#3F51B5", get statusBarColor() { - return color(this.toolbarDefaultBg) - .darken(0.2) - .hex(); + return color(this.toolbarDefaultBg).darken(0.2).hex(); }, get darkenHeader() { - return color(this.tabBgColor) - .darken(0.03) - .hex(); + return color(this.tabBgColor).darken(0.03).hex(); }, // Icon diff --git a/src/theme/variables/material.js b/src/theme/variables/material.js index cdb7553cf..09d03f47c 100644 --- a/src/theme/variables/material.js +++ b/src/theme/variables/material.js @@ -88,6 +88,7 @@ export default { cardDefaultBg: "#fff", cardBorderColor: "#ccc", cardBorderRadius: 2, + cardItemPadding: platform === "ios" ? 10 : 12, // CheckBox CheckboxRadius: 0, diff --git a/src/theme/variables/platform.js b/src/theme/variables/platform.js index d735e6fb0..e80173b9a 100644 --- a/src/theme/variables/platform.js +++ b/src/theme/variables/platform.js @@ -88,6 +88,7 @@ export default { cardDefaultBg: "#fff", cardBorderColor: "#ccc", cardBorderRadius: 2, + cardItemPadding: platform === "ios" ? 10 : 12, // CheckBox CheckboxRadius: platform === "ios" ? 13 : 0, diff --git a/yarn.lock b/yarn.lock index db523c26a..4a93af1d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1511,8 +1511,8 @@ browser-process-hrtime@^0.1.2: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz#425d68a58d3447f02a04aa894187fce8af8b7b8e" browser-resolve@^1.11.2: - version "1.11.2" - resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce" + version "1.11.3" + resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6" dependencies: resolve "1.1.7" @@ -2096,8 +2096,8 @@ errno@~0.1.7: prr "~1.0.1" error-ex@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" dependencies: is-arrayish "^0.2.1" @@ -2802,8 +2802,8 @@ global@^4.3.0: process "~0.5.1" globals@^11.1.0: - version "11.5.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.5.0.tgz#6bc840de6771173b191f13d3a9c94d441ee92642" + version "11.7.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673" globals@^9.17.0, globals@^9.18.0: version "9.18.0" @@ -2940,8 +2940,8 @@ hoist-non-react-statics@^1.0.5: resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb" hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.3.1: - version "2.5.4" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.4.tgz#fc3b1ac05d2ae3abedec84eba846511b0d4fcc4f" + version "2.5.5" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" home-or-tmp@^2.0.0: version "2.0.0" @@ -3014,8 +3014,8 @@ ignore-walk@^3.0.1: minimatch "^3.0.4" ignore@^3.3.3: - version "3.3.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.8.tgz#3f8e9c35d38708a3a7e0e9abb6c73e7ee7707b2b" + version "3.3.10" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" image-size@^0.6.0: version "0.6.3" @@ -3093,8 +3093,8 @@ is-arrayish@^0.2.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" is-arrayish@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.1.tgz#c2dfc386abaa0c3e33c48db3fe87059e69065efd" + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" is-buffer@^1.1.5, is-buffer@~1.1.1: version "1.1.6" @@ -4568,9 +4568,9 @@ native-base-shoutem-theme@0.2.2: lodash "^4.10.1" prop-types "^15.5.10" -native-base@2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/native-base/-/native-base-2.5.2.tgz#62d2a0a8d4d1e0384bcc07f36845bdf256930a9f" +native-base@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/native-base/-/native-base-2.6.1.tgz#119a4152ffdb36d01055a75f370f6c19011e1970" dependencies: blueimp-md5 "^2.5.0" clamp "^1.0.1" @@ -4720,8 +4720,8 @@ number-is-nan@^1.0.0: resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e" nwsapi@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.3.tgz#3f4010d6c943f34018d3dfb5f2fbc0de90476959" + version "2.0.4" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.4.tgz#dc79040a5f77b97716dc79565fc7fc3ef7d50570" oauth-sign@~0.8.2: version "0.8.2" @@ -4740,8 +4740,8 @@ object-copy@^0.1.0: kind-of "^3.0.3" object-keys@^1.0.8: - version "1.0.11" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d" + version "1.0.12" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2" object-visit@^1.0.0: version "1.0.1" @@ -5116,10 +5116,9 @@ promise@^7.1.1: asap "~2.0.3" prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0: - version "15.6.1" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca" + version "15.6.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" dependencies: - fbjs "^0.8.16" loose-envify "^1.3.1" object-assign "^4.1.1" @@ -5254,7 +5253,7 @@ react-native-tab-view@^0.0.74: dependencies: prop-types "^15.6.0" -react-native-vector-icons@4.5.0, react-native-vector-icons@~4.5.0: +react-native-vector-icons@~4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/react-native-vector-icons/-/react-native-vector-icons-4.5.0.tgz#6b95619e64f62f05f579f74a01fe5640df95158b" dependencies: @@ -6291,8 +6290,8 @@ union-value@^1.0.0: set-value "^0.4.3" universalify@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" unpipe@~1.0.0: version "1.0.0"