Merge pull request #73 from jbkuczma/v2.3

v2.3
jbkuczma · May 6, 2018 · bc3b8a1 · bc3b8a1
2 parents 80984c2 + 3fb357f
commit bc3b8a1
Show file tree

Hide file tree

Showing 25 changed files with 749 additions and 111 deletions.
diff --git a/App/Assets/icons/refresh.png b/App/Assets/icons/refresh.png
diff --git a/App/NBAreact.js b/App/NBAreact.js
@@ -1,19 +1,31 @@
 import React, { Component } from 'react'
 import { Text, View, Image } from 'react-native'
-import { StackNavigator, TabNavigator } from 'react-navigation'
+import { StackNavigator, TabNavigator, NavigationActions } from 'react-navigation'
 
 import ScoresScreen from './components/ScoresScreen'
 import GameDetailScreen from './components/GameDetailScreen'
 import StandingsScreen from './components/StandingsScreen'
 import TeamScreen from './components/TeamScreen'
 import PlayerScreen from './components/PlayerScreen'
+import PlayerGameDetailScreen from './components/PlayerGameDetailScreen'
 import TeamStats from './components/GameDetailScreen/TeamStats'
 import BoxScore from './components/GameDetailScreen/BoxScore'
 import PlayByPlay from './components/GameDetailScreen/PlayByPlay'
 import LeagueLeaders from './components/LeagueLeaders'
 
 import SearchBar from './components/common/SearchBar'
 
+const defaultNavigationOptions = {
+  headerTintColor: '#D3D3D3',
+  headerStyle: {
+    backgroundColor: '#171717',
+    borderBottomWidth: 0
+  },
+  headerTitleStyle: {
+    fontSize: 18,
+  }
+}
+
 const GameDetailNavigator = TabNavigator({
   'Team Stats': { screen: TeamStats },
   'Boxscore': { screen: BoxScore },
@@ -53,16 +65,7 @@ const ScoresStack = StackNavigator({
   },
   Game: {
     screen: GameDetailNavigator,
-    navigationOptions: {
-      headerTintColor: '#D3D3D3',
-      headerStyle: {
-        backgroundColor: '#171717',
-        borderBottomWidth: 0
-      },
-      headerTitleStyle: {
-        fontSize: 18,
-      }
-    }
+    navigationOptions: defaultNavigationOptions
   }
 })
 
@@ -73,42 +76,19 @@ const StandingsStack = StackNavigator({
   },
   Team: {
     screen: TeamScreen,
-    navigationOptions: {
-      headerTintColor: '#D3D3D3',
-      headerStyle: {
-        backgroundColor: '#171717',
-        borderBottomWidth: 0
-      },
-      headerTitleStyle: {
-        fontSize: 18,
-      }
-    }
+    navigationOptions: defaultNavigationOptions
   },
   Player: {
     screen: PlayerScreen,
-    navigationOptions: {
-      headerTintColor: '#D3D3D3',
-      headerStyle: {
-        backgroundColor: '#171717',
-        borderBottomWidth: 0
-      },
-      headerTitleStyle: {
-        fontSize: 18,
-      }
-    }
+    navigationOptions: defaultNavigationOptions
   },
   Game: {
     screen: GameDetailNavigator,
-    navigationOptions: {
-      headerTintColor: '#D3D3D3',
-      headerStyle: {
-        backgroundColor: '#171717',
-        borderBottomWidth: 0
-      },
-      headerTitleStyle: {
-        fontSize: 18,
-      }
-    }
+    navigationOptions: defaultNavigationOptions
+  },
+  PlayerGameDetail: {
+    screen: PlayerGameDetailScreen,
+    navigationOptions: defaultNavigationOptions
   }
 })
 
@@ -123,16 +103,11 @@ const LeagueLeadersStack = StackNavigator({
   },
   Player: {
     screen: PlayerScreen,
-    navigationOptions: {
-      headerTintColor: '#D3D3D3',
-      headerStyle: {
-        backgroundColor: '#171717',
-        borderBottomWidth: 0
-      },
-      headerTitleStyle: {
-        fontSize: 18,
-      }
-    }
+    navigationOptions: defaultNavigationOptions
+  },
+  PlayerGameDetail: {
+    screen: PlayerGameDetailScreen,
+    navigationOptions: defaultNavigationOptions
   }
 })
 
