Removes the lowercasing to the header title component
This commit is contained in:
+1
-8
@@ -18,13 +18,6 @@ import {headerTitles, menuTitles} from '../i18n/en/labels'
|
|||||||
import setupNotifications from '../lib/notifications'
|
import setupNotifications from '../lib/notifications'
|
||||||
import { closeDb } from '../db'
|
import { closeDb } from '../db'
|
||||||
|
|
||||||
// design wants everyhting lowercased, but we don't
|
|
||||||
// have CSS pseudo properties
|
|
||||||
const headerTitlesLowerCase = Object.keys(headerTitles).reduce((acc, curr) => {
|
|
||||||
acc[curr] = headerTitles[curr].toLowerCase()
|
|
||||||
return acc
|
|
||||||
}, {})
|
|
||||||
|
|
||||||
const HOME_PAGE = 'Home'
|
const HOME_PAGE = 'Home'
|
||||||
const CYCLE_DAY_PAGE = 'CycleDay'
|
const CYCLE_DAY_PAGE = 'CycleDay'
|
||||||
const SETTINGS_MENU_PAGE = 'SettingsMenu'
|
const SETTINGS_MENU_PAGE = 'SettingsMenu'
|
||||||
@@ -107,7 +100,7 @@ class App extends Component {
|
|||||||
...symptomViews
|
...symptomViews
|
||||||
}
|
}
|
||||||
const Page = pages[currentPage]
|
const Page = pages[currentPage]
|
||||||
const title = headerTitlesLowerCase[currentPage]
|
const title = headerTitles[currentPage]
|
||||||
|
|
||||||
const hasDefaultHeader =
|
const hasDefaultHeader =
|
||||||
!this.isSymptomView() &&
|
!this.isSymptomView() &&
|
||||||
|
|||||||
@@ -66,8 +66,7 @@ class CycleDayOverView extends Component {
|
|||||||
|
|
||||||
const { getCycleDayNumber } = cycleModule()
|
const { getCycleDayNumber } = cycleModule()
|
||||||
const cycleDayNumber = getCycleDayNumber(date)
|
const cycleDayNumber = getCycleDayNumber(date)
|
||||||
const headerSubtitle =
|
const headerSubtitle = cycleDayNumber && `Cycle day ${cycleDayNumber}`
|
||||||
cycleDayNumber && `Cycle day ${cycleDayNumber}`.toLowerCase()
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={{ flex: 1 }}>
|
<View style={{ flex: 1 }}>
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ class SymptomView extends Component {
|
|||||||
return (
|
return (
|
||||||
<View style={{flex: 1}}>
|
<View style={{flex: 1}}>
|
||||||
<Header
|
<Header
|
||||||
title={headerTitles[symptom].toLowerCase()}
|
title={headerTitles[symptom]}
|
||||||
subtitle={formatDate(this.date)}
|
subtitle={formatDate(this.date)}
|
||||||
handleBack={this.props.handleBackButtonPress}
|
handleBack={this.props.handleBackButtonPress}
|
||||||
handleDelete={
|
handleDelete={
|
||||||
|
|||||||
@@ -10,18 +10,24 @@ export default function Title({ title, subtitle }) {
|
|||||||
return (
|
return (
|
||||||
<View>
|
<View>
|
||||||
<Text style={styles.dateHeader} testID='headerTitle'>
|
<Text style={styles.dateHeader} testID='headerTitle'>
|
||||||
{title}
|
{ // design wants everyhting lowercased, but we don't
|
||||||
|
// have CSS pseudo properties
|
||||||
|
title.toLowerCase()}
|
||||||
</Text>
|
</Text>
|
||||||
{ subtitle &&
|
{ subtitle &&
|
||||||
<Text style={styles.cycleDayNumber} testID='headerSubtitle'>
|
<Text style={styles.cycleDayNumber} testID='headerSubtitle'>
|
||||||
{subtitle}
|
{subtitle.toLowerCase()}
|
||||||
</Text>
|
</Text>
|
||||||
}
|
}
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
return <Text testID='headerTitle' style={styles.headerText}>{title}</Text>
|
return (
|
||||||
|
<Text testID='headerTitle' style={styles.headerText}>
|
||||||
|
{title.toLowerCase()}
|
||||||
|
</Text>
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
Title.propTypes = {
|
Title.propTypes = {
|
||||||
|
|||||||
@@ -4,8 +4,9 @@ import moment from 'moment'
|
|||||||
export default function (date) {
|
export default function (date) {
|
||||||
const today = LocalDate.now()
|
const today = LocalDate.now()
|
||||||
const dateToDisplay = LocalDate.parse(date)
|
const dateToDisplay = LocalDate.parse(date)
|
||||||
const formattedDate = today.equals(dateToDisplay) ? 'today' : moment(date).format('MMMM Do YYYY')
|
return today.equals(dateToDisplay) ?
|
||||||
return formattedDate.toLowerCase()
|
'today' :
|
||||||
|
moment(date).format('MMMM Do YYYY')
|
||||||
}
|
}
|
||||||
|
|
||||||
export function formatDateForShortText (date) {
|
export function formatDateForShortText (date) {
|
||||||
|
|||||||
Reference in New Issue
Block a user