Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tbaut remove tab navigation #226

Merged
merged 6 commits into from
Feb 25, 2019
Merged

Tbaut remove tab navigation #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2aab69e
fix(): remove tabs
Tbaut Feb 23, 2019
c4dafbc
fix(): remove account details overview in signed transactions
Tbaut Feb 23, 2019
467ab12
fix(): Get back to account list after signing a tx
Tbaut Feb 23, 2019
3db0635
fix(): remove account details overview in signed transactions bis
Tbaut Feb 23, 2019
5e99f69
fix(): prevent navigating back to pin
Tbaut Feb 23, 2019
3870d63
fix(): remove new line and comments
Tbaut Feb 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15,856 changes: 15,856 additions & 0 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"start": "yarn run ios",
"test": "jest",
"lint": "",
"commit": ""
"commit": "commit-wizard"
},
"dependencies": {
"@babel/runtime": "^7.3.1",
Expand Down Expand Up @@ -62,5 +62,18 @@
"setupFiles": [
"<rootDir>/jest-setup.js"
]
},
"release": {
"analyzeCommits": "simple-commit-message"
},
"config": {
"pre-git": {
"commit-msg": "simple",
"pre-commit": [],
"pre-push": [],
"post-commit": [],
"post-checkout": [],
"post-merge": []
}
}
}
136 changes: 36 additions & 100 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import React, { Component } from 'react';
import { StatusBar } from 'react-native';
import {
createBottomTabNavigator,
createStackNavigator,
HeaderBackButton,
withNavigation
Expand All @@ -31,7 +30,6 @@ import colors from './colors';
import Background from './components/Background';
import HeaderLeftHome from './components/HeaderLeftHome';
import SecurityHeader from './components/SecurityHeader';
import TabBarBottom from './components/TabBarBottom';
import About from './screens/About';
import AccountAdd from './screens/AccountAdd';
import AccountBackup from './screens/AccountBackup';
Expand Down Expand Up @@ -152,6 +150,12 @@ const Screens = createStackNavigator(
Welcome: {
screen: createStackNavigator(
{
AccountList: {
screen: AccountList,
navigationOptions: {
headerLeft: <HeaderLeftHome />
}
},
AccountAdd: {
screen: AccountAdd,
navigationOptions: {
Expand All @@ -172,6 +176,36 @@ const Screens = createStackNavigator(
},
AccountPin: {
screen: AccountPin
},
QrScanner: {
screen: QrScanner,
},
TxDetails: {
screen: TxDetails
},
AccountUnlockAndSign: {
screen: AccountUnlockAndSign
},
SignedTx: {
screen: SignedTx
},
SignedMessage: {
screen: SignedMessage
},
MessageDetails: {
screen: MessageDetails
},
About: {
screen: About
},
AccountDetails: {
screen: AccountDetails
},
AccountUnlock: {
screen: AccountUnlock
},
AccountEdit: {
screen: AccountEdit
}
},
{
Expand All @@ -182,107 +216,9 @@ const Screens = createStackNavigator(
}
)
},
Tabs: {
screen: createBottomTabNavigator(
{
Scanner: {
screen: createStackNavigator(
{
QrScanner: {
screen: QrScanner,
navigationOptions: {
headerLeft: <HeaderLeftHome />
}
},
TxDetails: {
screen: TxDetails
},
AccountUnlockAndSign: {
screen: AccountUnlockAndSign
},
SignedTx: {
screen: SignedTx
},
SignedMessage: {
screen: SignedMessage
},
MessageDetails: {
screen: MessageDetails
}
},
{
navigationOptions: globalStackNavigationOptions
}
)
},
Accounts: {
screen: createStackNavigator(
{
AccountList: {
screen: AccountList,
navigationOptions: {
headerLeft: <HeaderLeftHome />
}
},
AccountNew: {
screen: AccountNew
},
AccountAdd: {
screen: AccountAdd
},
About: {
screen: About
},
AccountNetworkChooser: {
screen: AccountNetworkChooser
},
AccountRecover: {
screen: AccountRecover
},
AccountBackup: {
screen: AccountBackup
},
AccountPin: {
screen: AccountPin
},
AccountDetails: {
screen: AccountDetails
},
AccountUnlock: {
screen: AccountUnlock
},
AccountEdit: {
screen: AccountEdit
}
},
{
mode: 'card',
// cardStyle: { backgroundColor: 'transparent' },
// transitionConfig: () => ({
// containerStyle: {
// backgroundColor: 'transparent'
// }
// }),
navigationOptions: globalStackNavigationOptions
}
)
}
},
{
tabBarComponent: props => <TabBarBottom {...props} />,
tabBarPosition: 'bottom'
}
)
}
},
{
headerMode: 'none',
mode: 'card'
// transitionConfig: (): Object => ({
// containerStyle: {
// backgroundColor: 'transparent'
// }
// }),
// cardStyle: { backgroundColor: 'transparent' }
}
);
136 changes: 0 additions & 136 deletions src/components/TabBarBottom.js
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions src/screens/AccountList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,12 @@ class AccountListView extends React.PureComponent {
<Button
buttonStyles={{ height: 60 }}
title="Add Account"
onPress={() => {
this.props.navigation.navigate('AccountAdd');
}}
onPress={() => this.props.navigation.navigate('AccountAdd')}
/>
<Button
buttonStyles={{ height: 60, marginTop: 20 }}
title="Scan"
onPress={() => this.props.navigation.navigate('QrScanner')}
/>
</View>
</View>
Expand All @@ -147,7 +150,6 @@ const styles = StyleSheet.create({
},
bottom: {
marginTop: 20,
flexBasis: 60
},
introContainer: {
padding: 30,
Expand Down
Loading