Merge pull request #217 from Tiktack/features/SignaturesImprovements

Re-implemented signature page to support multiple signatures

Wino.Core.Domain/Entities/AccountSignature.cs

@@ -8,6 +8,10 @@ namespace Wino.Core.Domain.Entities
         [PrimaryKey]
         public Guid Id { get; set; }
 
+        public string Name { get; set; }
+
         public string HtmlBody { get; set; }
+
+        public Guid MailAccountId { get; set; }
     }
 }

Wino.Core.Domain/Entities/MailAccount.cs

@@ -44,12 +44,6 @@ namespace Wino.Core.Domain.Entities
         /// </summary>
         public string AccountColorHex { get; set; }
 
-        /// <summary>
-        /// Gets or sets the signature to be used for this account.
-        /// Null if no signature should be used.
-        /// </summary>
-        public Guid? SignatureId { get; set; }
-
         /// <summary>
         /// Gets or sets the listing order of the account in the accounts list.
         /// </summary>

Wino.Core.Domain/Entities/MailAccountPreferences.cs

@@ -30,5 +30,20 @@ namespace Wino.Core.Domain.Entities
         /// Null if the account provider type doesn't support Focused inbox.
         /// </summary>
         public bool? IsFocusedInboxEnabled { get; set; }
+
+        /// <summary>
+        /// Gets or sets whether signature should be appended automatically.
+        /// </summary>
+        public bool IsSignatureEnabled { get; set; }
+
+        /// <summary>
+        /// Gets or sets signature for new messages. Null if signature is not needed.
+        /// </summary>
+        public Guid? SignatureIdForNewMessages { get; set; }
+
+        /// <summary>
+        /// Gets or sets signature for following messages. Null if signature is not needed.
+        /// </summary>
+        public Guid? SignatureIdForFollowingMessages { get; set; }
     }
 }

Wino.Core.Domain/Interfaces/IDialogService.cs

@@ -47,5 +47,11 @@ namespace Wino.Core.Domain.Interfaces
         /// <param name="reason">The reason behind the picking operation
         /// <returns>Selected folder structure. Null if none.</returns>
         Task<IMailItemFolder> PickFolderAsync(Guid accountId, PickFolderReason reason, IFolderService folderService);
+
+        /// <summary>
+        /// Presents a dialog to the user for signature creation/modification.
+        /// </summary>
+        /// <returns>Signature information. Null if canceled.</returns>
+        Task<AccountSignature> ShowSignatureEditorDialog(AccountSignature signatureModel = null);
     }
 }

Wino.Core.Domain/Interfaces/ISignatureService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Wino.Core.Domain.Entities;
 
@@ -7,27 +8,40 @@ namespace Wino.Core.Domain.Interfaces
     public interface ISignatureService
     {
         /// <summary>
-        /// Returns the assigned account signature for the account.
+        /// Get one signature by Id.
         /// </summary>
-        /// <param name="accountId"></param>
-        /// <returns></returns>
-        Task<AccountSignature> GetAccountSignatureAsync(Guid accountId);
+        /// <param name="signatureId">Signature Id.</param>
+        Task<AccountSignature> GetSignatureAsync(Guid signatureId);
 
         /// <summary>
-        /// Creates the initial signature for new created accounts.
+        /// Returns all signatures for specified account.
         /// </summary>
-        /// <param name="accountId"></param>
-        /// <returns></returns>
+        /// <param name="accountId">Account id</param>
+        Task<List<AccountSignature>> GetSignaturesAsync(Guid accountId);
+
+        /// <summary>
+        /// Creates a new signature for the account.
+        /// </summary>
+        /// <param name="signature">Signature that should be created. It should contain ID and account to which it belongs.</param>
+        Task<AccountSignature> CreateSignatureAsync(AccountSignature signature);
+
+        /// <summary>
+        /// Creates a default Wino signature for the account.
+        /// Needed only for initial account setup.
+        /// </summary>
+        /// <param name="accountId">Account Id.</param>
         Task<AccountSignature> CreateDefaultSignatureAsync(Guid accountId);
 
         /// <summary>
-        /// Updates account's existing signature with the given HTML signature.
+        /// Updates existing signature.
         /// </summary>
-        Task<AccountSignature> UpdateAccountSignatureAsync(Guid accountId, string htmlBody);
+        /// <param name="signature">Signature that should be updated. It should contain ID and account to which it belongs.</param>
+        Task<AccountSignature> UpdateSignatureAsync(AccountSignature signature);
 
         /// <summary>
-        /// Disabled signature for the account and deletes existing signature.
+        /// Deletes existing signature.
         /// </summary>
-        Task DeleteAccountSignatureAssignment(Guid accountId);
+        /// <param name="signature">Signature that should be deleted.</param>
+        Task<AccountSignature> DeleteSignatureAsync(AccountSignature signature);
     }
 }

Wino.Core.Domain/Translations/en_US/resources.json

@@ -28,6 +28,7 @@
     "Buttons_Create": "Create",
     "Buttons_CreateAccount": "Create Account",
     "Buttons_Delete": "Delete",
+    "Buttons_Edit": "Edit",
     "Buttons_Discard": "Discard",
     "Buttons_EnableImageRendering": "Enable",
     "Buttons_No": "No",
@@ -452,7 +453,7 @@
     "SettingsShowSenderPictures_Title": "Show Sender Avatars",
     "SettingsPrefer24HourClock_Title": "Display Clock Format in 24 Hours",
     "SettingsPrefer24HourClock_Description": "Mail recieve times will be displayed in 24 hour format instead of 12 (AM/PM)",
-    "SettingsSignature_Description": "Edit or remove account signature",
+    "SettingsSignature_Description": "Manage account signatures",
     "SettingsSignature_Title": "Signature",
     "SettingsStartupItem_Description": "Primary account item to load Inbox at startup.",
     "SettingsStartupItem_Title": "Startup Item",
@@ -495,5 +496,21 @@
     "WinoUpgradeDescription": "Wino offers 3 accounts to start with for free. If you need more than 3 accounts, please upgrade",
     "WinoUpgradeMessage": "Upgrade to Unlimited Accounts",
     "WinoUpgradeRemainingAccountsMessage": "{0} out of {1} free accounts used.",
-    "Yesterday": "Yesterday"
+    "Yesterday": "Yesterday",
+    "SignatureEditorDialog_Title": "Signature Editor",
+    "SignatureEditorDialog_SignatureName_Placeholder": "Name your signature",
+    "SignatureEditorDialog_SignatureName_TitleNew": "Signature name",
+    "SignatureEditorDialog_SignatureName_TitleEdit": "Current signature name: {0}",
+    "SignatureDeleteDialog_Title": "Delete signature",
+    "SignatureDeleteDialog_Message": "Are you sure you want to delete \"{0}\" signature?",
+    "SettingsSignature_ForNewMessages_Title": "For New Messages",
+    "SettingsSignature_ForFollowingMessages_Title": "For Replies/Forwards",
+    "SettingsSignature_SignatureDefaults": "Signature defaults",
+    "SettingsSignature_Signatures": "Signatures",
+    "SettingsSignature_AddCustomSignature_Title": "Add custom signature",
+    "SettingsSignature_AddCustomSignature_Button": "Add signature",
+    "SettingsSignature_EditSignature_Title": "Edit signature",
+    "SettingsSignature_DeleteSignature_Title": "Delete signature",
+    "SettingsSignature_NoneSignatureName": "None"
+
 }