Merge pull request from ecency/nt/editor-tweaks

Nt/editor tweaks
This commit is contained in:
Feruz M 2021-04-07 17:08:56 +03:00 committed by GitHub
commit be1017b7ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 17 deletions
src
components/uploadsGalleryModal
config/locales
screens
application/container
editor

View File

@ -116,7 +116,21 @@ export const UploadsGalleryModal = forwardRef(({username, handleOnSelect, handl
}
const _onRemovePress = async () => {
_deleteMediaItem(item._id)
const _onConfirm = () => {
_deleteMediaItem(item._id)
}
Alert.alert(
intl.formatMessage({id:'alert.delete'}),
intl.formatMessage({id:'alert.remove_alert'}),
[{
text:intl.formatMessage({id:'alert.cancel'}),
style:'cancel'
},{
text:intl.formatMessage({id:'alert.confirm'}),
onPress:_onConfirm
}]
)
}
const thumbUrl = proxifyImageSrc(item.url, 600, 500, Platform.OS === 'ios' ? 'match' : 'webp');

View File

@ -336,8 +336,7 @@
"title":"Uploaded Images",
"title_remove_confirmation":"Delete image",
"btn_add":"Image",
"message_failed":"Failed to upload image",
"message_remove_confirmation":"Are you sure you want to delete this image?"
"message_failed":"Failed to upload image"
},
"pincode": {
"enter_text": "Enter PIN to unlock",

View File

@ -621,7 +621,10 @@ class ApplicationContainer extends Component {
_getSettings = async () => {
const { dispatch } = this.props;
//reset certain properties
dispatch(hideActionModal());
dispatch(toastNotification(''));
const settings = await getSettings();
if (settings) {

View File

@ -594,6 +594,11 @@ class EditorContainer extends Component {
_saveCurrentDraft = async (fields) => {
const { draftId, isReply, isEdit, isPostSending } = this.state;
//skip draft save in case post is sending or is post beign edited
if (isPostSending || isEdit) {
return;
}
const { currentAccount } = this.props;
const username = currentAccount && currentAccount.name ? currentAccount.name : '';
@ -602,20 +607,18 @@ class EditorContainer extends Component {
tags: fields.tags && fields.tags.length > 0 ? fields.tags.toString() : '',
};
if (!isPostSending) {
//save reply data
if (isReply && draftField.body !== null) {
await AsyncStorage.setItem('temp-reply', draftField.body);
//save reply data
if (isReply && draftField.body !== null) {
await AsyncStorage.setItem('temp-reply', draftField.body);
//save existing draft data locally
} else if (draftId) {
setDraftPost(draftField, username, draftId);
}
//save existing draft data locally
} else if (draftId) {
setDraftPost(draftField, username, draftId);
}
//update editor data locally
else if (!isReply) {
setDraftPost(draftField, username);
}
//update editor data locally
else if (!isReply) {
setDraftPost(draftField, username);
}
};

View File

@ -66,8 +66,8 @@ class EditorScreen extends Component {
}
componentWillUnmount() {
const { isReply } = this.props;
if (!isReply) {
const { isReply, isEdit } = this.props;
if (!isReply && !isEdit) {
this._saveDraftToDB();
}
}