Skip to content
This repository was archived by the owner on Mar 30, 2022. It is now read-only.

Commit e2c6419

Browse files
dabit3dabit3
committed
fixed conflict
2 parents 329fe75 + 9ddec38 commit e2c6419

File tree

15 files changed

+161
-935
lines changed

15 files changed

+161
-935
lines changed

‎README.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ git clone git@github.com:dabit3/react-native-hackathon-starter.git
1717
npm i
1818
```
1919

20-
3 run project
20+
3 link dependencies for react-native
21+
22+
```
23+
rnpm link
24+
```
25+
26+
4 run project
2127

2228
The API for React Native Elements is located [here](https://github.com/dabit3/React-Native-Elements).
2329

‎ios/HackathonStarter.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
};
66
objectVersion = 46;
77
objects = {
8-
98
/* Begin PBXBuildFile section */
109
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
1110
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };

‎src/about/About.js‎

Lines changed: 153 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ import {
77
Text,
88
Card,
99
SocialIcon,
10+
Divider,
1011
ButtonGroup
1112
} from 'react-native-elements'
1213

14+
import * as RNElements from 'react-native-elements'
15+
1316
let styles = {}
1417

1518
const users = [
@@ -90,10 +93,157 @@ class About extends Component {
9093
<Text style={styles.fonts} h4>h4 Heading</Text>
9194
<Text style={styles.fonts} >Normal Text</Text>
9295
</Card>
96+
<Card
97+
title='ICONS'
98+
containerStyle={{marginTop: 15}}>
99+
<View style={[styles.social, {marginTop: 15, marginBottom: 15, justifyContent: 'space-around'}]}>
100+
<RNElements.Icon
101+
onPress={() => console.log('hello')}
102+
type='font-awesome'
103+
color='#e14329'
104+
name='hashtag' />
105+
<RNElements.Icon
106+
onPress={() => console.log('hello')}
107+
type='font-awesome'
108+
color='#02b875'
109+
name='rocket' />
110+
<RNElements.Icon
111+
onPress={() => console.log('hello')}
112+
color='#000000'
113+
name='snapchat-ghost'
114+
type='font-awesome' />
115+
<RNElements.Icon
116+
color='#6441A5'
117+
name='btc'
118+
type='font-awesome'
119+
onPress={() => console.log('hello')} />
120+
<RNElements.Icon
121+
color='#f50'
122+
name='heartbeat'
123+
type='font-awesome'
124+
onPress={() => console.log('hello')} />
125+
</View>
126+
<View style={[styles.social,{marginTop: 15, marginBottom: 15, justifyContent: 'space-around'}]}>
127+
<RNElements.Icon
128+
name='rowing'
129+
color='#673AB7'
130+
onPress={() => console.log('hello')} />
131+
<RNElements.Icon
132+
name='g-translate'
133+
color='#03A9F4'
134+
onPress={() => console.log('hello')} />
135+
<RNElements.Icon
136+
color='#009688'
137+
name='sc-telegram'
138+
type='evilicon'
139+
onPress={() => console.log('hello')} />
140+
<RNElements.Icon
141+
color='#8BC34A'
142+
name='social-apple'
143+
type='foundation'
144+
onPress={() => console.log('hello')} />
145+
<RNElements.Icon
146+
color='#FFC107'
147+
name='ios-american-football'
148+
type='ionicon'
149+
onPress={() => console.log('hello')} />
150+
</View>
151+
152+
<View>
153+
<View style={[styles.social,{ justifyContent: 'space-around'}]}>
154+
<RNElements.Icon
155+
raised
156+
name='vpn-key'
157+
color='#E91E63'
158+
onPress={() => console.log('hello')} />
159+
<RNElements.Icon
160+
raised
161+
name='ring-volume'
162+
color='#3F51B5'
163+
onPress={() => console.log('hello')} />
164+
<RNElements.Icon
165+
raised
166+
color='#00BCD4'
167+
name='weekend'
168+
onPress={() => console.log('hello')} />
169+
<RNElements.Icon
170+
raised
171+
color='#CDDC39'
172+
name='bubble-chart'
173+
onPress={() => console.log('hello')} />
174+
<RNElements.Icon
175+
raised
176+
color='#FF5722'
177+
name='burst-mode'
178+
onPress={() => console.log('hello')} />
179+
</View>
180+
</View>
181+
182+
<View style={[styles.social,{ justifyContent: 'space-around'}]}>
183+
<RNElements.Icon
184+
reverse
185+
raised
186+
name='account-balance'
187+
color='#673AB7'
188+
onPress={() => console.log('hello')} />
189+
<RNElements.Icon
190+
reverse
191+
raised
192+
name='android'
193+
color='#03A9F4'
194+
onPress={() => console.log('hello')} />
195+
<RNElements.Icon
196+
reverse
197+
raised
198+
color='#009688'
199+
name='code'
200+
onPress={() => console.log('hello')} />
201+
<RNElements.Icon
202+
reverse
203+
raised
204+
color='#8BC34A'
205+
name='card-travel'
206+
onPress={() => console.log('hello')} />
207+
<RNElements.Icon
208+
reverse
209+
raised
210+
color='#FF9800'
211+
name='extension'
212+
onPress={() => console.log('hello')} />
213+
</View>
214+
215+
<View style={[styles.social,{ justifyContent: 'space-around'}]}>
216+
<RNElements.Icon
217+
reverse
218+
name='group-work'
219+
color='#E91E63'
220+
onPress={() => console.log('hello')} />
221+
<RNElements.Icon
222+
reverse
223+
name='lightbulb-outline'
224+
color='#3F51B5'
225+
onPress={() => console.log('hello')} />
226+
<RNElements.Icon
227+
reverse
228+
color='#00BCD4'
229+
name='pets'
230+
onPress={() => console.log('hello')} />
231+
<RNElements.Icon
232+
reverse
233+
color='#CDDC39'
234+
name='polymer'
235+
onPress={() => console.log('hello')} />
236+
<RNElements.Icon
237+
reverse
238+
color='#FF5722'
239+
name='touch-app'
240+
onPress={() => console.log('hello')} />
241+
</View>
242+
</Card>
93243
<Card
94244
title='SOCIAL ICONS'
95245
containerStyle={{marginTop: 15}}>
96-
<View style={styles.social}>
246+
<View style={[styles.social, { marginTop: 13, justifyContent: 'space-around'}]}>
97247
<SocialIcon
98248
raised={false}
99249
type='gitlab'
@@ -114,7 +264,7 @@ class About extends Component {
114264
type='soundcloud'
115265
/>
116266
</View>
117-
<View style={styles.social}>
267+
<View style={[styles.social, { marginTop: 13, justifyContent: 'space-around'}]}>
118268
<SocialIcon
119269
raised={false}
120270
type='facebook'
@@ -141,7 +291,7 @@ class About extends Component {
141291
<Card
142292
title='LIGHT SOCIAL ICONS'
143293
containerStyle={{marginTop: 15}}>
144-
<View style={styles.social}>
294+
<View style={[styles.social, {justifyContent: 'space-around'}]}>
145295
<SocialIcon
146296
light
147297
raised={false}

‎src/components/Divider.js‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎src/components/buttons/Button.js‎

Lines changed: 0 additions & 114 deletions
This file was deleted.

0 commit comments

Comments
 (0)