From 90cf585a386acb6b678b7ccac9357306a631a7e6 Mon Sep 17 00:00:00 2001 From: Hawken Rives Date: Sat, 25 Aug 2018 18:51:31 -0500 Subject: [PATCH 1/2] move tabbed-view and tabbar-icon into a module --- modules/navigation-tabs/index.js | 4 ++++ {source/components => modules/navigation-tabs}/tabbar-icon.js | 0 .../index.js => modules/navigation-tabs/tabbed-view.js | 0 3 files changed, 4 insertions(+) create mode 100644 modules/navigation-tabs/index.js rename {source/components => modules/navigation-tabs}/tabbar-icon.js (100%) rename source/components/tabbed-view/index.js => modules/navigation-tabs/tabbed-view.js (100%) diff --git a/modules/navigation-tabs/index.js b/modules/navigation-tabs/index.js new file mode 100644 index 0000000000..f3ce4eb18a --- /dev/null +++ b/modules/navigation-tabs/index.js @@ -0,0 +1,4 @@ +// @flow + +export {TabBarIcon} from './tabbar-icon' +export {TabNavigator} from './tabbed-view' diff --git a/source/components/tabbar-icon.js b/modules/navigation-tabs/tabbar-icon.js similarity index 100% rename from source/components/tabbar-icon.js rename to modules/navigation-tabs/tabbar-icon.js diff --git a/source/components/tabbed-view/index.js b/modules/navigation-tabs/tabbed-view.js similarity index 100% rename from source/components/tabbed-view/index.js rename to modules/navigation-tabs/tabbed-view.js From 7744fd058440709a440550424eb1e5a4ab0ac663 Mon Sep 17 00:00:00 2001 From: Hawken Rives Date: Sat, 25 Aug 2018 20:51:27 -0500 Subject: [PATCH 2/2] update imports for new navigation-tabs module --- source/views/calendar/index.js | 3 +-- source/views/menus/carleton-menus.js | 2 +- source/views/menus/dev-bonapp-picker.js | 2 +- source/views/menus/index.js | 3 +-- source/views/news/index.js | 3 +-- source/views/sis/balances.js | 2 +- source/views/sis/course-search/search.js | 2 +- source/views/sis/index.js | 2 +- source/views/sis/student-work/index.js | 2 +- source/views/sis/tes.js | 2 +- source/views/streaming/index.js | 2 +- source/views/streaming/movie.js | 2 +- source/views/streaming/radio/station-krlx.js | 2 +- source/views/streaming/radio/station-ksto.js | 2 +- source/views/streaming/streams/list.js | 2 +- source/views/streaming/webcams/list.js | 2 +- source/views/transportation/index.js | 3 +-- source/views/transportation/other-modes/list.js | 2 +- 18 files changed, 18 insertions(+), 22 deletions(-) diff --git a/source/views/calendar/index.js b/source/views/calendar/index.js index b5044d1b72..3d6471e413 100644 --- a/source/views/calendar/index.js +++ b/source/views/calendar/index.js @@ -1,8 +1,7 @@ // @flow import * as React from 'react' -import {TabNavigator} from '../../components/tabbed-view' -import {TabBarIcon} from '../../components/tabbar-icon' +import {TabNavigator, TabBarIcon} from '@frogpond/navigation-tabs' import {CccCalendarView} from './calendar-ccc' diff --git a/source/views/menus/carleton-menus.js b/source/views/menus/carleton-menus.js index d9989689e1..f9cc15c7c9 100644 --- a/source/views/menus/carleton-menus.js +++ b/source/views/menus/carleton-menus.js @@ -1,6 +1,6 @@ // @flow import * as React from 'react' -import {TabBarIcon} from '../../components/tabbar-icon' +import {TabBarIcon} from '@frogpond/navigation-tabs' import {View, Platform, ScrollView, StyleSheet} from 'react-native' import type {TopLevelViewPropsType} from '../types' import {Row} from '@frogpond/layout' diff --git a/source/views/menus/dev-bonapp-picker.js b/source/views/menus/dev-bonapp-picker.js index e334e7f951..892e30cb4f 100644 --- a/source/views/menus/dev-bonapp-picker.js +++ b/source/views/menus/dev-bonapp-picker.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react' import {View, TextInput, StyleSheet} from 'react-native' -import {TabBarIcon} from '../../components/tabbar-icon' +import {TabBarIcon} from '@frogpond/navigation-tabs' import * as c from '@frogpond/colors' import {Toolbar, ToolbarButton} from '@frogpond/toolbar' import type {TopLevelViewPropsType} from '../types' diff --git a/source/views/menus/index.js b/source/views/menus/index.js index 3ff986d054..ee81b67aac 100644 --- a/source/views/menus/index.js +++ b/source/views/menus/index.js @@ -1,8 +1,7 @@ // @flow import * as React from 'react' -import {TabNavigator} from '../../components/tabbed-view' -import {TabBarIcon} from '../../components/tabbar-icon' +import {TabNavigator, TabBarIcon} from '@frogpond/navigation-tabs' import {BonAppHostedMenu} from './menu-bonapp' import {GitHubHostedMenu} from './menu-github' diff --git a/source/views/news/index.js b/source/views/news/index.js index 09843ecf7f..c5457ca260 100644 --- a/source/views/news/index.js +++ b/source/views/news/index.js @@ -2,8 +2,7 @@ // @flow import * as React from 'react' -import {TabNavigator} from '../../components/tabbed-view' -import {TabBarIcon} from '../../components/tabbar-icon' +import {TabNavigator, TabBarIcon} from '@frogpond/navigation-tabs' import * as newsImages from '../../../images/news-sources' import NewsContainer from './news-container' diff --git a/source/views/sis/balances.js b/source/views/sis/balances.js index 2a209194ff..8ff7753561 100644 --- a/source/views/sis/balances.js +++ b/source/views/sis/balances.js @@ -9,7 +9,7 @@ import { RefreshControl, Alert, } from 'react-native' -import {TabBarIcon} from '../../components/tabbar-icon' +import {TabBarIcon} from '@frogpond/navigation-tabs' import {connect} from 'react-redux' import {Cell, TableView, Section} from '@frogpond/tableview' import { diff --git a/source/views/sis/course-search/search.js b/source/views/sis/course-search/search.js index df8d3e6f10..2614acdede 100644 --- a/source/views/sis/course-search/search.js +++ b/source/views/sis/course-search/search.js @@ -2,7 +2,7 @@ import * as React from 'react' import {StyleSheet, View, ScrollView} from 'react-native' -import {TabBarIcon} from '../../../components/tabbar-icon' +import {TabBarIcon} from '@frogpond/navigation-tabs' import * as c from '@frogpond/colors' import { updateCourseData, diff --git a/source/views/sis/index.js b/source/views/sis/index.js index 138181131d..5cbbd711fd 100644 --- a/source/views/sis/index.js +++ b/source/views/sis/index.js @@ -1,6 +1,6 @@ // @flow -import {TabNavigator} from '../../components/tabbed-view' +import {TabNavigator} from '../../../modules/navigation-tabs/tabbed-view' import BalancesView from './balances' import StudentWorkView from './student-work' diff --git a/source/views/sis/student-work/index.js b/source/views/sis/student-work/index.js index 319a815217..74726e5392 100644 --- a/source/views/sis/student-work/index.js +++ b/source/views/sis/student-work/index.js @@ -2,7 +2,7 @@ import * as React from 'react' import {StyleSheet, SectionList} from 'react-native' -import {TabBarIcon} from '../../../components/tabbar-icon' +import {TabBarIcon} from '@frogpond/navigation-tabs' import type {TopLevelViewPropsType} from '../../types' import * as c from '@frogpond/colors' import {ListSeparator, ListSectionHeader} from '@frogpond/lists' diff --git a/source/views/sis/tes.js b/source/views/sis/tes.js index f05aa725a9..e50cfa12ee 100644 --- a/source/views/sis/tes.js +++ b/source/views/sis/tes.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react' -import {TabBarIcon} from '../../components/tabbar-icon' +import {TabBarIcon} from '@frogpond/navigation-tabs' import openUrl from '../../components/open-url' import type {TopLevelViewPropsType} from '../types' import {NoticeView} from '@frogpond/notice' diff --git a/source/views/streaming/index.js b/source/views/streaming/index.js index 7987d30622..5b721c359c 100644 --- a/source/views/streaming/index.js +++ b/source/views/streaming/index.js @@ -1,6 +1,6 @@ // @flow -import {TabNavigator} from '../../components/tabbed-view' +import {TabNavigator} from '../../../modules/navigation-tabs/tabbed-view' // import WeeklyMovieView from './movie' import {WebcamsView} from './webcams' diff --git a/source/views/streaming/movie.js b/source/views/streaming/movie.js index 8ea4cd97f5..d404960f32 100644 --- a/source/views/streaming/movie.js +++ b/source/views/streaming/movie.js @@ -2,7 +2,7 @@ import * as React from 'react' import {StyleSheet, View, Text} from 'react-native' -import {TabBarIcon} from '../../components/tabbar-icon' +import {TabBarIcon} from '@frogpond/navigation-tabs' export default function WeeklyMovieView() { return ( diff --git a/source/views/streaming/radio/station-krlx.js b/source/views/streaming/radio/station-krlx.js index 23aef66d85..e7c50a4f4e 100644 --- a/source/views/streaming/radio/station-krlx.js +++ b/source/views/streaming/radio/station-krlx.js @@ -2,7 +2,7 @@ import * as React from 'react' import * as c from '@frogpond/colors' -import {TabBarIcon} from '../../../components/tabbar-icon' +import {TabBarIcon} from '@frogpond/navigation-tabs' import {type TopLevelViewPropsType} from '../../types' import * as logos from '../../../../images/streaming' import {RadioControllerView} from './index' diff --git a/source/views/streaming/radio/station-ksto.js b/source/views/streaming/radio/station-ksto.js index 81f4c35530..93ca62b047 100644 --- a/source/views/streaming/radio/station-ksto.js +++ b/source/views/streaming/radio/station-ksto.js @@ -2,7 +2,7 @@ import * as React from 'react' import {sto} from '@app/lib/colors' -import {TabBarIcon} from '../../../components/tabbar-icon' +import {TabBarIcon} from '@frogpond/navigation-tabs' import {type TopLevelViewPropsType} from '../../types' import * as logos from '../../../../images/streaming' import {RadioControllerView} from './index' diff --git a/source/views/streaming/streams/list.js b/source/views/streaming/streams/list.js index ad5fcaeb9f..7dc4c97a18 100644 --- a/source/views/streaming/streams/list.js +++ b/source/views/streaming/streams/list.js @@ -6,7 +6,7 @@ import {StyleSheet, SectionList} from 'react-native' import * as c from '@frogpond/colors' import {ListSeparator, ListSectionHeader} from '@frogpond/lists' import {NoticeView, LoadingView} from '@frogpond/notice' -import {TabBarIcon} from '../../../components/tabbar-icon' +import {TabBarIcon} from '@frogpond/navigation-tabs' import {StreamRow} from './row' import toPairs from 'lodash/toPairs' import groupBy from 'lodash/groupBy' diff --git a/source/views/streaming/webcams/list.js b/source/views/streaming/webcams/list.js index 9efe965c26..7344fb5ebf 100644 --- a/source/views/streaming/webcams/list.js +++ b/source/views/streaming/webcams/list.js @@ -4,7 +4,7 @@ import * as React from 'react' import {StyleSheet, ScrollView} from 'react-native' import delay from 'delay' import {reportNetworkProblem} from '../../../lib/report-network-problem' -import {TabBarIcon} from '../../../components/tabbar-icon' +import {TabBarIcon} from '@frogpond/navigation-tabs' import * as defaultData from '../../../../docs/webcams.json' import {Column} from '@frogpond/layout' import {partitionByIndex} from '../../../lib/partition-by-index' diff --git a/source/views/transportation/index.js b/source/views/transportation/index.js index 41f8ec179c..a3ed8cd21f 100644 --- a/source/views/transportation/index.js +++ b/source/views/transportation/index.js @@ -2,8 +2,7 @@ import * as React from 'react' -import {TabNavigator} from '../../components/tabbed-view' -import {TabBarIcon} from '../../components/tabbar-icon' +import {TabNavigator, TabBarIcon} from '@frogpond/navigation-tabs' import {OtherModesView} from './other-modes' import {BusView} from './bus' diff --git a/source/views/transportation/other-modes/list.js b/source/views/transportation/other-modes/list.js index 2bfe2e744a..4cdd6172f0 100644 --- a/source/views/transportation/other-modes/list.js +++ b/source/views/transportation/other-modes/list.js @@ -3,7 +3,7 @@ import * as React from 'react' import delay from 'delay' import {OtherModesRow} from './row' import {reportNetworkProblem} from '../../../lib/report-network-problem' -import {TabBarIcon} from '../../../components/tabbar-icon' +import {TabBarIcon} from '@frogpond/navigation-tabs' import * as defaultData from '../../../../docs/transportation.json' import * as c from '@frogpond/colors' import {SectionList, StyleSheet} from 'react-native'