Merge pull request #1911 from ecency/development

3.0.17
ecency · Apr 9, 2021 · a25d55f · a25d55f
2 parents b014d94 + fafa473
commit a25d55f
Show file tree

Hide file tree

Showing 93 changed files with 1,663 additions and 159 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -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

diff --git a/ios/Ecency-tvOS/Info.plist b/ios/Ecency-tvOS/Info.plist
@@ -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>

diff --git a/ios/Ecency-tvOSTests/Info.plist b/ios/Ecency-tvOSTests/Info.plist
@@ -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>
diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj
@@ -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 = (

diff --git a/ios/Ecency/Info.plist b/ios/Ecency/Info.plist
@@ -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>

diff --git a/ios/EcencyTests/Info.plist b/ios/EcencyTests/Info.plist
@@ -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>
diff --git a/ios/eshare/Info.plist b/ios/eshare/Info.plist
@@ -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>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ecency",
-  "version": "3.0.16",
+  "version": "3.0.17",
   "displayName": "Ecency",
   "private": true,
   "rnpm": {

diff --git a/src/components/editorElements/selectCommunityArea/view/selectCommunityAreaView.js b/src/components/editorElements/selectCommunityArea/view/selectCommunityAreaView.js
@@ -7,26 +7,33 @@ import { Icon } from '../../../icon';
 import globalStyles from '../../../../globalStyles';
 
 import styles from './selectCommunityAreStyles';
-import { Separator } from '../../../basicUIElements';
 
 const SelectCommunityAreaView = ({
-  community,
-  mode,
-  currentAccount,
+  selectedCommunity,
+  selectedAccount,
   onPressIn,
   onPressOut,
   intl,
 }) => {
+  let username = null;
+  let title = intl.formatMessage({ id: 'editor.select_community' });
+
+  if (selectedCommunity) {
+    username = selectedCommunity.name;
+    title = selectedCommunity.title;
+  } else if (selectedAccount) {
+    username = selectedAccount.name;
+    title = intl.formatMessage({ id: 'editor.my_blog' });
+  }
+
   return (
     <TouchableOpacity
       style={[globalStyles.containerHorizontal16, styles.selectCommunityAreaViewContainer]}
       onPressIn={onPressIn}
       onPressOut={onPressOut}
     >
-      <UserAvatar username={mode === 'community' ? community.name : currentAccount.name} noAction />
-      <Text style={[globalStyles.text, styles.chooseACommunityText]}>
-        {mode === 'community' ? community.title : intl.formatMessage({ id: 'editor.my_blog' })}
-      </Text>
+      <UserAvatar username={username} noAction />
+      <Text style={[globalStyles.text, styles.chooseACommunityText]}>{title}</Text>
       <Icon
         size={24}
         iconStyle={styles.leftIcon}

diff --git a/src/components/editorElements/tagInput/view/tagInputView.js b/src/components/editorElements/tagInput/view/tagInputView.js
@@ -14,7 +14,6 @@ import { isCommunity } from '../../../../utils/communityValidation';
 
 const TagInput = ({
   value,
-  onChange,
   componentID,
   handleTagChanged,
   intl,
@@ -38,6 +37,7 @@ const TagInput = ({
     setText(_text.replace(/,/g, ' ').replace(/#/g, ''));
 
     let cats = _text.split(' ');
+
     if (handleTagChanged && cats.length > 0) {
       cats.length > 10
         ? setWarning(intl.formatMessage({ id: 'editor.limited_tags' }))
@@ -66,33 +66,32 @@ const TagInput = ({
       }
     }
   };
-  const _handleOnBlur = () => {
+
+  const _handleOnEnd = () => {
     let cats = [];
-    if (onChange) {
-      cats = text.trim().split(' ');
-      if (handleTagChanged && cats.length > 0) {
-        cats.length > 10
-          ? setWarning(intl.formatMessage({ id: 'editor.limited_tags' }))
-          : cats.find((c) => c.length > 24)
-          ? setWarning(intl.formatMessage({ id: 'editor.limited_length' }))
-          : cats.find((c) => c.split('-').length > 2)
-          ? setWarning(intl.formatMessage({ id: 'editor.limited_dash' }))
-          : cats.find((c) => c.indexOf(',') >= 0)
-          ? setWarning(intl.formatMessage({ id: 'editor.limited_space' }))
-          : cats.find((c) => /[A-Z]/.test(c))
-          ? setWarning(intl.formatMessage({ id: 'editor.limited_lowercase' }))
-          : cats.find((c) => !/^[a-z0-9-#]+$/.test(c))
-          ? setWarning(intl.formatMessage({ id: 'editor.limited_characters' }))
-          : cats.find((c) => !/^[a-z-#]/.test(c))
-          ? setWarning(intl.formatMessage({ id: 'editor.limited_firstchar' }))
-          : cats.find((c) => !/[a-z0-9]$/.test(c))
-          ? setWarning(intl.formatMessage({ id: 'editor.limited_lastchar' }))
-          : setWarning(null);
-        handleTagChanged([...cats]);
-      }
-      onChange(text);
+    cats = text.trim().split(' ');
+    if (handleTagChanged && cats.length > 0) {
+      cats.length > 10
+        ? setWarning(intl.formatMessage({ id: 'editor.limited_tags' }))
+        : cats.find((c) => c.length > 24)
+        ? setWarning(intl.formatMessage({ id: 'editor.limited_length' }))
+        : cats.find((c) => c.split('-').length > 2)
+        ? setWarning(intl.formatMessage({ id: 'editor.limited_dash' }))
+        : cats.find((c) => c.indexOf(',') >= 0)
+        ? setWarning(intl.formatMessage({ id: 'editor.limited_space' }))
+        : cats.find((c) => /[A-Z]/.test(c))
+        ? setWarning(intl.formatMessage({ id: 'editor.limited_lowercase' }))
+        : cats.find((c) => !/^[a-z0-9-#]+$/.test(c))
+        ? setWarning(intl.formatMessage({ id: 'editor.limited_characters' }))
+        : cats.find((c) => !/^[a-z-#]/.test(c))
+        ? setWarning(intl.formatMessage({ id: 'editor.limited_firstchar' }))
+        : cats.find((c) => !/[a-z0-9]$/.test(c))
+        ? setWarning(intl.formatMessage({ id: 'editor.limited_lastchar' }))
+        : setWarning(null);
+      handleTagChanged([...cats]);
     }
   };
+
   return (
     <View style={[globalStyles.containerHorizontal16, styles.container]}>
       <ThemeContainer>
@@ -111,8 +110,8 @@ const TagInput = ({
             autoCorrect={false}
             autoFocus={autoFocus}
             autoCapitalize="none"
-            onChangeText={(textT) => _handleOnChange(textT)}
-            onBlur={() => _handleOnBlur()}
+            onChangeText={_handleOnChange}
+            onEndEditing={_handleOnEnd}
             value={text}
           />
         )}

diff --git a/src/components/markdownEditor/view/markdownEditorStyles.js b/src/components/markdownEditor/view/markdownEditorStyles.js
@@ -51,6 +51,10 @@ export default EStyleSheet.create({
   icon: {
     color: '$editorButtonColor',
   },
+  iconArrow: {
+    marginLeft: 4,
+    color: '$iconColor',
+  },
   clearButtonWrapper: {
     justifyContent: 'center',
     alignItems: 'center',
@@ -80,6 +84,7 @@ export default EStyleSheet.create({
     marginLeft: 2,
   },
   name: {
+    marginLeft: 4,
     color: '$primaryDarkGray',
   },
   modalStyle: {

diff --git a/src/components/markdownEditor/view/markdownEditorView.js b/src/components/markdownEditor/view/markdownEditorView.js
@@ -11,6 +11,7 @@ import {
 import ActionSheet from 'react-native-actionsheet';
 import { renderPostBody } from '@ecency/render-helper';
 import { useDispatch, useSelector } from 'react-redux';
+import { Icon } from '../../icon';
 
 // Utils
 import Formats from './formats/formats';
@@ -345,6 +346,13 @@ const MarkdownEditorView = ({
                 <View style={styles.nameContainer}>
                   <Text style={styles.name}>{`@${currentAccount.username}`}</Text>
                 </View>
+                <Icon
+                  size={24}
+                  iconStyle={styles.leftIcon}
+                  style={styles.iconArrow}
+                  name="arrow-drop-down"
+                  iconType="MaterialIcons"
+                />
               </View>
             </TouchableOpacity>
           </View>

diff --git a/src/components/uploadsGalleryModal/uploadsGalleryModal.tsx b/src/components/uploadsGalleryModal/uploadsGalleryModal.tsx
@@ -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');

diff --git a/src/config/locales/ac-ace.json b/src/config/locales/ac-ace.json
@@ -298,10 +298,22 @@
     "beneficiaries": "Beneficiaries",
     "options": "Options",
     "my_blog": "My Blog",
+    "select_community": "Choose a community",
     "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 +331,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": "Pasöe gunci untuk buka",
     "set_new": "Pasöe pin barô",

diff --git a/src/config/locales/ar-SA.json b/src/config/locales/ar-SA.json
@@ -298,10 +298,22 @@
     "beneficiaries": "Beneficiaries",
     "options": "Options",
     "my_blog": "My Blog",
+    "select_community": "Choose a community",
     "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 +331,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": "أدخل الرقم السري للفتح",
     "set_new": "تعيين رقم سري جديد",

diff --git a/src/config/locales/as-IN.json b/src/config/locales/as-IN.json
@@ -298,10 +298,22 @@
     "beneficiaries": "Beneficiaries",
     "options": "Options",
     "my_blog": "My Blog",
+    "select_community": "Choose a community",
     "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 +331,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",