mirror of
https://github.com/ecency/ecency-mobile.git
synced 2024-12-22 04:41:43 +03:00
Merge pull request #1329 from esteemapp/new/currency-endpoint
added new api enhanced settings screen
This commit is contained in:
Feruz M
GitHub
commit
d335c0f276
@ -4,10 +4,10 @@ import imageApi from '../../config/imageApi';
|
||||
import serverList from '../../config/serverListApi';
|
||||
import { jsonStringify } from '../../utils/jsonUtils';
|
||||
import bugsnag from '../../config/bugsnag';
|
||||
|
||||
//market-data/currency-rate/USD/estm
|
||||
export const getCurrencyRate = currency =>
|
||||
api
|
||||
.get(`/currencyRate/${currency.toUpperCase()}/steem`)
|
||||
.get(`/market-data/currency-rate/${currency.toUpperCase()}/steem`)
|
||||
.then(resp => resp.data)
|
||||
.catch(err => {
|
||||
console.log('err :', err);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* eslint-disable react/jsx-wrap-multilines */
|
||||
import React, { PureComponent, Fragment } from 'react';
|
||||
import React, { Fragment } from 'react';
|
||||
import { ScrollView, View, RefreshControl } from 'react-native';
|
||||
import { injectIntl } from 'react-intl';
|
||||
|
||||
@ -17,261 +17,244 @@ import { BasicHeader, SettingsItem, CollapsibleCard } from '../../../components'
|
||||
// Styles
|
||||
import styles from './settingsStyles';
|
||||
|
||||
class SettingsScreen extends PureComponent {
|
||||
/* Props
|
||||
* ------------------------------------------------
|
||||
* @prop { type } name - Description....
|
||||
*/
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = {};
|
||||
}
|
||||
const SettingsScreen = ({
|
||||
handleOnChange,
|
||||
intl,
|
||||
isDarkTheme,
|
||||
isPinCodeOpen,
|
||||
isLoggedIn,
|
||||
isNotificationSettingsOpen,
|
||||
nsfw,
|
||||
selectedApi,
|
||||
selectedCurrency,
|
||||
selectedLanguage,
|
||||
serverList,
|
||||
isNotificationMenuOpen,
|
||||
commentNotification,
|
||||
followNotification,
|
||||
mentionNotification,
|
||||
reblogNotification,
|
||||
transfersNotification,
|
||||
voteNotification,
|
||||
handleOnButtonPress,
|
||||
isLoading,
|
||||
}) => {
|
||||
return (
|
||||
<Fragment>
|
||||
<BasicHeader
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.settings',
|
||||
})}
|
||||
/>
|
||||
|
||||
// Component Life Cycles
|
||||
|
||||
// Component Functions
|
||||
// TODO: REFACTOR ME !
|
||||
render() {
|
||||
const {
|
||||
handleOnChange,
|
||||
intl,
|
||||
isDarkTheme,
|
||||
isPinCodeOpen,
|
||||
isLoggedIn,
|
||||
isNotificationSettingsOpen,
|
||||
nsfw,
|
||||
selectedApi,
|
||||
selectedCurrency,
|
||||
selectedLanguage,
|
||||
serverList,
|
||||
isNotificationMenuOpen,
|
||||
commentNotification,
|
||||
followNotification,
|
||||
mentionNotification,
|
||||
reblogNotification,
|
||||
transfersNotification,
|
||||
voteNotification,
|
||||
handleOnButtonPress,
|
||||
isLoading,
|
||||
} = this.props;
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
<BasicHeader
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.settings',
|
||||
})}
|
||||
/>
|
||||
|
||||
<ScrollView
|
||||
style={styles.container}
|
||||
refreshControl={
|
||||
<RefreshControl
|
||||
refreshing={isLoading}
|
||||
progressBackgroundColor="#357CE6"
|
||||
tintColor={!isDarkTheme ? '#357ce6' : '#96c0ff'}
|
||||
titleColor="#fff"
|
||||
colors={['#fff']}
|
||||
/>
|
||||
}
|
||||
>
|
||||
<View style={styles.settingsCard}>
|
||||
<ScrollView
|
||||
style={styles.container}
|
||||
refreshControl={
|
||||
<RefreshControl
|
||||
refreshing={isLoading}
|
||||
progressBackgroundColor="#357CE6"
|
||||
tintColor={!isDarkTheme ? '#357ce6' : '#96c0ff'}
|
||||
titleColor="#fff"
|
||||
colors={['#fff']}
|
||||
/>
|
||||
}
|
||||
>
|
||||
<View style={styles.settingsCard}>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.general',
|
||||
})}
|
||||
titleStyle={styles.cardTitle}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.currency',
|
||||
})}
|
||||
type="dropdown"
|
||||
actionType="currency"
|
||||
options={CURRENCY}
|
||||
selectedOptionIndex={CURRENCY_VALUE.indexOf(selectedCurrency.currency)}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.language',
|
||||
})}
|
||||
type="dropdown"
|
||||
actionType="language"
|
||||
options={LANGUAGE}
|
||||
selectedOptionIndex={LANGUAGE_VALUE.indexOf(selectedLanguage)}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.server',
|
||||
})}
|
||||
type="dropdown"
|
||||
actionType="api"
|
||||
options={serverList.map(serverName => groomingServerName(serverName))}
|
||||
selectedOptionIndex={serverList.indexOf(selectedApi)}
|
||||
defaultText={
|
||||
groomingServerName(selectedApi) ||
|
||||
intl.formatMessage({
|
||||
id: 'alert.checking',
|
||||
})
|
||||
}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.nsfw_content',
|
||||
})}
|
||||
type="dropdown"
|
||||
actionType="nsfw"
|
||||
options={NSFW.map(item =>
|
||||
intl.formatMessage({
|
||||
id: item,
|
||||
}),
|
||||
)}
|
||||
selectedOptionIndex={parseInt(nsfw, 10)}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.dark_theme',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="theme"
|
||||
isOn={isDarkTheme}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
{!!isLoggedIn && (
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.general',
|
||||
})}
|
||||
titleStyle={styles.cardTitle}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.currency',
|
||||
})}
|
||||
type="dropdown"
|
||||
actionType="currency"
|
||||
options={CURRENCY}
|
||||
selectedOptionIndex={CURRENCY_VALUE.indexOf(selectedCurrency.currency)}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.language',
|
||||
})}
|
||||
type="dropdown"
|
||||
actionType="language"
|
||||
options={LANGUAGE}
|
||||
selectedOptionIndex={LANGUAGE_VALUE.indexOf(selectedLanguage)}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.server',
|
||||
})}
|
||||
type="dropdown"
|
||||
actionType="api"
|
||||
options={serverList.map(serverName => groomingServerName(serverName))}
|
||||
selectedOptionIndex={serverList.indexOf(selectedApi)}
|
||||
defaultText={
|
||||
groomingServerName(selectedApi) ||
|
||||
intl.formatMessage({
|
||||
id: 'alert.checking',
|
||||
})
|
||||
}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.nsfw_content',
|
||||
})}
|
||||
type="dropdown"
|
||||
actionType="nsfw"
|
||||
options={NSFW.map(item =>
|
||||
intl.formatMessage({
|
||||
id: item,
|
||||
}),
|
||||
)}
|
||||
selectedOptionIndex={parseInt(nsfw, 10)}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.dark_theme',
|
||||
id: 'settings.pincode',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="theme"
|
||||
isOn={isDarkTheme}
|
||||
actionType="pincode"
|
||||
isOn={isPinCodeOpen}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
{!!isLoggedIn && (
|
||||
)}
|
||||
|
||||
{!!isLoggedIn && !!isPinCodeOpen && (
|
||||
<Fragment>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.pincode',
|
||||
id: 'settings.reset_pin',
|
||||
})}
|
||||
text={intl.formatMessage({
|
||||
id: 'settings.reset',
|
||||
})}
|
||||
type="button"
|
||||
actionType="reset_pin"
|
||||
handleOnButtonPress={handleOnButtonPress}
|
||||
/>
|
||||
</Fragment>
|
||||
// <SettingsItem
|
||||
// title={intl.formatMessage({
|
||||
// id: 'settings.default_footer',
|
||||
// })}
|
||||
// type="toggle"
|
||||
// actionType="default_footer"
|
||||
// isOn={isDefaultFooter}
|
||||
// handleOnChange={handleOnChange}
|
||||
// />
|
||||
)}
|
||||
</View>
|
||||
{!!isLoggedIn && (
|
||||
<View style={styles.settingsCard}>
|
||||
<CollapsibleCard
|
||||
titleComponent={
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.push_notification',
|
||||
})}
|
||||
titleStyle={styles.cardTitle}
|
||||
type="toggle"
|
||||
actionType="notification"
|
||||
isOn={isNotificationSettingsOpen}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
}
|
||||
noBorder
|
||||
fitContent
|
||||
locked
|
||||
isExpanded={isNotificationSettingsOpen}
|
||||
expanded={isNotificationMenuOpen}
|
||||
>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.notification.follow',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="pincode"
|
||||
isOn={isPinCodeOpen}
|
||||
actionType="notification.follow"
|
||||
isOn={followNotification}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
)}
|
||||
|
||||
{!!isLoggedIn && !!isPinCodeOpen && (
|
||||
<Fragment>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.reset_pin',
|
||||
})}
|
||||
text={intl.formatMessage({
|
||||
id: 'settings.reset',
|
||||
})}
|
||||
type="button"
|
||||
actionType="reset_pin"
|
||||
handleOnButtonPress={handleOnButtonPress}
|
||||
/>
|
||||
</Fragment>
|
||||
// <SettingsItem
|
||||
// title={intl.formatMessage({
|
||||
// id: 'settings.default_footer',
|
||||
// })}
|
||||
// type="toggle"
|
||||
// actionType="default_footer"
|
||||
// isOn={isDefaultFooter}
|
||||
// handleOnChange={handleOnChange}
|
||||
// />
|
||||
)}
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.notification.vote',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="notification.vote"
|
||||
isOn={voteNotification}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.notification.comment',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="notification.comment"
|
||||
isOn={commentNotification}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.notification.mention',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="notification.mention"
|
||||
isOn={mentionNotification}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.notification.reblog',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="notification.reblog"
|
||||
isOn={reblogNotification}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.notification.transfers',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="notification.transfers"
|
||||
isOn={transfersNotification}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
</CollapsibleCard>
|
||||
</View>
|
||||
{!!isLoggedIn && (
|
||||
<View style={styles.settingsCard}>
|
||||
<CollapsibleCard
|
||||
titleComponent={
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.push_notification',
|
||||
})}
|
||||
titleStyle={styles.cardTitle}
|
||||
type="toggle"
|
||||
actionType="notification"
|
||||
isOn={isNotificationSettingsOpen}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
}
|
||||
noBorder
|
||||
fitContent
|
||||
locked
|
||||
isExpanded={isNotificationSettingsOpen}
|
||||
expanded={isNotificationMenuOpen}
|
||||
>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.notification.follow',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="notification.follow"
|
||||
isOn={followNotification}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.notification.vote',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="notification.vote"
|
||||
isOn={voteNotification}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.notification.comment',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="notification.comment"
|
||||
isOn={commentNotification}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.notification.mention',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="notification.mention"
|
||||
isOn={mentionNotification}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.notification.reblog',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="notification.reblog"
|
||||
isOn={reblogNotification}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.notification.transfers',
|
||||
})}
|
||||
type="toggle"
|
||||
actionType="notification.transfers"
|
||||
isOn={transfersNotification}
|
||||
handleOnChange={handleOnChange}
|
||||
/>
|
||||
</CollapsibleCard>
|
||||
</View>
|
||||
)}
|
||||
<View style={[styles.settingsCard, styles.paddingBottom]}>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.send_feedback',
|
||||
})}
|
||||
text={intl.formatMessage({
|
||||
id: 'settings.send',
|
||||
})}
|
||||
type="button"
|
||||
actionType="feedback"
|
||||
handleOnButtonPress={handleOnButtonPress}
|
||||
/>
|
||||
</View>
|
||||
</ScrollView>
|
||||
</Fragment>
|
||||
);
|
||||
}
|
||||
}
|
||||
)}
|
||||
<View style={[styles.settingsCard, styles.paddingBottom]}>
|
||||
<SettingsItem
|
||||
title={intl.formatMessage({
|
||||
id: 'settings.send_feedback',
|
||||
})}
|
||||
text={intl.formatMessage({
|
||||
id: 'settings.send',
|
||||
})}
|
||||
type="button"
|
||||
actionType="feedback"
|
||||
handleOnButtonPress={handleOnButtonPress}
|
||||
/>
|
||||
</View>
|
||||
</ScrollView>
|
||||
</Fragment>
|
||||
);
|
||||
};
|
||||
export default injectIntl(SettingsScreen);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user