@@ -157,6 +132,21 @@ export default TabNavigator({
 
       return <Image source={iconName} style={[ iconStyle, { tintColor: tintColor }]} />
     },
+
+    // NOTE: this works as intended however there are side effects that I'm not comfortable releasing yet
+    // tabBarOnPress: ({ scene, jumpToIndex }) => {
+    //   const { route, focused, index } = scene
+    //   if (focused) {
+    //     if (route.index > 0) {
+    //       const { routeName, key } = route.routes[1]
+    //       navigation.dispatch(
+    //         NavigationActions.back({ key })
+    //       )
+    //     }
+    //   } else {
+    //     jumpToIndex(index)
+    //   }
+    // },
   }),
   tabBarOptions: {
     activeTintColor: '#F7971E',

diff --git a/App/components/GameDetailScreen/BoxScore/BoxScore.js b/App/components/GameDetailScreen/BoxScore/BoxScore.js
@@ -131,7 +131,9 @@ class BoxScore extends Component<Props> {
           }
           {
             !this.state.loading && this.state.boxscore.activePlayers && this.props.playersInLeague &&
-              this._createBoxscoreTable(this.state.boxscore)
+              <ScrollView horizontal={true} contentContainerStyle={{justifyContent: 'center', alignItems: 'center',flexDirection: 'column'}}>
+                { this._createBoxscoreTable(this.state.boxscore) }
+              </ScrollView>
           }
           {
             !this.state.loading && !this.state.boxscore.activePlayers &&

diff --git a/App/components/GameDetailScreen/BoxScore/PlayerBoxCell.js b/App/components/GameDetailScreen/BoxScore/PlayerBoxCell.js
@@ -56,7 +56,8 @@ const styles = StyleSheet.create({
   },
   boxscoreText: {
     textAlign: 'center',
-    color: '#D3D3D3'
+    color: '#D3D3D3',
+    fontFamily: 'Rubik-Light'
   },
   boxscoreStatNameView: {
     width: 140,

diff --git a/App/components/GameDetailScreen/PlayByPlay/PlayByPlay.js b/App/components/GameDetailScreen/PlayByPlay/PlayByPlay.js
@@ -150,7 +150,8 @@ const styles = StyleSheet.create({
   },
   playByPlayText: {
     textAlign: 'center',
-    color: '#D3D3D3'
+    color: '#D3D3D3',
+    fontFamily: 'Rubik-Light'
   }
 })
 

diff --git a/App/components/GameDetailScreen/TeamStats/TeamStats.js b/App/components/GameDetailScreen/TeamStats/TeamStats.js
@@ -1,17 +1,23 @@
 import React, { Component } from 'react'
-import { Text, View, StatusBar, StyleSheet, ScrollView, Dimensions } from 'react-native'
+import { Text, View, StatusBar, StyleSheet, ScrollView, Dimensions, TouchableOpacity, Image } from 'react-native'
 import { connect } from 'react-redux'
 import NBA from '../../../utils/nba'
 import TeamMap from '../../../utils/TeamMap'
 import Loader from '../../common/Loader'
+import RefreshButton from '../../common/RefreshButton'
 import LeadTracker from './LeadTracker'
 import TeamStatsTable from './TeamStatsTable'
 import QuarterScores from './QuarterScores'
 
 class TeamStats extends Component<Props> {
 
   static navigationOptions = ({ navigation }) => ({
-    headerTitle: `${navigation.state.params.title}`
+    headerTitle: `${navigation.state.params.title}`,
+    headerRight: (
+      <RefreshButton
+        handleRefresh={navigation.state.params.handleRefresh}
+      />
+    )
   })
 
   constructor() {
@@ -27,10 +33,12 @@ class TeamStats extends Component<Props> {
   }
 
   componentDidMount() {
+    // we can now call fetchGameStats via navigation.state.params.handleRefresh
+    this.props.navigation.setParams({ handleRefresh: this.fetchGameStats })
     this.fetchGameStats()
   }
 
-  fetchGameStats() {
+  fetchGameStats = () => {
     Promise.all([
       this.nba.getBoxscore(this.props.gameID, this.props.date),
       this.nba.getLeadTrackerForGame(this.props.gameID, this.props.date),
@@ -104,12 +112,14 @@ class TeamStats extends Component<Props> {
 const styles = StyleSheet.create({
   text: {
     textAlign: 'center',
-    color: '#D3D3D3'
+    color: '#D3D3D3',
+    fontFamily: 'Rubik-Light'
   },
   text18pt: {
     textAlign: 'center',
     color: '#D3D3D3',
-    fontSize: 18
+    fontSize: 18,
+    fontFamily: 'Rubik-Light'
   },
   defaultCenteredView: {
     flex: 1,

diff --git a/App/components/GameDetailScreen/TeamStats/TeamStatsTable.js b/App/components/GameDetailScreen/TeamStats/TeamStatsTable.js
@@ -107,7 +107,8 @@ class TeamStatsTable extends Component<Props> {
 const styles = StyleSheet.create({
   text: {
     textAlign: 'center',
-    color: '#D3D3D3'
+    color: '#D3D3D3',
+    // fontFamily: 'Rubik-Light'
   }
 })