From 6808f40953e7e77ceab13fca511dc62726d14437 Mon Sep 17 00:00:00 2001 From: Sofiya Tepikin Date: Tue, 23 Aug 2022 13:00:25 +0200 Subject: [PATCH] Prettify settings files --- components/settings/common/alert-error.js | 2 +- components/settings/common/password-field.js | 8 ++------ components/settings/common/settings-button.js | 20 ++++++++++--------- .../settings/data-management/constants.js | 2 +- components/settings/license.js | 4 ++-- .../settings/nfp-settings/slider-label.js | 18 ++++++++--------- components/settings/settings-menu.js | 17 ++++++++-------- 7 files changed, 34 insertions(+), 37 deletions(-) diff --git a/components/settings/common/alert-error.js b/components/settings/common/alert-error.js index 6d08d91..ce8e51e 100644 --- a/components/settings/common/alert-error.js +++ b/components/settings/common/alert-error.js @@ -3,4 +3,4 @@ import { shared as sharedLabels } from '../../../i18n/en/labels' export default function alertError(msg) { Alert.alert(sharedLabels.errorTitle, msg) -} \ No newline at end of file +} diff --git a/components/settings/common/password-field.js b/components/settings/common/password-field.js index d22fdd1..0429342 100644 --- a/components/settings/common/password-field.js +++ b/components/settings/common/password-field.js @@ -6,11 +6,7 @@ import styles from '../../../styles' export default function PasswordField(props) { return ( - + ) } @@ -18,5 +14,5 @@ PasswordField.propTypes = { placeholder: PropTypes.string, value: PropTypes.string, onChangeText: PropTypes.func, - autoFocus: PropTypes.bool + autoFocus: PropTypes.bool, } diff --git a/components/settings/common/settings-button.js b/components/settings/common/settings-button.js index 93af5f2..941c088 100644 --- a/components/settings/common/settings-button.js +++ b/components/settings/common/settings-button.js @@ -12,15 +12,17 @@ const SettingsButton = ({ children, style, secondary, ...props }) => { styles.settingsButton, secondary ? null : styles.settingsButtonAccent, props.disabled ? styles.settingsButtonDisabled : null, - style + style, ]} - { ...props } + {...props} > - + {children} @@ -32,7 +34,7 @@ SettingsButton.propTypes = { disabled: PropTypes.bool, onPress: PropTypes.func.isRequired, secondary: PropTypes.bool, - style: PropTypes.object + style: PropTypes.object, } -export default SettingsButton \ No newline at end of file +export default SettingsButton diff --git a/components/settings/data-management/constants.js b/components/settings/data-management/constants.js index 45956ed..0f86dbe 100644 --- a/components/settings/data-management/constants.js +++ b/components/settings/data-management/constants.js @@ -1 +1 @@ -export const EXPORT_FILE_NAME = 'drip-data.csv' \ No newline at end of file +export const EXPORT_FILE_NAME = 'drip-data.csv' diff --git a/components/settings/license.js b/components/settings/license.js index f3ead7f..c01b5f9 100644 --- a/components/settings/license.js +++ b/components/settings/license.js @@ -10,9 +10,9 @@ const License = () => { const currentYear = new Date().getFullYear() return ( - + - {t("settings.license.text", { currentYear })} + {t('settings.license.text', { currentYear })} ) diff --git a/components/settings/nfp-settings/slider-label.js b/components/settings/nfp-settings/slider-label.js index 4fbda08..7da99d0 100644 --- a/components/settings/nfp-settings/slider-label.js +++ b/components/settings/nfp-settings/slider-label.js @@ -17,14 +17,14 @@ const SliderLabel = ({ oneMarkerValue, twoMarkerValue, oneMarkerLeftPosition, - twoMarkerLeftPosition + twoMarkerLeftPosition, }) => { const minCoordinate = getMarkerCoordinate(oneMarkerLeftPosition) const maxCoordinate = getMarkerCoordinate(twoMarkerLeftPosition) - const isMinNumber = Number.isFinite(oneMarkerLeftPosition) && - Number.isFinite(oneMarkerValue) - const isMaxNumber = Number.isFinite(twoMarkerLeftPosition) && - Number.isFinite(twoMarkerValue) + const isMinNumber = + Number.isFinite(oneMarkerLeftPosition) && Number.isFinite(oneMarkerValue) + const isMaxNumber = + Number.isFinite(twoMarkerLeftPosition) && Number.isFinite(twoMarkerValue) const minStyle = [styles.label, { left: minCoordinate }] const maxStyle = [styles.label, { left: maxCoordinate }] @@ -40,15 +40,15 @@ SliderLabel.propTypes = { oneMarkerValue: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), twoMarkerValue: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), oneMarkerLeftPosition: PropTypes.number, - twoMarkerLeftPosition: PropTypes.number + twoMarkerLeftPosition: PropTypes.number, } const styles = StyleSheet.create({ label: { fontFamily: Fonts.bold, position: 'absolute', - marginTop: (-1) * Sizes.base - } + marginTop: -1 * Sizes.base, + }, }) -export default SliderLabel \ No newline at end of file +export default SliderLabel diff --git a/components/settings/settings-menu.js b/components/settings/settings-menu.js index 4436c15..7ff4155 100644 --- a/components/settings/settings-menu.js +++ b/components/settings/settings-menu.js @@ -7,23 +7,22 @@ import settingsLabels from '../../i18n/en/settings' const { menuItems } = settingsLabels const menu = [ - { ...menuItems.reminders, component: 'Reminders'}, - { ...menuItems.nfpSettings, component: 'NfpSettings'}, - { ...menuItems.dataManagement, component: 'DataManagement'}, - { ...menuItems.password, component: 'Password'} + { ...menuItems.reminders, component: 'Reminders' }, + { ...menuItems.nfpSettings, component: 'NfpSettings' }, + { ...menuItems.dataManagement, component: 'DataManagement' }, + { ...menuItems.password, component: 'Password' }, ] const SettingsMenu = () => { return ( {menu.map((menuItem, i) => { - const last = (menu.length === i + 1) + const last = menu.length === i + 1 - return - } - )} + return + })} ) } -export default SettingsMenu \ No newline at end of file +export default SettingsMenu