Skip to content

Commit

Permalink
New Views: Title, BackBTN, About, Venue; New API
Browse files Browse the repository at this point in the history
  • Loading branch information
@sallar
sallar committed Jun 3, 2015
1 parent 0f762f7 commit e4d656c
Show file tree
Hide file tree
Showing 21 changed files with 514 additions and 70 deletions.
Binary file added Lato-Bold.ttf
View file
Binary file not shown.
Binary file added Lato-Light.ttf
View file
Binary file not shown.
Binary file added Lato-Regular.ttf
View file
Binary file not shown.
Binary file added Lato-Semibold.ttf
View file
Binary file not shown.
Binary file added NeutraTextBoldSC.otf
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions iOS/AppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
* on the same Wi-Fi network.
*/

jsCodeLocation = [NSURL URLWithString:@"http://192.168.11.15:8081/index.ios.bundle"];
jsCodeLocation = [NSURL URLWithString:@"http://192.168.11.2:8081/index.ios.bundle"];

/**
* OPTION 2
Expand All @@ -43,7 +43,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
* see http://facebook.github.io/react-native/docs/runningondevice.html
*/

// jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
// jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];

RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
moduleName:@"reactClient"
Expand Down
23 changes: 23 additions & 0 deletions iOS/Images.xcassets/logo.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "logo.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "[email protected]"
},
{
"idiom" : "universal",
"scale" : "3x",
"filename" : "[email protected]"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added iOS/Images.xcassets/logo.imageset/logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added iOS/Images.xcassets/logo.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added iOS/Images.xcassets/logo.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions iOS/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIAppFonts</key>
<array>
<string>Lato-Semibold.ttf</string>
<string>Lato-Light.ttf</string>
<string>Lato-Regular.ttf</string>
<string>Lato-Bold.ttf</string>
<string>NeutraTextBoldSC.otf</string>
<string>MaterialDesign.ttf</string>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand Down
36 changes: 28 additions & 8 deletions iOS/main.jsbundle
View file

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
"dependencies": {
"react-native": "latest",
"react-native-router": "^0.1.3",
"react-refresh-control": "^2.0.3"
"react-refresh-control": "^2.0.3",
"react-native-vector-icons": "^0.4.0",
"react-native-svg": "^0.1.5",
"react-native-parallax-view": "^1.0.2",
"react-native-blur": "^0.5.0"
}
}
66 changes: 66 additions & 0 deletions reactClient.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,17 @@
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
999F82F01B1E33F900928094 /* VibrancyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 999F82E81B1E33F900928094 /* VibrancyView.m */; };
999F82F11B1E33F900928094 /* VibrancyViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 999F82EA1B1E33F900928094 /* VibrancyViewManager.m */; };
999F82F21B1E33F900928094 /* BlurView.m in Sources */ = {isa = PBXBuildFile; fileRef = 999F82ED1B1E33F900928094 /* BlurView.m */; };
999F82F31B1E33F900928094 /* BlurViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 999F82EF1B1E33F900928094 /* BlurViewManager.m */; };
999F83011B1E37FF00928094 /* NeutraTextBoldSC.otf in Resources */ = {isa = PBXBuildFile; fileRef = 999F83001B1E37FF00928094 /* NeutraTextBoldSC.otf */; };
999F83051B1F6F1B00928094 /* Lato-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 999F83021B1F6F1B00928094 /* Lato-Bold.ttf */; };
999F83061B1F6F1B00928094 /* Lato-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 999F83031B1F6F1B00928094 /* Lato-Light.ttf */; };
999F83071B1F6F1B00928094 /* Lato-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 999F83041B1F6F1B00928094 /* Lato-Regular.ttf */; };
999F83091B1F7CCA00928094 /* Lato-Semibold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 999F83081B1F7CCA00928094 /* Lato-Semibold.ttf */; };
99C6E2E71B19B9CD00384371 /* libRCTRefreshControl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 99C6E2E61B19B9B900384371 /* libRCTRefreshControl.a */; };
99F2A11D1B1B9B2D00B32ACD /* MaterialDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 99F2A11C1B1B9B2D00B32ACD /* MaterialDesign.ttf */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -144,7 +154,21 @@
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "node_modules/react-native/React/React.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>"; };
999F82E71B1E33F900928094 /* VibrancyView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VibrancyView.h; sourceTree = "<group>"; };
999F82E81B1E33F900928094 /* VibrancyView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VibrancyView.m; sourceTree = "<group>"; };
999F82E91B1E33F900928094 /* VibrancyViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VibrancyViewManager.h; sourceTree = "<group>"; };
999F82EA1B1E33F900928094 /* VibrancyViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VibrancyViewManager.m; sourceTree = "<group>"; };
999F82EC1B1E33F900928094 /* BlurView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlurView.h; sourceTree = "<group>"; };
999F82ED1B1E33F900928094 /* BlurView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BlurView.m; sourceTree = "<group>"; };
999F82EE1B1E33F900928094 /* BlurViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlurViewManager.h; sourceTree = "<group>"; };
999F82EF1B1E33F900928094 /* BlurViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BlurViewManager.m; sourceTree = "<group>"; };
999F83001B1E37FF00928094 /* NeutraTextBoldSC.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = NeutraTextBoldSC.otf; sourceTree = "<group>"; };
999F83021B1F6F1B00928094 /* Lato-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Lato-Bold.ttf"; sourceTree = "<group>"; };
999F83031B1F6F1B00928094 /* Lato-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Lato-Light.ttf"; sourceTree = "<group>"; };
999F83041B1F6F1B00928094 /* Lato-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Lato-Regular.ttf"; sourceTree = "<group>"; };
999F83081B1F7CCA00928094 /* Lato-Semibold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Lato-Semibold.ttf"; sourceTree = "<group>"; };
99C6E2E11B19B9B900384371 /* RCTRefreshControl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTRefreshControl.xcodeproj; path = vendor/RCTRefreshControl/RCTRefreshControl.xcodeproj; sourceTree = "<group>"; };
99F2A11C1B1B9B2D00B32ACD /* MaterialDesign.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = MaterialDesign.ttf; path = "node_modules/react-native-vector-icons/Fonts/MaterialDesign.ttf"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -317,6 +341,14 @@
83CBB9F61A601CBA00E9B192 = {
isa = PBXGroup;
children = (
999F83081B1F7CCA00928094 /* Lato-Semibold.ttf */,
999F83021B1F6F1B00928094 /* Lato-Bold.ttf */,
999F83031B1F6F1B00928094 /* Lato-Light.ttf */,
999F83041B1F6F1B00928094 /* Lato-Regular.ttf */,
999F83001B1E37FF00928094 /* NeutraTextBoldSC.otf */,
999F82E61B1E33F900928094 /* RNVibrancy */,
999F82EB1B1E33F900928094 /* RNBlur */,
99F2A11C1B1B9B2D00B32ACD /* MaterialDesign.ttf */,
99C6E2E11B19B9B900384371 /* RCTRefreshControl.xcodeproj */,
13B07FAE1A68108700A75B9A /* reactClient */,
832341AE1AAA6A7D00B99B32 /* Libraries */,
Expand All @@ -336,6 +368,30 @@
name = Products;
sourceTree = "<group>";
};
999F82E61B1E33F900928094 /* RNVibrancy */ = {
isa = PBXGroup;
children = (
999F82E71B1E33F900928094 /* VibrancyView.h */,
999F82E81B1E33F900928094 /* VibrancyView.m */,
999F82E91B1E33F900928094 /* VibrancyViewManager.h */,
999F82EA1B1E33F900928094 /* VibrancyViewManager.m */,
);
name = RNVibrancy;
path = "node_modules/react-native-blur/RNVibrancy";
sourceTree = "<group>";
};
999F82EB1B1E33F900928094 /* RNBlur */ = {
isa = PBXGroup;
children = (
999F82EC1B1E33F900928094 /* BlurView.h */,
999F82ED1B1E33F900928094 /* BlurView.m */,
999F82EE1B1E33F900928094 /* BlurViewManager.h */,
999F82EF1B1E33F900928094 /* BlurViewManager.m */,
);
name = RNBlur;
path = "node_modules/react-native-blur/RNBlur";
sourceTree = "<group>";
};
99C6E2E21B19B9B900384371 /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -566,8 +622,14 @@
buildActionMask = 2147483647;
files = (
008F07F31AC5B25A0029DE68 /* main.jsbundle in Resources */,
999F83051B1F6F1B00928094 /* Lato-Bold.ttf in Resources */,
999F83091B1F7CCA00928094 /* Lato-Semibold.ttf in Resources */,
999F83011B1E37FF00928094 /* NeutraTextBoldSC.otf in Resources */,
999F83071B1F6F1B00928094 /* Lato-Regular.ttf in Resources */,
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
99F2A11D1B1B9B2D00B32ACD /* MaterialDesign.ttf in Resources */,
999F83061B1F6F1B00928094 /* Lato-Light.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -586,8 +648,12 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
999F82F11B1E33F900928094 /* VibrancyViewManager.m in Sources */,
999F82F31B1E33F900928094 /* BlurViewManager.m in Sources */,
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
999F82F21B1E33F900928094 /* BlurView.m in Sources */,
13B07FC11A68108700A75B9A /* main.m in Sources */,
999F82F01B1E33F900928094 /* VibrancyView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
83 changes: 70 additions & 13 deletions utils/Styles.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
var {StyleSheet, PixelRatio} = require('react-native'),
variables = {
brandColor: '#ED5565',
cellPadding: 8
cellPaddingHorizontal: 15,
cellPaddingVertical: 10
};

module.exports = {
Expand All @@ -20,7 +21,7 @@ module.exports = {
*/
Stylesheet: StyleSheet.create({
text: {
fontFamily: 'Avenir',
fontFamily: 'Lato',
},
margin: {
marginBottom: 10,
Expand All @@ -32,6 +33,16 @@ module.exports = {
flex: 1,
backgroundColor: 'white',
},
flex: {
flex: 1,
},
flex_20: {
flex: .2
},
flexCenter: {
justifyContent: 'center',
alignItems: 'center'
}
}),
/**
* Navigator
Expand All @@ -48,12 +59,25 @@ module.exports = {
},
navbarText: {
color: 'white',
fontSize: 17,
fontSize: 18,
margin: 10,
marginTop: 15,
fontWeight: '600',
fontWeight: 'bold',
textAlign: 'center',
alignItems: 'center',
},
backButtonText: {
fontWeight: '400'
},
icon: {
marginLeft: 8,
marginTop: 6,
width: 24,
height: 24,
color: 'white'
},
navbarLogo: {
top: 3
}
}),
/**
Expand Down Expand Up @@ -111,45 +135,78 @@ module.exports = {
cellBorder: {
backgroundColor: 'rgba(0, 0, 0, 0.1)',
height: 1 / PixelRatio.get(),
marginLeft: 4,
marginLeft: 5,
marginRight: 5,
},
infoCell: {
flex: 1,
flexDirection: 'column',
flexWrap: 'nowrap',
justifyContent: 'space-around',
alignItems: 'stretch',
padding: variables.cellPadding,
paddingHorizontal: variables.cellPaddingHorizontal,
paddingVertical: variables.cellPaddingVertical,
},
arrow: {
color: '#CCCCCC'
},
infoTitle: {
height: 30,
height: 28,
fontSize: 18,
fontWeight: '700',
marginBottom: 2,
fontFamily: 'Avenir'
fontWeight: '600',
marginBottom: 0,
fontFamily: 'Lato'
},
infoAddress: {
color: '#999999',
fontSize: 13,
fontWeight: '300'
},
byline: {
padding: 0,
},
badge: {
margin: 0,
padding: 0,
paddingLeft: 3,
paddingRight: 3,
backgroundColor: '#E6E9ED',
borderColor: '#E6E9ED',
borderRadius: 10,
borderWidth: 4,
flexDirection: 'row',
justifyContent: 'center',
},
badgeText: {
margin: 0,
paddingLeft: 3,
paddingRight: 3,
padding: 0,
fontSize: 9,
backgroundColor: '#E6E9ED',
flex: 1,
fontWeight: 'bold'
},
badgeIcon: {
marginRight: 2,
color: '#666666'
}
}),
/**
* Venue View
*/
VenueStyles: StyleSheet.create({
header: {
flex: 1,
flexDirection: 'row',
alignItems: 'flex-end',
padding: variables.cellPaddingHorizontal
},
headerText: {
color: 'white',
fontSize: 30,
fontWeight: 'bold',
shadowColor: '#222',
shadowOpacity: 0.3,
shadowRadius: 1,
}
}),
/**
* Indicator
Expand Down
33 changes: 33 additions & 0 deletions views/About.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/**
* @author Sallar Kaboli <[email protected]>
* @date 31.05.2015
*/
'use strict';

var React = require('react-native'),
Icon = require('MaterialDesign'),
{Stylesheet} = require('../utils/Styles');

var {
Component,
Text,
TouchableHighlight,
View,
} = React;

/**
* Navigator Main Class
*/
class AboutView extends Component {
constructor(props) {
super(props);
}

render() {
return(
<Text>Fuck</Text>
);
}
}

module.exports = AboutView;
Loading

0 comments on commit e4d656c

Please sign in to comment.