Skip to content

Commit d98d48d

Browse files
committed
split building-hours-helpers apart into individual files
1 parent 9d85215 commit d98d48d

33 files changed

+420
-363
lines changed

source/views/building-hours/building-hours-helpers.js

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

source/views/building-hours/detail/building.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ import type {BuildingType} from '../types'
1111
import moment from 'moment-timezone'
1212
import ParallaxView from 'react-native-parallax-view'
1313
import * as c from '../../components/colors'
14-
import {
15-
normalizeBuildingSchedule,
16-
getShortBuildingStatus,
17-
} from '../building-hours-helpers'
14+
import {getShortBuildingStatus} from '../lib'
1815

1916
import {Badge} from './badge'
2017
import {Header} from './header'

source/views/building-hours/detail/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import type {BuildingType} from '../types'
1010
import type momentT from 'moment'
1111
import moment from 'moment-timezone'
1212
import {BuildingDetail} from './building'
13-
14-
const CENTRAL_TZ = 'America/Winnipeg'
13+
import {CENTRAL_TZ} from '../lib'
1514

1615
export class BuildingHoursDetailView extends React.PureComponent {
1716
static navigationOptions = ({navigation}) => {

source/views/building-hours/detail/schedule-row.android.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import React from 'react'
88
import {View, Text, StyleSheet} from 'react-native'
99
import type {SingleBuildingScheduleType} from '../types'
1010

11-
import {formatBuildingTimes, summarizeDays} from '../building-hours-helpers'
11+
import {formatBuildingTimes, summarizeDays} from '../lib'
1212

1313
export class ScheduleRow extends React.PureComponent {
1414
props: {

source/views/building-hours/detail/schedule-row.ios.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {StyleSheet} from 'react-native'
99
import type {SingleBuildingScheduleType} from '../types'
1010
import moment from 'moment-timezone'
1111
import {Cell} from 'react-native-tableview-simple'
12-
import {formatBuildingTimes, summarizeDays} from '../building-hours-helpers'
12+
import {formatBuildingTimes, summarizeDays} from '../lib'
1313

1414
export class ScheduleRow extends React.PureComponent {
1515
props: {

source/views/building-hours/detail/schedule-table.android.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
import React from 'react'
88
import {View, StyleSheet} from 'react-native'
9-
import type {DayOfWeekEnumType} from '../types'
109
import {Card} from '../../components/card'
1110
import moment from 'moment-timezone'
12-
import {isBuildingOpenAtMoment} from '../building-hours-helpers'
11+
import type {NamedBuildingScheduleType} from '../types'
12+
import {isScheduleOpenAtMoment, getDayOfWeek} from '../lib'
1313
import {ScheduleRow} from './schedule-row'
1414

1515
export class ScheduleTable extends React.PureComponent {
@@ -20,7 +20,7 @@ export class ScheduleTable extends React.PureComponent {
2020

2121
render() {
2222
const {now, schedules} = this.props
23-
const dayOfWeek = ((now.format('dd'): any): DayOfWeekEnumType)
23+
const dayOfWeek = getDayOfWeek(now)
2424

2525
return (
2626
<View>
@@ -39,7 +39,7 @@ export class ScheduleTable extends React.PureComponent {
3939
isActive={
4040
set.isPhysicallyOpen !== false &&
4141
schedule.days.includes(dayOfWeek) &&
42-
isBuildingOpenAtMoment(schedule, this.state.now)
42+
isScheduleOpenAtMoment(schedule, this.state.now)
4343
}
4444
/>,
4545
)}

0 commit comments

Comments
 (0)