Merge pull request #489 from jorgeblacio/release_1.1.21

Bug Fixes, composer height and Forward localization.

Author: danieltigse

NotificationExtension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.20</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

ShareExtension/ComposerUIView.swift

@@ -62,6 +62,7 @@ class ComposerUIView: UIView {
     weak var myAccount: Account!
     var checkedDomains: [String: Bool] = Utils.defaultDomains
     var accountOptionsInterface: AccountOptionsInterface?
+    var composerEditorHeight: CGFloat = 0.0
 
     var theme: Theme {
         return ThemeManager.shared.theme
@@ -230,7 +231,7 @@ extension ComposerUIView: RichEditorDelegate {
 
     func richEditor(_ editor: RichEditorView, heightDidChange height: Int) {
         let cgheight = CGFloat(height)
-        let diff = cgheight - self.editorHeightConstraint.constant
+        let diff = cgheight - composerEditorHeight
         let offset = self.scrollView.contentOffset
 
         if CGFloat(height + CONTACT_FIELDS_HEIGHT + TOOLBAR_MARGIN_HEIGHT) > self.view.frame.origin.y + self.view.frame.width {
@@ -247,7 +248,7 @@ extension ComposerUIView: RichEditorDelegate {
         guard height > COMPOSER_MIN_HEIGHT else {
             return
         }
-        
+        composerEditorHeight = cgheight
         self.editorHeightConstraint.constant = cgheight
     }
 }

ShareExtension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.20</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

iOS-Email-Client.xcodeproj/project.pbxproj

@@ -2768,6 +2768,7 @@
 				INFOPLIST_FILE = "iOS-Email-Client/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.1.21;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"$(inherited)",
@@ -2806,6 +2807,7 @@
 				INFOPLIST_FILE = "iOS-Email-Client/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.1.21;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"$(inherited)",
@@ -2950,6 +2952,7 @@
 				INFOPLIST_FILE = "iOS-Email-Client/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.1.21;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"$(inherited)",
@@ -3009,6 +3012,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				MARKETING_VERSION = 1.1.21;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.criptext.mail.ShareExtension;
@@ -3038,6 +3042,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				MARKETING_VERSION = 1.1.21;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.criptext.mail.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3067,6 +3072,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				MARKETING_VERSION = 1.1.21;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.criptext.mail.support.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3097,6 +3103,7 @@
 				INFOPLIST_FILE = NotificationExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				MARKETING_VERSION = 1.1.21;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.criptext.mail.NotificationExtension;
@@ -3129,6 +3136,7 @@
 				INFOPLIST_FILE = NotificationExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				MARKETING_VERSION = 1.1.21;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.criptext.mail.NotificationExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3161,6 +3169,7 @@
 				INFOPLIST_FILE = NotificationExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				MARKETING_VERSION = 1.1.21;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.criptext.mail.support.NotificationExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";

iOS-Email-Client/Controllers/ComposeViewController.swift

@@ -1127,7 +1127,7 @@ extension ComposeViewController: RichEditorDelegate {
 
     func richEditor(_ editor: RichEditorView, heightDidChange height: Int) {
         let cgheight = CGFloat(height)
-        let diff = cgheight - self.editorHeightConstraint.constant
+        let diff = cgheight - composerEditorHeight
         let offset = self.scrollView.contentOffset
 
         if CGFloat(height + CONTACT_FIELDS_HEIGHT + TOOLBAR_MARGIN_HEIGHT) > self.toolbarView.frame.origin.y {

iOS-Email-Client/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.20</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

iOS-Email-Client/Interfaces/EmailMoreOptionsInterface.swift

@@ -43,7 +43,7 @@ class EmailMoreOptionsInterface: MoreOptionsViewInterface {
             case .replyAll:
                 return String.localize("REPLY_ALL")
             case .forward:
-                return String.localize("FORWARD")
+                return String.localize("FORWARD_MAIL")
             case .delete:
                 return String.localize("DELETE")
             case .mark:

iOS-Email-Client/en.lproj/Localizable.strings

@@ -255,6 +255,7 @@
 "REJECT" = "Reject";
 "REPLY" = "Reply";
 "REPLY_ALL" = "Reply All";
+"FORWARD" = "Forward";
 "DELETE" = "Delete";
 "DELETE_PERMANENTLY" = "Delete Permanently";
 "PRIVACY_SECURITY" = "Privacy and Security";

iOS-Email-Client/es-419.lproj/Localizable.strings

@@ -255,6 +255,7 @@
 "REJECT" = "Rechazar";
 "REPLY" = "Responder";
 "REPLY_ALL" = "Responder a todos";
+"FORWARD" = "Reenviar";
 "DELETE" = "Eliminar";
 "DELETE_PERMANENTLY" = "Eliminar Permanentemente";
 "PRIVACY_SECURITY" = "Seguridad y Privacidad";