revert: don't show view switcher on mobile

opentripplanner · Aug 30, 2021 · 85bcb56 · 85bcb56
1 parent 2b85bbc
commit 85bcb56
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/lib/components/app/app-menu.js b/lib/components/app/app-menu.js
@@ -59,6 +59,8 @@ class AppMenu extends Component {
           id='app-menu'
           noCaret
           title={(<Icon type='bars' />)}>
+          {/* This item is duplicated by the view-switcher, but only shown on mobile
+            when the view switcher isn't shown */}
           <MenuItem className='app-menu-route-viewer-link' onClick={this._showRouteViewer}>
             <Icon type='bus' /> Route Viewer
           </MenuItem>

diff --git a/lib/components/mobile/batch-search-screen.js b/lib/components/mobile/batch-search-screen.js
@@ -32,7 +32,7 @@ class BatchSearchScreen extends Component {
   render () {
     return (
       <MobileContainer>
-        <MobileNavigationBar />
+        <MobileNavigationBar headerText='Plan Your Trip' />
         <div className='batch-search-settings mobile-padding'>
           <LocationField
             locationType='from'

diff --git a/lib/components/mobile/route-viewer.js b/lib/components/mobile/route-viewer.js
@@ -28,6 +28,7 @@ class MobileRouteViewer extends Component {
     return (
       <MobileContainer>
         <MobileNavigationBar
+          headerText={this.props.languageConfig.routeViewer || 'Route Viewer'}
           onBackClicked={this._backClicked}
           showBackButton
         />

diff --git a/lib/components/mobile/search-screen.js b/lib/components/mobile/search-screen.js
@@ -43,7 +43,7 @@ class MobileSearchScreen extends Component {
   render () {
     return (
       <MobileContainer>
-        <MobileNavigationBar />
+        <MobileNavigationBar headerText='Plan Your Trip' />
         <div className='search-settings mobile-padding'>
           <LocationField
             locationType='from'

diff --git a/lib/components/mobile/welcome-screen.js b/lib/components/mobile/welcome-screen.js
@@ -2,14 +2,14 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 
-import MobileContainer from './container'
 import LocationField from '../form/connected-location-field'
 import DefaultMap from '../map/default-map'
-import MobileNavigationBar from './navigation-bar'
-
 import { MobileScreens, setMobileScreen } from '../../actions/ui'
 import { setLocationToCurrent } from '../../actions/map'
 
+import MobileNavigationBar from './navigation-bar'
+import MobileContainer from './container'
+
 class MobileWelcomeScreen extends Component {
   static propTypes = {
     setLocationToCurrent: PropTypes.func,
@@ -36,7 +36,7 @@ class MobileWelcomeScreen extends Component {
   render () {
     return (
       <MobileContainer>
-        <MobileNavigationBar />
+        <MobileNavigationBar headerText='Plan Your Trip' />
         <div className='welcome-location mobile-padding'>
           <LocationField
             inputPlaceholder='Where do you want to go?'