Merge pull request #1614 from StoDevX/list-footers-to-detail-footers

Move list footers (on lists with detail views) to the detail views

Author: hawkrives

source/views/building-hours/list.js

@@ -13,7 +13,7 @@ import type momentT from 'moment'
 import type {TopLevelViewPropsType} from '../types'
 import type {BuildingType} from './types'
 
-import {ListSeparator, ListSectionHeader, ListFooter} from '../components/list'
+import {ListSeparator, ListSectionHeader} from '../components/list'
 
 export {BuildingHoursDetailView} from './detail'
 
@@ -47,13 +47,6 @@ export class BuildingHoursList extends React.PureComponent {
     return (
       <SectionList
         ItemSeparatorComponent={ListSeparator}
-        ListFooterComponent={
-          <ListFooter
-            title={
-              'Building hours subject to change without notice\n\nData collected by the humans of All About Olaf'
-            }
-          />
-        }
         sections={(this.props.buildings: any)}
         extraData={this.props}
         keyExtractor={this.keyExtractor}

source/views/calendar/event-detail.android.js

@@ -11,6 +11,9 @@ import * as c from '../components/colors'
 import {ButtonCell} from '../components/cells/button'
 import {addToCalendar} from './calendar-util'
 import delay from 'delay'
+import {ListFooter} from '../components/list'
+
+const STO_CALENDAR_URL = 'https://www.stolaf.edu/calendar'
 
 const styles = StyleSheet.create({
   name: {
@@ -165,6 +168,11 @@ export class EventDetail extends React.PureComponent {
           message={this.state.message}
           disabled={this.state.disabled}
         />
+
+        <ListFooter
+          title="Powered by the St. Olaf Calendar"
+          href={STO_CALENDAR_URL}
+        />
       </ScrollView>
     )
   }

source/views/calendar/event-detail.ios.js

@@ -6,6 +6,7 @@ import type {CleanedEventType} from './types'
 import type {TopLevelViewPropsType} from '../types'
 import {ShareButton} from '../components/nav-buttons'
 import openUrl from '../components/open-url'
+import {ListFooter} from '../components/list'
 import {getTimes, getLinksFromEvent} from './clean-event'
 import {ButtonCell} from '../components/cells/button'
 import {addToCalendar} from './calendar-util'
@@ -17,6 +18,8 @@ const styles = StyleSheet.create({
   },
 })
 
+const STO_CALENDAR_URL = 'https://www.stolaf.edu/calendar'
+
 const shareItem = (event: CleanedEventType) => {
   const summary = event.summary ? event.summary : ''
   const times = getTimes(event) ? getTimes(event) : ''
@@ -134,6 +137,11 @@ export class EventDetail extends React.PureComponent {
             message={this.state.message}
             disabled={this.state.disabled}
           />
+
+          <ListFooter
+            title="Powered by the St. Olaf Calendar"
+            href={STO_CALENDAR_URL}
+          />
         </TableView>
       </ScrollView>
     )

source/views/contacts/contact-detail.js

@@ -2,13 +2,16 @@
 import React from 'react'
 import {Alert, StyleSheet} from 'react-native'
 import {Markdown} from '../components/markdown'
+import {ListFooter} from '../components/list'
 import glamorous from 'glamorous-native'
 import {phonecall} from 'react-native-communications'
 import {tracker} from '../../analytics'
 import {Button} from '../components/button'
 import openUrl from '../components/open-url'
 import type {ContactType} from './types'
 
+const AAO_URL = 'https://github.com/StoDevX/AAO-React-Native/issues/new'
+
 const Title = glamorous.text({
   fontSize: 36,
   textAlign: 'center',
@@ -68,11 +71,18 @@ export class ContactsDetailView extends React.PureComponent {
     return (
       <Container>
         <Title selectable={true}>{contact.title}</Title>
+
         <Markdown
           styles={{Paragraph: styles.paragraph}}
           source={contact.text}
         />
+
         <Button onPress={this.onPress} title={contact.buttonText} />
+
+        <ListFooter
+          title="Collected by the humans of All About Olaf"
+          href={AAO_URL}
+        />
       </Container>
     )
   }

source/views/contacts/contact-list.js

@@ -7,7 +7,7 @@
 import React from 'react'
 import {SectionList, StyleSheet} from 'react-native'
 import {ListSeparator, ListSectionHeader} from '../components/list'
-import {ListEmpty, ListFooter} from '../components/list'
+import {ListEmpty} from '../components/list'
 import {ContactRow} from './contact-row'
 import delay from 'delay'
 import {reportNetworkProblem} from '../../lib/report-network-problem'
@@ -18,7 +18,6 @@ import * as c from '../components/colors'
 import type {ContactType} from './types'
 import type {TopLevelViewPropsType} from '../types'
 
-const AAO_URL = 'https://github.com/StoDevX/AAO-React-Native/issues/new'
 const GITHUB_URL =
   'https://stodevx.github.io/AAO-React-Native/contact-info.json'
 
@@ -107,12 +106,6 @@ export class ContactsListView extends React.PureComponent<void, Props, State> {
       <SectionList
         ItemSeparatorComponent={ListSeparator}
         ListEmptyComponent={<ListEmpty mode="bug" />}
-        ListFooterComponent={
-          <ListFooter
-            title="Collected by the humans of All About Olaf"
-            href={AAO_URL}
-          />
-        }
         style={styles.listContainer}
         data={groupedData}
         sections={groupedData}

source/views/dictionary/detail.js

@@ -2,9 +2,14 @@
 import React from 'react'
 import {StyleSheet} from 'react-native'
 import {Markdown} from '../components/markdown'
+import {ListFooter} from '../components/list'
 import glamorous from 'glamorous-native'
 import type {WordType} from './types'
 
+// TODO: This doesn't point at the SA dictionary because they don't have an
+// overview page.
+const STO_SA_DICT_URL = 'https://github.com/StoDevX/AAO-React-Native/issues/new'
+
 const Term = glamorous.text({
   fontSize: 36,
   textAlign: 'center',
@@ -43,6 +48,13 @@ export class DictionaryDetailView extends React.PureComponent {
           styles={{Paragraph: styles.paragraph}}
           source={item.definition}
         />
+
+        <ListFooter
+          title={
+            'Collected by the humans of All About Olaf,\nfrom the Student Activities dictionary'
+          }
+          href={STO_SA_DICT_URL}
+        />
       </Container>
     )
   }

source/views/sis/student-work/detail.android.js

@@ -135,6 +135,8 @@ function LastUpdated({when}: {when: string}) {
         Last updated:
         {' '}
         {moment(when, 'YYYY/MM/DD').calendar()}
+        {'\n'}
+        Powered by St. Olaf Student Employment job postings
       </Text>
     : null
 }

source/views/sis/student-work/detail.ios.js

@@ -103,6 +103,8 @@ function LastUpdated({when}: {when: string}) {
         Last updated:
         {' '}
         {moment(when, 'YYYY/MM/DD').calendar()}
+        {'\n'}
+        Powered by St. Olaf Student Employment job postings
       </Text>
     : null
 }