Skip to content

Commit d7e3035

Browse files
committed
first paint
1 parent 91af4a6 commit d7e3035

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "Now UI React Native",
44
"slug": "now-ui-react-native",
55
"privacy": "public",
6-
"sdkVersion": "35.0.0",
6+
"sdkVersion": "36.0.0",
77
"platforms": ["ios", "android"],
88
"version": "1.1.0",
99
"orientation": "portrait",

components/Card.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { withNavigation } from 'react-navigation';
2+
import { withNavigation } from '@react-navigation/compat';
33
import PropTypes from 'prop-types';
44
import { StyleSheet, Image, TouchableWithoutFeedback } from 'react-native';
55
import { Block, Text, theme } from 'galio-framework';

components/Header.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { withNavigation } from 'react-navigation';
2+
import { withNavigation } from '@react-navigation/compat';
33
import { TouchableOpacity, StyleSheet, Platform, Dimensions } from 'react-native';
44
import { Button, Block, NavBar, Text, theme, Button as GaButton } from 'galio-framework';
55

@@ -47,7 +47,7 @@ class Header extends React.Component {
4747
};
4848
renderRight = () => {
4949
const { white, title, navigation } = this.props;
50-
const { routeName } = navigation.state;
50+
5151

5252
if (title === 'Title') {
5353
return [
@@ -56,7 +56,7 @@ class Header extends React.Component {
5656
];
5757
}
5858

59-
switch (routeName) {
59+
switch (title) {
6060
case 'Home':
6161
return [
6262
<BellButton key="chat-home" navigation={navigation} isWhite={white} />,
@@ -201,8 +201,8 @@ class Header extends React.Component {
201201
navigation,
202202
...props
203203
} = this.props;
204-
const { routeName } = navigation.state;
205-
const noShadow = ['Search', 'Categories', 'Deals', 'Pro', 'Profile'].includes(routeName);
204+
205+
const noShadow = ['Search', 'Categories', 'Deals', 'Pro', 'Profile'].includes(title);
206206
const headerStyles = [
207207
!noShadow ? styles.shadow : null,
208208
transparent ? { backgroundColor: 'rgba(0,0,0,0)' } : null
@@ -213,6 +213,7 @@ class Header extends React.Component {
213213
return (
214214
<Block style={headerStyles}>
215215
<NavBar
216+
back={false}
216217
title={title}
217218
style={navbarStyles}
218219
transparent={transparent}
@@ -224,7 +225,7 @@ class Header extends React.Component {
224225
family="NowExtra"
225226
size={16}
226227
onPress={this.handleLeftPress}
227-
color={iconColor || nowTheme.COLORS.ICON}
228+
color={iconColor || (white ? nowTheme.COLORS.WHITE : nowTheme.COLORS.ICON)}
228229
/>
229230
}
230231
leftStyle={{ paddingVertical: 12, flex: 0.2 }}

navigation/Screens.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import SettingsScreen from '../screens/Settings';
1717
import CustomDrawerContent from "./Menu";
1818
// header for screens
1919
import { Header, Icon} from '../components';
20-
import { argonTheme, tabs } from "../constants";
20+
import { nowTheme, tabs } from "../constants";
2121

2222
const { width } = Dimensions.get("screen");
2323

screens/Onboarding.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export default class Onboarding extends React.Component {
8383
shadowless
8484
style={styles.button}
8585
color={nowTheme.COLORS.PRIMARY}
86-
onPress={() => navigation.navigate('Home')}
86+
onPress={() => navigation.navigate('App')}
8787
>
8888
<Text
8989
style={{ fontFamily: 'montserrat-bold', fontSize: 14 }}

0 commit comments

Comments
 (0)