Compare commits

..
6 Commits
Author SHA1 Message Date
Akinwale Ariwodola 79a8862573 fix merge conflict 2020-03-13 17:04:52 +01:00
Akinwale Ariwodola 1a638e88e4 update setting text 2020-03-13 17:02:53 +01:00
YULIUS KURNIAWAN KRISTIANTO 08c6cf1b7f added more languages support (#128)
12 new languages
* Danish
* Basa Jawa
* Ukrainian
* Hindi
* Dutch
* French
* Estonian
* Marathi
* Russian
* Romanian
* Slovak
* Ukrainian
2020-03-10 22:09:06 +01:00
Akinwale Ariwodola 195d155c70 Fast lite mode (#129)
* added lite file page
* update splash logic
* updates to navigation handling for lite mode
* update packages
* show firebase token on About page
* handle additional params for notifiication cold start
* handle opening urls in lite mode
2020-03-10 22:08:17 +01:00
Akinwale Ariwodola 9bad912cc9 Merge remote-tracking branch 'origin/master' into dht 2020-03-06 12:44:23 +01:00
Akinwale Ariwodola 21749453df dht setting 2020-02-10 11:58:51 +01:00
7 changed files with 37 additions and 14 deletions

No files matched your search

+1 -1
Submodule android updated: b7b6c05bd3...ea8ac783a8.
-2
View File
@@ -312,8 +312,6 @@ class AppWithNavigationState extends React.Component {
'hardwareBackPress',
function() {
const { dispatch, nav, drawerStack } = this.props;
console.log(nav);
if (drawerStack.length > 1) {
dispatchNavigateBack(dispatch, nav, drawerStack);
return true;
+1
View File
@@ -44,6 +44,7 @@ const Constants = {
SETTING_BACKUP_DISMISSED: 'backupDismissed',
SETTING_REWARDS_NOT_INTERESTED: 'rewardsNotInterested',
SETTING_DEVICE_WALLET_SYNCED: 'deviceWalletSynced',
SETTING_DHT_ENABLED: 'dhtEnabled',
ACTION_DELETE_COMPLETED_BLOBS: 'DELETE_COMPLETED_BLOBS',
ACTION_FIRST_RUN_PAGE_CHANGED: 'FIRST_RUN_PAGE_CHANGED',
-1
View File
@@ -58,7 +58,6 @@ window.__ = __;
const globalExceptionHandler = (error, isFatal) => {
if (error && NativeModules.Firebase) {
console.log(error);
NativeModules.Firebase.logException(!!isFatal, error.message ? error.message : 'No message', JSON.stringify(error));
}
};
+1 -4
View File
@@ -25,7 +25,4 @@ const perform = dispatch => ({
toggleFullscreenMode: mode => dispatch(doToggleFullscreenMode(mode)),
});
export default connect(
select,
perform,
)(LiteFilePage);
export default connect(select, perform)(LiteFilePage);
+2 -4
View File
@@ -11,6 +11,7 @@ const select = state => ({
backgroundPlayEnabled: makeSelectClientSetting(SETTINGS.BACKGROUND_PLAY_ENABLED)(state),
currentRoute: selectCurrentRoute(state),
drawerStack: selectDrawerStack(state),
enableDht: makeSelectClientSetting(Constants.SETTING_DHT_ENABLED)(state),
keepDaemonRunning: makeSelectClientSetting(SETTINGS.KEEP_DAEMON_RUNNING)(state),
language: makeSelectClientSetting(SETTINGS.LANGUAGE)(state),
showNsfw: makeSelectClientSetting(SETTINGS.SHOW_NSFW)(state),
@@ -29,7 +30,4 @@ const perform = dispatch => ({
setPlayerVisible: () => dispatch(doSetPlayerVisible(false)),
});
export default connect(
select,
perform
)(SettingsPage);
export default connect(select, perform)(SettingsPage);
+32 -2
View File
@@ -11,16 +11,27 @@ import settingsStyle from 'styles/settings';
const languageOptions = [
{ code: 'default', name: 'Use device language' },
{ code: 'jv', name: 'Basa Jawa' },
{ code: 'da', name: 'Danish' },
{ code: 'nl', name: 'Dutch' },
{ code: 'en', name: 'English' },
{ code: 'et', name: 'Estonian' },
{ code: 'fr', name: 'French' },
{ code: 'gu', name: 'Gujarati' },
{ code: 'hi', name: 'Hindi' },
{ code: 'id', name: 'Indonesian' },
{ code: 'it', name: 'Italian' },
{ code: 'kn', name: 'Kannada' },
{ code: 'ms', name: 'Malay' },
{ code: 'tr', name: 'Turkish' },
{ code: 'mr', name: 'Marathi' },
{ code: 'pl', name: 'Polish' },
{ code: 'pt', name: 'Portuguese' },
{ code: 'ro', name: 'Romanian' },
{ code: 'ru', name: 'Russian' },
{ code: 'sk', name: 'Slovak' },
{ code: 'es', name: 'Spanish' },
{ code: 'tr', name: 'Turkish' },
{ code: 'uk', name: 'Ukrainian' },
];
class SettingsPage extends React.PureComponent {
@@ -140,6 +151,7 @@ class SettingsPage extends React.PureComponent {
render() {
const {
backgroundPlayEnabled,
enableDht,
keepDaemonRunning,
receiveSubscriptionNotifications,
receiveRewardNotifications,
@@ -157,6 +169,7 @@ class SettingsPage extends React.PureComponent {
const actualReceiveRewardNotifications = this.getBooleanSetting(receiveRewardNotifications, true);
const actualReceiveInterestsNotifications = this.getBooleanSetting(receiveInterestsNotifications, true);
const actualReceiveCreatorNotifications = this.getBooleanSetting(receiveCreatorNotifications, true);
const actualEnableDht = this.getBooleanSetting(enableDht, false);
return (
<View style={settingsStyle.container}>
@@ -294,7 +307,7 @@ class SettingsPage extends React.PureComponent {
</Text>
<Text style={settingsStyle.description}>
{__(
'Enable this option for quicker app launch and to keep the synchronisation with the blockchain up to date.'
'Enable this option for quicker app launch and to keep the synchronisation with the blockchain up to date.',
)}
</Text>
</View>
@@ -310,6 +323,23 @@ class SettingsPage extends React.PureComponent {
/>
</View>
</View>
<View style={settingsStyle.row}>
<View style={settingsStyle.switchText}>
<Text style={settingsStyle.label}>{__('Participate in the data network')}</Text>
<Text style={settingsStyle.description}>
{__('Enable DHT (this will take effect upon app and background service restart)')}
</Text>
</View>
<View style={settingsStyle.switchContainer}>
<Switch
value={actualEnableDht}
onValueChange={value => {
this.setNativeBooleanSetting(Constants.SETTING_DHT_ENABLED, value);
}}
/>
</View>
</View>
</ScrollView>
</View>
);