begun working on themes

casperstorm · Jan 12, 2018 · 49a3250 · 49a3250
1 parent 816ebf4
commit 49a3250
Show file tree

Hide file tree

Showing 38 changed files with 923 additions and 253 deletions.
diff --git a/assets/images/icCrossDark.png b/assets/images/icCrossDark.png
diff --git a/assets/images/icCrossDark@2x.png b/assets/images/icCrossDark@2x.png
diff --git a/assets/images/icCrossDark@3x.png b/assets/images/icCrossDark@3x.png
diff --git a/ios/shine.xcodeproj/project.pbxproj b/ios/shine.xcodeproj/project.pbxproj
@@ -5,6 +5,7 @@
 	};
 	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 */; };
@@ -19,6 +20,7 @@
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
+		336C5295B55F4EE7B4FFC8FC /* libReactNativeConfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EF5E19223D4248F893B571EA /* libReactNativeConfig.a */; };
 		5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
 		6859B18A1FA7890A006C8EFB /* Rubik-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6859B15E1FA7883A006C8EFB /* Rubik-Black.ttf */; };
 		6859B18B1FA7890A006C8EFB /* Rubik-BlackItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6859B1591FA78839006C8EFB /* Rubik-BlackItalic.ttf */; };
@@ -34,7 +36,6 @@
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
 		8D01A7CF71434A849E6FD3AC /* libRCTImageSequence.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ADCDD0CC7B44D58911A0EA0 /* libRCTImageSequence.a */; };
 		ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
-		336C5295B55F4EE7B4FFC8FC /* libReactNativeConfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EF5E19223D4248F893B571EA /* libReactNativeConfig.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -227,6 +228,13 @@
 			remoteGlobalIDString = 3D383D621EBD27B9005632C8;
 			remoteInfo = "double-conversion-tvOS";
 		};
+		6884B9442003F6440004C74C /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A0FFF09740EB47F2A59C4924 /* ReactNativeConfig.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EB2648DF1C7BE17A00B8F155;
+			remoteInfo = ReactNativeConfig;
+		};
 		689B40361FAB9AE1009E4653 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 5A63A188C6344FC298D4E096 /* RCTImageSequence.xcodeproj */;
