From 508701f1b2c59ec079d6223dd1ed897dd1f21c93 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Fri, 24 Apr 2020 09:57:03 -0300 Subject: [PATCH] ItemInfo --- app/containers/ItemInfo.js | 32 +++++++++++++++++++++++++++++++ app/views/ScreenLockConfigView.js | 20 ++----------------- app/views/SettingsView/index.js | 13 ++----------- app/views/SettingsView/styles.js | 7 ------- 4 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 app/containers/ItemInfo.js diff --git a/app/containers/ItemInfo.js b/app/containers/ItemInfo.js new file mode 100644 index 000000000..a4e8afeba --- /dev/null +++ b/app/containers/ItemInfo.js @@ -0,0 +1,32 @@ +import React from 'react'; +import { View, Text, StyleSheet } from 'react-native'; +import PropTypes from 'prop-types'; + +import sharedStyles from '../views/Styles'; +import { themes } from '../constants/colors'; + +const styles = StyleSheet.create({ + listPadding: { + paddingVertical: 36 + }, + infoContainer: { + padding: 15 + }, + infoText: { + fontSize: 14, + ...sharedStyles.textRegular + } +}); + +const ItemInfo = React.memo(({ info, theme }) => ( + + {info} + +)); + +ItemInfo.propTypes = { + info: PropTypes.string, + theme: PropTypes.string +}; + +export default ItemInfo; diff --git a/app/views/ScreenLockConfigView.js b/app/views/ScreenLockConfigView.js index de9c9e9bd..13a6c7410 100644 --- a/app/views/ScreenLockConfigView.js +++ b/app/views/ScreenLockConfigView.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { - StyleSheet, View, Switch, ScrollView, Text + StyleSheet, View, Switch, ScrollView } from 'react-native'; import { SafeAreaView } from 'react-navigation'; import { connect } from 'react-redux'; @@ -15,6 +15,7 @@ import sharedStyles from './Styles'; import StatusBar from '../containers/StatusBar'; import Separator from '../containers/Separator'; import ListItem from '../containers/ListItem'; +import ItemInfo from '../containers/ItemInfo'; import { CustomIcon } from '../lib/Icons'; import database from '../lib/database'; import { supportedBiometryLabel } from '../utils/localAuthentication'; @@ -47,26 +48,9 @@ const DEFAULT_AUTO_LOCK = [ const styles = StyleSheet.create({ listPadding: { paddingVertical: 36 - }, - infoContainer: { - padding: 15 - }, - infoText: { - fontSize: 14, - ...sharedStyles.textRegular } }); -const ItemInfo = React.memo(({ info, theme }) => ( - - {info} - -)); -ItemInfo.propTypes = { - info: PropTypes.string, - theme: PropTypes.string -}; - class ScreenLockConfigView extends React.Component { static navigationOptions = ({ screenProps }) => ({ title: I18n.t('Screen_lock'), diff --git a/app/views/SettingsView/index.js b/app/views/SettingsView/index.js index 68f7af722..2fda8de9b 100644 --- a/app/views/SettingsView/index.js +++ b/app/views/SettingsView/index.js @@ -1,6 +1,6 @@ import React from 'react'; import { - View, Linking, ScrollView, Switch, Text, Share, Clipboard + View, Linking, ScrollView, Switch, Share, Clipboard } from 'react-native'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; @@ -14,6 +14,7 @@ import { SWITCH_TRACK_COLOR, themes } from '../../constants/colors'; import { DrawerButton, CloseModalButton } from '../../containers/HeaderButton'; import StatusBar from '../../containers/StatusBar'; import ListItem from '../../containers/ListItem'; +import ItemInfo from '../../containers/ItemInfo'; import { DisclosureImage } from '../../containers/DisclosureIndicator'; import Separator from '../../containers/Separator'; import I18n from '../../i18n'; @@ -54,16 +55,6 @@ SectionSeparator.propTypes = { theme: PropTypes.string }; -const ItemInfo = React.memo(({ info, theme }) => ( - - {info} - -)); -ItemInfo.propTypes = { - info: PropTypes.string, - theme: PropTypes.string -}; - class SettingsView extends React.Component { static navigationOptions = ({ navigation, screenProps }) => ({ ...themedHeader(screenProps.theme), diff --git a/app/views/SettingsView/styles.js b/app/views/SettingsView/styles.js index d1eb323c3..2bf7cdaeb 100644 --- a/app/views/SettingsView/styles.js +++ b/app/views/SettingsView/styles.js @@ -9,12 +9,5 @@ export default StyleSheet.create({ }, listPadding: { paddingVertical: 36 - }, - infoContainer: { - padding: 15 - }, - infoText: { - fontSize: 14, - ...sharedStyles.textRegular } });