ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-12-22 04:41:43 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into l10n_development

Browse Source
This commit is contained in:
Feruz M 2021-04-09 07:36:57 +03:00 committed by GitHub
commit a549160217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 67 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle
View File

@ -143,7 +143,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
versionName "3.0.16"
versionName "3.0.17"
resValue "string", "build_config_package", "app.esteem.mobile.android"
multiDexEnabled true
// react-native-image-crop-picker

4
ios/Ecency-tvOS/Info.plist
View File

@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.0.16</string>
<string>3.0.17</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2795</string>
<string>2796</string>
<key>LSRequiresIPhoneOS</key>
<true />
<key>NSAppTransportSecurity</key>

4
ios/Ecency-tvOSTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>3.0.16</string>
<string>3.0.17</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2795</string>
<string>2796</string>
</dict>
</plist>

4
ios/Ecency.xcodeproj/project.pbxproj
View File

@ -1112,7 +1112,7 @@
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2795;
CURRENT_PROJECT_VERSION = 2796;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = 75B6RXTKGT;
HEADER_SEARCH_PATHS = (
@ -1188,7 +1188,7 @@
CODE_SIGN_ENTITLEMENTS = Ecency/Ecency.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2795;
CURRENT_PROJECT_VERSION = 2796;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = 75B6RXTKGT;
HEADER_SEARCH_PATHS = (

2
ios/Ecency/Info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.0.16</string>
<string>3.0.17</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>

4
ios/EcencyTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>3.0.16</string>
<string>3.0.17</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2795</string>
<string>2796</string>
</dict>
</plist>

4
ios/eshare/Info.plist
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>3.0.16</string>
<string>3.0.17</string>
<key>CFBundleVersion</key>
<string>2795</string>
<string>2796</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "ecency",
"version": "3.0.16",
"version": "3.0.17",
"displayName": "Ecency",
"private": true,
"rnpm": {

16
src/components/uploadsGalleryModal/uploadsGalleryModal.tsx
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');

20
src/config/locales/en-US.json
View File

@ -301,7 +301,18 @@
"my_communities": "My Communities",
"top_communities": "Top Communities",
"schedule_modal_title": "Schedule Post",
"snippets": "Snippets"
"snippets": "Snippets",
"alert_init_title":"New Content",
"alert_init_body":"Open recent draft or Create new post",
"alert_btn_draft":"Recent Draft",
"alert_btn_new":"New Post",
"alert_pub_edit_title":"Publishing edits",
"alert_pub_new_title":"Publishing new post",
"alert_pub_body":"Are you sure?",
"alert_btn_yes":"Yes",
"alert_btn_no":"No",
"draft_save_success":"Draft Saved",
"draft_save_fail":"Failed to save draft"
},
"snippets":{
"label_no_snippets":"No Snippets Found",
@ -319,6 +330,13 @@
"btn_confirm":"Confirm",
"btn_cancel":"Cancel"
},
"uploads_modal":{
"label_no_images":"No Images Found",
"title":"Uploaded Images",
"title_remove_confirmation":"Delete image",
"btn_add":"Image",
"message_failed":"Failed to upload image"
},
"pincode": {
"enter_text": "Enter PIN to unlock",
"set_new": "Set new PIN",

3
src/screens/application/container/applicationContainer.js
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) {

27
src/screens/editor/container/editorContainer.js
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);
}
};

4
src/screens/editor/screen/editorScreen.js
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();
}
}