Skip to content

Commit cca94c2

Browse files
committed
LFG-187: v2.0
1 parent 08b4a7a commit cca94c2

File tree

5 files changed

+15
-7
lines changed

5 files changed

+15
-7
lines changed

app/components/stateFullScreen/stateFullScreen.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ class StateFullScreen extends Component {
2121
constructor(props) {
2222
super(props)
2323

24+
this.state = {
25+
screenState: props.state
26+
}
27+
}
28+
29+
componentWillReceiveProps(newProps) {
30+
this.setState({screenState: newProps.state})
2431
}
2532

2633
_renderErrorScreen = () => {
@@ -47,7 +54,8 @@ class StateFullScreen extends Component {
4754
}
4855

4956
_conditionalRender = () => {
50-
switch (this.props.state) {
57+
// this.setState({screenState: this.props.state})
58+
switch (this.state.screenState) {
5159
case NORMAL_STATE:
5260
return this.props.contentView
5361
break

app/screens/Favorite/favoriteScreen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class FavoriteScreen extends Component {
8888
_renderTableView = (data) => {
8989
let listData = this.ds.cloneWithRows(data)
9090
return (
91-
<View style={style.listContainer}>
91+
<View style={Platform.OS === 'android' ? style.listContainer : null}>
9292
<ListView
9393
key={'listView'}
9494
style={ Platform.OS === 'android' ? style.tableAndroid : null }

app/screens/searchContact/searchContact.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ import ContactCell from './../contact/contactCell';
6868

6969
_renderTableView = () => {
7070
return (
71-
<View style={style.listContainer}>
71+
<View style={Platform.OS === 'android' ? style.listContainer : null}>
7272
<ListView
7373
key={'listView'}
7474
style={ Platform.OS === 'android' ? style.tableAndroid : null }

ios/Leapfroggers.xcodeproj/xcshareddata/xcschemes/Leapfroggers.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
</AdditionalOptions>
8282
</TestAction>
8383
<LaunchAction
84-
buildConfiguration = "Debug"
84+
buildConfiguration = "Release"
8585
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
8686
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
8787
language = ""

ios/Leapfroggers/Info.plist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>1004</string>
47+
<string>1005</string>
4848
<key>LSRequiresIPhoneOS</key>
4949
<true/>
5050
<key>NSAppTransportSecurity</key>
@@ -65,6 +65,8 @@
6565
</dict>
6666
</dict>
6767
</dict>
68+
<key>NSContactsUsageDescription</key>
69+
<string></string>
6870
<key>NSLocationWhenInUseUsageDescription</key>
6971
<string></string>
7072
<key>UILaunchStoryboardName</key>
@@ -84,7 +86,5 @@
8486
</array>
8587
<key>UIViewControllerBasedStatusBarAppearance</key>
8688
<true/>
87-
<key>NSContactsUsageDescription</key>
88-
<string></string>
8989
</dict>
9090
</plist>

0 commit comments

Comments
 (0)