Refactors app.js for readability

This commit is contained in:
Sofiya Tepikin
2019-01-17 23:12:50 +01:00
parent ff8765b9f8
commit 31268186f1
+52 -43
View File
@@ -21,15 +21,16 @@ const headerTitlesLowerCase = Object.keys(headerTitles).reduce((acc, curr) => {
return acc return acc
}, {}) }, {})
const isSymptomView = name => Object.keys(symptomViews).includes(name) const HOME_PAGE = 'Home'
const isSettingsView = name => Object.keys(settingsViews).includes(name) const INFO_SYMPTOM_PAGE = 'InfoSymptom'
const isMenuItem = name => Object.keys(menuTitles).includes(name) const CYCLE_DAY_PAGE = 'CycleDay'
const SETTINGS_MENU_PAGE = 'SettingsMenu'
export default class App extends Component { export default class App extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.state = { this.state = {
currentPage: 'Home' currentPage: HOME_PAGE
} }
this.backHandler = BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonPress) this.backHandler = BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonPress)
setupNotifications(this.navigate) setupNotifications(this.navigate)
@@ -40,46 +41,62 @@ export default class App extends Component {
} }
navigate = (pageName, props) => { navigate = (pageName, props) => {
const { currentPage } = this.state
// for the back button to work properly, we want to // for the back button to work properly, we want to
// remember two origins: which menu item we came from // remember two origins: which menu item we came from
// and from where we navigated to the symptom view (day // and from where we navigated to the symptom view (day
// view or home page) // view or home page)
if (isMenuItem(this.state.currentPage)) { if (this.isMenuItem()) {
this.menuOrigin = this.state.currentPage this.menuOrigin = currentPage
} }
if (!isSymptomView(this.state.currentPage) && if (!this.isSymptomView() && !this.isInfoSymptomView()) {
this.state.currentPage !== 'InfoSymptom') { this.originForSymptomView = currentPage
this.originForSymptomView = this.state.currentPage
} }
this.setState({ currentPage: pageName, currentProps: props }) this.setState({ currentPage: pageName, currentProps: props })
} }
handleBackButtonPress = () => { handleBackButtonPress = () => {
if (this.state.currentPage === 'Home') return false const { currentPage, currentProps } = this.state
if (isSymptomView(this.state.currentPage)) { if (currentPage === HOME_PAGE) return false
if (this.isSymptomView()) {
this.navigate( this.navigate(
this.originForSymptomView, { date: this.state.currentProps.date } this.originForSymptomView, { date: currentProps.date }
) )
} else if (isSettingsView(this.state.currentPage)) { } else if (this.isSettingsView()) {
this.navigate('SettingsMenu') this.navigate(SETTINGS_MENU_PAGE)
} else if (this.state.currentPage === 'CycleDay') { } else if (currentPage === CYCLE_DAY_PAGE) {
this.navigate(this.menuOrigin) this.navigate(this.menuOrigin)
} else if (this.state.currentPage === 'InfoSymptom') { } else if (this.isInfoSymptomView()) {
const { date, cycleDay, symptomView } = currentProps
this.navigate( this.navigate(
this.state.currentProps.symptomView, { symptomView, { date, cycleDay })
date: this.state.currentProps.date,
cycleDay: this.state.currentProps.cycleDay
})
} else { } else {
this.navigate('Home') this.navigate(HOME_PAGE)
} }
return true return true
} }
isMenuItem() {
return Object.keys(menuTitles).includes(this.state.currentPage)
}
isSymptomView() {
return Object.keys(symptomViews).includes(this.state.currentPage)
}
isInfoSymptomView() {
return this.state.currentPage === INFO_SYMPTOM_PAGE
}
isSettingsView() {
return Object.keys(settingsViews).includes(this.state.currentPage)
}
isDefaultView() { isDefaultView() {
return this.state.currentPage !== 'CycleDay' && const { currentPage } = this.state
!isSymptomView(this.state.currentPage) && return currentPage !== CYCLE_DAY_PAGE &&
this.state.currentPage !== 'InfoSymptom' !this.isSymptomView() &&
!this.isInfoSymptomView()
} }
render() { render() {
@@ -96,43 +113,35 @@ export default class App extends Component {
...symptomViews ...symptomViews
} }
const page = pages[currentPage] const page = pages[currentPage]
const title = headerTitlesLowerCase[currentPage]
const isSymptomView = this.isSymptomView()
return ( return (
<View style={{flex: 1}}> <View style={{flex: 1}}>
{this.isDefaultView() && {this.isDefaultView() &&
<Header <Header title={title} />
title={headerTitlesLowerCase[currentPage]}
/>
} }
{currentPage === 'InfoSymptom' && {this.isInfoSymptomView() &&
<Header <Header title={title} goBack={this.handleBackButtonPress} />
title={headerTitlesLowerCase[currentPage]}
goBack={this.handleBackButtonPress}
/>
} }
{isSymptomView(currentPage) && {isSymptomView &&
<Header <Header
title={headerTitlesLowerCase[currentPage]} title={title}
isSymptomView={true} isSymptomView={true}
goBack={this.handleBackButtonPress} goBack={this.handleBackButtonPress}
date={currentProps.date} date={currentProps.date}
goToSymptomInfo={() => this.navigate('InfoSymptom', { goToSymptomInfo={() => this.navigate(INFO_SYMPTOM_PAGE, {
date: currentProps.date,
symptomView: currentPage, symptomView: currentPage,
cycleDay: currentProps.cycleDay ...currentProps
})} })}
/>} />}
{React.createElement(page, { {React.createElement(page, {
navigate: this.navigate, navigate: this.navigate,
...currentProps ...currentProps
})} })}
{!isSymptomView(currentPage) && {!isSymptomView &&
<Menu <Menu navigate={this.navigate} currentPage={currentPage} />
navigate={this.navigate}
currentPage={currentPage}
/>
} }
</View> </View>
) )