@@ -318,9 +326,9 @@
 		6ADCDD0CC7B44D58911A0EA0 /* libRCTImageSequence.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTImageSequence.a; 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>"; };
+		A0FFF09740EB47F2A59C4924 /* ReactNativeConfig.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeConfig.xcodeproj; path = "../node_modules/react-native-config/ios/ReactNativeConfig.xcodeproj"; sourceTree = "<group>"; };
 		ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
-		A0FFF09740EB47F2A59C4924 /* 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; };
-		EF5E19223D4248F893B571EA /* libReactNativeConfig.a */ = {isa = PBXFileReference; name = "libReactNativeConfig.a"; path = "libReactNativeConfig.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
+		EF5E19223D4248F893B571EA /* libReactNativeConfig.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libReactNativeConfig.a; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -472,10 +480,19 @@
 			name = fonts;
 			sourceTree = "<group>";
 		};
+		6884B9412003F6430004C74C /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				6884B9452003F6440004C74C /* libReactNativeConfig.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		689B40101FAB9ADF009E4653 /* Recovered References */ = {
 			isa = PBXGroup;
 			children = (
 				6ADCDD0CC7B44D58911A0EA0 /* libRCTImageSequence.a */,
+				EF5E19223D4248F893B571EA /* libReactNativeConfig.a */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";
@@ -674,6 +691,10 @@
 					ProductGroup = 146834001AC3E56700842450 /* Products */;
 					ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
 				},
+				{
+					ProductGroup = 6884B9412003F6430004C74C /* Products */;
+					ProjectRef = A0FFF09740EB47F2A59C4924 /* ReactNativeConfig.xcodeproj */;
+				},
 				{
 					ProductGroup = 68D1F4DB1F9E78C800B534F0 /* Products */;
 					ProjectRef = 68D1F4DA1F9E78C800B534F0 /* ReactNativeNavigation.xcodeproj */;
@@ -876,6 +897,13 @@
 			remoteRef = 6859B1521FA78811006C8EFB /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		6884B9452003F6440004C74C /* libReactNativeConfig.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libReactNativeConfig.a;
+			remoteRef = 6884B9442003F6440004C74C /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		689B40371FAB9AE1009E4653 /* libRCTImageSequence.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1013,6 +1041,10 @@
 				);
 				INFOPLIST_FILE = shine/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/shine\"",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1023,10 +1055,6 @@
 				PROVISIONING_PROFILE = "e9e0a154-628f-4bc5-9271-3fee3b38f9a0";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development com.cryptoshine.app";
 				VERSIONING_SYSTEM = "apple-generic";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/shine\"",
-				);
 			};
 			name = Debug;
 		};
@@ -1045,6 +1073,10 @@
 				);
 				INFOPLIST_FILE = shine/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/shine\"",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1055,10 +1087,6 @@
 				PROVISIONING_PROFILE = "03644a5e-a345-4ac9-85d3-503009d8f86d";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.cryptoshine.app";
 				VERSIONING_SYSTEM = "apple-generic";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/shine\"",
-				);
 			};
 			name = Release;
 		};

diff --git a/package.json b/package.json
@@ -25,6 +25,7 @@
 		"prop-types": "^15.6.0",
 		"react": "16.0.0-beta.5",
 		"react-native": "0.49.3",
+		"react-native-animatable": "^1.2.4",
 		"react-native-config": "^0.10.0",
 		"react-native-image-sequence": "^0.5.0",
 		"react-native-navigation": "^1.1.250",

diff --git a/src/components/asset/index.js b/src/components/asset/index.js
@@ -60,14 +60,20 @@ Button.propTypes = {
 */
 /* eslint-disable prettier/prettier */
 /* eslint-disable react/display-name */
-Icon.LogoDark = () => <Icon source={require('../../../assets/images/icLogoDark.png')} />
-Icon.Shadow = () => <Icon source={require('../../../assets/images/bottom_gradient.png')} style={ styles.shadow } />
+Icon.LogoDark = (props: Object) => <Icon source={require('../../../assets/images/icLogoDark.png')}  style={props.style} />
+Icon.Shadow = (props: Object) => <Icon source={require('../../../assets/images/bottom_gradient.png')} style={[styles.shadow, props.style]} />
 Icon.Negative = () => <Icon source={require('../../../assets/images/icSkull.png')} />
 Icon.Positive = () => <Icon source={require('../../../assets/images/icHeart.png')} />
 Icon.Important = () => <Icon source={require('../../../assets/images/icImportant.png')} />
+Icon.CrossDark = (props: Object) => <Icon source={require('../../../assets/images/icCrossDark.png')} style={props.style} />
 /* eslint-enable prettier/prettier */
 
-Button.LogoDark = props => <Button {...props} icon={<Icon.LogoDark />} />
+Button.LogoDark = (props: Object) => (
+  <Button {...props} icon={<Icon.LogoDark style={props.iconStyle} />} />
+)
+Button.CrossDark = (props: Object) => (
+  <Button {...props} icon={<Icon.CrossDark style={props.iconStyle} />} />
+)
 
 /* eslint-enable react/display-name */
 

diff --git a/src/components/currency-tag/__tests__/__snapshots__/index.test.js.snap b/src/components/currency-tag/__tests__/__snapshots__/index.test.js.snap
@@ -7,7 +7,6 @@ exports[`tag should render correctly 1`] = `
       Object {
         "alignItems": "center",
         "borderRadius": 10,
-        "borderWidth": 1,
         "height": 23,
         "justifyContent": "center",
         "marginRight": 7,
@@ -25,7 +24,7 @@ exports[`tag should render correctly 1`] = `
     ellipsizeMode="tail"
     style={
       Object {
-        "color": "#FFFFFF",
+        "color": "rgba(255, 255, 255, 1)",
         "fontFamily": "Rubik-Bold",
         "fontSize": 12,
         "marginLeft": 8,

diff --git a/src/components/currency-tag/styles.js b/src/components/currency-tag/styles.js
@@ -6,7 +6,6 @@ export default StyleSheet.create({
   container: {
     height: 23,
     borderRadius: 10,
-    borderWidth: 1,
     justifyContent: 'center',
     alignItems: 'center',
     marginRight: 7,

diff --git a/src/components/jumbo-cell/__tests__/__snapshots__/index.test.js.snap b/src/components/jumbo-cell/__tests__/__snapshots__/index.test.js.snap
@@ -72,6 +72,7 @@ exports[`jumbo-cell should render correctly with all props 1`] = `
       >
         <Image
           source={1}
+          style={undefined}
         />
       </View>
     </View>
@@ -82,15 +83,15 @@ exports[`jumbo-cell should render correctly with all props 1`] = `
       ellipsizeMode="tail"
       numberOfLines={2}
       style={
-        Object {
-          "color": "#FFFFFF",
-          "fontFamily": "Rubik-Bold",
-          "fontSize": 30,
-          "lineHeight": 38,
-          "marginLeft": 12,
-          "marginRight": 12,
-          "textAlign": "left",
-        }
+        Array [
+          Object {
+            "lineHeight": 38,
+            "marginLeft": 12,
+            "marginRight": 12,
+            "textAlign": "left",
+          },
+          undefined,
+        ]
       }
     >
       foo
@@ -102,31 +103,29 @@ exports[`jumbo-cell should render correctly with all props 1`] = `
       ellipsizeMode="tail"
       numberOfLines={1}
       style={
-        Object {
-          "color": "#FFFFFF",
-          "fontFamily": "Rubik-Light",
-          "fontSize": 15,
-          "marginBottom": 25,
-          "marginLeft": 12,
-          "marginRight": 12,
-          "marginTop": 10,
-          "opacity": 0.7,
-        }
+        Array [
+          Object {
+            "marginBottom": 25,
+            "marginLeft": 12,
+            "marginRight": 12,
+            "marginTop": 10,
+          },
+          undefined,
+        ]
       }
-    >
-      bar
-    </Text>
+    />
     <View
       style={
-        Object {
-          "borderTopColor": "#444444",
-          "borderTopWidth": 0.5,
-          "bottom": 0,
-          "left": 12,
-          "opacity": 0.8,
-          "position": "absolute",
-          "right": 12,
-        }
+        Array [
+          Object {
+            "borderTopWidth": 0.5,
+            "bottom": 0,
+            "left": 12,
+            "position": "absolute",
+            "right": 12,
+          },
+          undefined,
+        ]
       }
     />
   </View>
@@ -205,6 +204,7 @@ exports[`jumbo-cell should render correctly without props 1`] = `
       >
         <Image
           source={1}
+          style={undefined}
         />
       </View>
     </View>
@@ -215,15 +215,15 @@ exports[`jumbo-cell should render correctly without props 1`] = `
       ellipsizeMode="tail"
       numberOfLines={2}
       style={
-        Object {
-          "color": "#FFFFFF",
-          "fontFamily": "Rubik-Bold",
-          "fontSize": 30,
-          "lineHeight": 38,
-          "marginLeft": 12,
-          "marginRight": 12,
-          "textAlign": "left",
-        }
+        Array [
+          Object {
+            "lineHeight": 38,
+            "marginLeft": 12,
+            "marginRight": 12,
+            "textAlign": "left",
+          },
+          undefined,
+        ]
       }
     />
     <Text
@@ -233,29 +233,29 @@ exports[`jumbo-cell should render correctly without props 1`] = `
       ellipsizeMode="tail"
       numberOfLines={1}
       style={
-        Object {
-          "color": "#FFFFFF",
-          "fontFamily": "Rubik-Light",
-          "fontSize": 15,
-          "marginBottom": 25,
-          "marginLeft": 12,
-          "marginRight": 12,
-          "marginTop": 10,
-          "opacity": 0.7,
-        }
+        Array [
+          Object {
+            "marginBottom": 25,
+            "marginLeft": 12,
+            "marginRight": 12,
+            "marginTop": 10,
+          },
+          undefined,
+        ]
       }
     />
     <View
       style={
-        Object {
-          "borderTopColor": "#444444",
-          "borderTopWidth": 0.5,
-          "bottom": 0,
-          "left": 12,
-          "opacity": 0.8,
-          "position": "absolute",
-          "right": 12,
-        }
+        Array [
+          Object {
+            "borderTopWidth": 0.5,
+            "bottom": 0,
+            "left": 12,
+            "position": "absolute",
+            "right": 12,
+          },
+          undefined,
+        ]
       }
     />
   </View>