Merge branch '348-password-screen' into 'master'
Removes logo and adds header on the main login screen Closes #348 See merge request bloodyhealth/drip!211
This commit is contained in:
@@ -1,10 +1,11 @@
|
|||||||
import React, { Component } from 'react'
|
import React, { Component } from 'react'
|
||||||
import { View, TextInput, TouchableOpacity, Alert, Image } from 'react-native'
|
import { View, TextInput, TouchableOpacity, Alert } from 'react-native'
|
||||||
import nodejs from 'nodejs-mobile-react-native'
|
import nodejs from 'nodejs-mobile-react-native'
|
||||||
import { saveEncryptionFlag } from '../local-storage'
|
import { saveEncryptionFlag } from '../local-storage'
|
||||||
import AppText from './app-text'
|
import AppText from './app-text'
|
||||||
|
import Header from './header'
|
||||||
import styles from '../styles'
|
import styles from '../styles'
|
||||||
import { passwordPrompt as labels, shared } from '../i18n/en/labels'
|
import { passwordPrompt as labels, shared, menuTitles } from '../i18n/en/labels'
|
||||||
import { requestHash, deleteDbAndOpenNew, openDb } from '../db'
|
import { requestHash, deleteDbAndOpenNew, openDb } from '../db'
|
||||||
|
|
||||||
export default class PasswordPrompt extends Component {
|
export default class PasswordPrompt extends Component {
|
||||||
@@ -87,12 +88,10 @@ export default class PasswordPrompt extends Component {
|
|||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<View flex={1}>
|
<View flex={1}>
|
||||||
|
<Header title={menuTitles.PasswordPrompt.toLowerCase()} />
|
||||||
{this.state.showPasswordPrompt &&
|
{this.state.showPasswordPrompt &&
|
||||||
<View style={styles.passwordPromptPage}>
|
<View style={styles.passwordPromptPage}>
|
||||||
<Image
|
|
||||||
source={require('../assets/drip_small.png')}
|
|
||||||
style={styles.passwordPromptImage}
|
|
||||||
/>
|
|
||||||
<TextInput
|
<TextInput
|
||||||
onChangeText={val => this.setState({ password: val })}
|
onChangeText={val => this.setState({ password: val })}
|
||||||
style={styles.passwordPromptField}
|
style={styles.passwordPromptField}
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ export const menuTitles = {
|
|||||||
Chart: 'Chart',
|
Chart: 'Chart',
|
||||||
Stats: 'Stats',
|
Stats: 'Stats',
|
||||||
Settings: 'Settings',
|
Settings: 'Settings',
|
||||||
|
PasswordPrompt: 'Drip'
|
||||||
}
|
}
|
||||||
|
|
||||||
export const stats = {
|
export const stats = {
|
||||||
|
|||||||
@@ -401,6 +401,8 @@ export default StyleSheet.create({
|
|||||||
},
|
},
|
||||||
passwordPromptPage: {
|
passwordPromptPage: {
|
||||||
padding: 30,
|
padding: 30,
|
||||||
|
flex: 1,
|
||||||
|
justifyContent: 'center',
|
||||||
alignItems: 'center'
|
alignItems: 'center'
|
||||||
},
|
},
|
||||||
passwordPromptField: {
|
passwordPromptField: {
|
||||||
|
|||||||
Reference in New Issue
Block a user