bartronx7/aretherecookies-mobile
1
0
Fork 0
mirror of https://gitlab.com/wheres-the-tp/ui-mobile.git synced 2026-01-25 07:54:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitlab.com:wheres-the-tp/ui-mobile

Browse source
This commit is contained in:
Bart Akeley 2020-04-13 22:11:39 -05:00
commit a11150e960
6 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
js/components/TopToolbar.js
View file

@ -80,8 +80,8 @@ class TopToolbar extends Component {
const showSearchClear = filter.search.length > 0; const showSearchClear = filter.search.length > 0;
const searchPlaceholder = cond([ const searchPlaceholder = cond([
[test(/\/food/), () => 'Search Food...'], [test(/\/food/), () => 'Search products...'],
[test(/\/places/), () => 'Search Places...'], [test(/\/places/), () => 'Search places...'],
[test(/\/faves/), () => 'Search favorites'], [test(/\/faves/), () => 'Search favorites'],
])(route); ])(route);
@ -100,7 +100,7 @@ class TopToolbar extends Component {
<View <View
style={{ style={{
flexDirection: 'row', flexDirection: 'row',
padding: 10, padding: 8,
}}> }}>
<View <View
style={{ style={{
@ -110,7 +110,7 @@ class TopToolbar extends Component {
backgroundColor: 'white', backgroundColor: 'white',
borderRadius: 10, borderRadius: 10,
}}> }}>
<Icon name="search" style={{ marginHorizontal: 10 }} /> <Icon name="search" style={{ marginHorizontal: 8 }} />
<TextInput <TextInput
value={filter.search} value={filter.search}
onChangeText={this.onChangeText} onChangeText={this.onChangeText}
@ -118,13 +118,14 @@ class TopToolbar extends Component {
underlineColorAndroid="transparent" underlineColorAndroid="transparent"
style={{ style={{
flex: 1, flex: 1,
fontSize: 18, fontSize: 16,
padding: 5, padding: 4,
height: 40,
}} }}
/> />
{showSearchClear ? ( {showSearchClear ? (
<TouchableOpacity onPress={this.onSearchCleared}> <TouchableOpacity onPress={this.onSearchCleared}>
<Icon name="close" style={{ margin: 10 }} /> <Icon name="close" style={{ margin: 8 }} />
</TouchableOpacity> </TouchableOpacity>
) : ( ) : (
<TouchableOpacity <TouchableOpacity
@ -136,7 +137,7 @@ class TopToolbar extends Component {
paddingVertical: 5, paddingVertical: 5,
paddingHorizontal: 8, paddingHorizontal: 8,
}}> }}>
<FAIcon name="filter" style={{ fontSize: 22, color: palette.primaryColor }} /> <FAIcon name="filter" style={{ fontSize: 24, color: palette.primaryColor }} />
</TouchableOpacity> </TouchableOpacity>
)} )}
</View> </View>
@ -150,7 +151,7 @@ class TopToolbar extends Component {
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',
}}> }}>
<Icon name={viewMode === 'map' ? 'view-list' : 'map'} size={22} color="white" /> <Icon name={viewMode === 'map' ? 'view-list' : 'map'} size={24} color="white" />
</TouchableOpacity> </TouchableOpacity>
</View> </View>
)} )}

2
js/pages/FoodList.js
View file

@ -30,7 +30,7 @@ const FoodList = (props: Props) => {
<View style={{ flex: 1 }}> <View style={{ flex: 1 }}>
{showNoResults && ( {showNoResults && (
<FullScreenMessage> <FullScreenMessage>
<Text style={{ fontSize: 16 }}>No food matched your search.</Text> <Text style={{ fontSize: 16 }}>No products matched your search.</Text>
<Text style={{ fontSize: 16 }}>Check your filters and try again</Text> <Text style={{ fontSize: 16 }}>Check your filters and try again</Text>
</FullScreenMessage> </FullScreenMessage>
)} )}

3
js/pages/LoginPage.js
View file

@ -75,6 +75,7 @@ const LoginPageComponent = ({
flexDirection: 'column', flexDirection: 'column',
alignItems: 'center', alignItems: 'center',
justifyContent: 'flex-start', justifyContent: 'flex-start',
backgroundColor: '#fff',
}}> }}>
{error && ( {error && (
<Text style={{ fontSize: 16, color: '#721c24', backgroundColor: '#f8d7da', padding: 16 }}> <Text style={{ fontSize: 16, color: '#721c24', backgroundColor: '#f8d7da', padding: 16 }}>
@ -82,7 +83,7 @@ const LoginPageComponent = ({
</Text> </Text>
)} )}
<Text style={{ fontSize: 42, fontWeight: '300', margin: 16 }}>Sign In</Text> <Text style={{ fontSize: 36, fontWeight: '700', marginTop: 32, marginBottom: 16 }}>Sign In</Text>
<View style={{ flexDirection: 'row', padding: 16, paddingBottom: 0 }}> <View style={{ flexDirection: 'row', padding: 16, paddingBottom: 0 }}>
<View style={{ flex: 1, flexDirection: 'column' }}> <View style={{ flex: 1, flexDirection: 'column' }}>

6
js/pages/Nav.js
View file

@ -36,8 +36,8 @@ const Nav = (props: Props) => {
<BottomNavigation active={activeTab}> <BottomNavigation active={activeTab}>
<BottomNavigation.Action <BottomNavigation.Action
key="food" key="food"
icon="local-pizza" icon="widgets"
label="Food" label="Products"
onPress={setRoute('/list/food')} onPress={setRoute('/list/food')}
style={{ style={{
container: { container: {
@ -47,7 +47,7 @@ const Nav = (props: Props) => {
/> />
{/* <BottomNavigation.Action {/* <BottomNavigation.Action
key="places" key="places"
icon="restaurant" icon="store"
label="Places" label="Places"
onPress={setRoute('/list/places')} onPress={setRoute('/list/places')}
style={{ style={{

2
js/pages/ProfilePage.js
View file

@ -44,7 +44,7 @@ export const ProfilePage = (props: Props) => {
const usingGPS = zipcode === 'usegps'; const usingGPS = zipcode === 'usegps';
return ( return (
<View style={{ flex: 1, flexDirection: 'column' }}> <View style={{ flex: 1, flexDirection: 'column' }}>
<Text style={{ fontSize: 42, marginBottom: 8, color: '#000', padding: 16 }}>Profile</Text> <Text style={{ fontSize: 36, fontWeight: '700', marginBottom: 8, color: '#000', padding: 16 }}>Profile</Text>
<View <View
style={{ style={{
flexDirection: 'row', flexDirection: 'row',

3
js/ui-theme.js
View file

@ -115,8 +115,9 @@ export default {
margin: 10, margin: 10,
}, },
titleStyle: { titleStyle: {
fontSize: 64, fontSize: 56,
margin: 10, margin: 10,
fontWeight: 'bold',
}, },
}, },
drawer: { drawer: {