Fix merge conflicts

Wino.Core.Domain/Entities/MailAccount.cs

@@ -44,6 +44,11 @@ namespace Wino.Core.Domain.Entities
         /// </summary>
         public string AccountColorHex { get; set; }
 
+        /// <summary>
+        /// Gets or sets the listing order of the account in the accounts list.
+        /// </summary>
+        public int Order { get; set; }
+
         /// <summary>
         /// Gets or sets whether the account has any reason for an interactive user action to fix continue operating.
         /// </summary>

Wino.Core.Domain/Interfaces/IAccountProviderDetailViewModel.cs

@@ -13,5 +13,21 @@ namespace Wino.Core.Domain.Interfaces
         /// Name representation of the view model that will be used to identify the startup entity on launch.
         /// </summary>
         string StartupEntityTitle { get; }
+
+        /// <summary>
+        /// E-mail addresses that this account holds.
+        /// </summary>
+
+        string StartupEntityAddresses { get; }
+
+        /// <summary>
+        /// Represents the account order in the accounts list.
+        /// </summary>
+        int Order { get; }
+
+        /// <summary>
+        /// Provider details of the account.
+        /// </summary>
+        IProviderDetail ProviderDetail { get; set; }
     }
 }

Wino.Core.Domain/Interfaces/IAccountService.cs

@@ -68,12 +68,37 @@ namespace Wino.Core.Domain.Interfaces
         /// <returns>Current account synchronization modifier.</returns>
         Task<string> UpdateSynchronizationIdentifierAsync(Guid accountId, string newIdentifier);
 
+        /// <summary>
+        /// Renames the merged inbox with the given id.
+        /// </summary>
+        /// <param name="mergedInboxId">Merged Inbox id</param>
+        /// <param name="newName">New name for the merged/linked inbox.</param>
         Task RenameMergedAccountAsync(Guid mergedInboxId, string newName);
 
+        /// <summary>
+        /// Creates a new merged inbox with the given accounts.
+        /// </summary>
+        /// <param name="mergedInbox">Merged inbox properties.</param>
+        /// <param name="accountsToMerge">List of accounts to merge together.</param>
         Task CreateMergeAccountsAsync(MergedInbox mergedInbox, IEnumerable<MailAccount> accountsToMerge);
 
+        /// <summary>
+        /// Updates the merged inbox with the given id with the new linked accounts.
+        /// </summary>
+        /// <param name="mergedInboxId">Updating merged inbox id.</param>
+        /// <param name="linkedAccountIds">List of linked account ids.</param>
         Task UpdateMergedInboxAsync(Guid mergedInboxId, IEnumerable<Guid> linkedAccountIds);
 
+        /// <summary>
+        /// Destroys the merged inbox with the given id.
+        /// </summary>
+        /// <param name="mergedInboxId">Merged inbox id to destroy.</param>
         Task UnlinkMergedInboxAsync(Guid mergedInboxId);
+
+        /// <summary>
+        /// Updates the account listing orders.
+        /// </summary>
+        /// <param name="accountIdOrderPair">AccountId-OrderNumber pair for all accounts.</param>
+        Task UpdateAccountOrdersAsync(Dictionary<Guid, int> accountIdOrderPair);
     }
 }

Wino.Core.Domain/Interfaces/IDialogService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Enums;
@@ -32,6 +33,13 @@ namespace Wino.Core.Domain.Interfaces
         Task<MailAccount> ShowEditAccountDialogAsync(MailAccount account);
         Task<MailAccount> ShowAccountPickerDialogAsync(List<MailAccount> availableAccounts);
 
+        /// <summary>
+        /// Displays a dialog to the user for reordering accounts.
+        /// </summary>
+        /// <param name="availableAccounts">Available accounts in order.</param>
+        /// <returns>Result model that has dict of AccountId-AccountOrder.</returns>
+        Task ShowAccountReorderDialogAsync(ObservableCollection<IAccountProviderDetailViewModel> availableAccounts);
+
         /// <summary>
         /// Presents a dialog to the user for selecting folder.
         /// </summary>

Wino.Core.Domain/Interfaces/IFolderMenuItem.cs

@@ -8,6 +8,7 @@ namespace Wino.Core.Domain.Interfaces
     public interface IFolderMenuItem : IBaseFolderMenuItem
     {
         MailAccount ParentAccount { get; }
+        void UpdateParentAccounnt(MailAccount account);
     }
 
     public interface IMergedAccountFolderMenuItem : IBaseFolderMenuItem { }

Wino.Core.Domain/Models/Accounts/ProviderDetail.cs

@@ -14,6 +14,7 @@ namespace Wino.Core.Domain.Models.Accounts
         public string ProviderImage => $"ms-appx:///Assets/Providers/{Type}.png";
 
         public bool IsSupported => Type == MailProviderType.Outlook || Type == MailProviderType.Gmail || Type == MailProviderType.IMAP4;
+        public bool RequireSenderNameOnCreationDialog => Type != MailProviderType.IMAP4;
 
         public ProviderDetail(MailProviderType type)
         {

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

@@ -408,6 +408,8 @@
     "SettingsFolderMenuStyle_Description": "Change whether account folders should be nested inside an account menu item or not. Toggle this off if you like the old menu system in Windows Mail",
     "SettingsManageAccountSettings_Description": "Notifications, signatures, synchronization and other settings per account.",
     "SettingsManageAccountSettings_Title": "Manage Account Settings",
+    "SettingsReorderAccounts_Title": "Reorder Accounts",
+    "SettingsReorderAccounts_Description": "Change the order of accounts in the account list.",
     "SettingsManageLink_Description": "Move items to add new link or remove existing link.",
     "SettingsManageLink_Title": "Manage Link",
     "SettingsMarkAsRead_Description": "Change what should happen to the selected item.",

Wino.Core.Domain/Translator.Designer.cs

@@ -2063,6 +2063,18 @@ namespace Wino.Core.Domain
 		/// </summary>
 		public static string SettingsManageAccountSettings_Title => Resources.GetTranslatedString(@"SettingsManageAccountSettings_Title");	
 	
+        /// <summary>
+		/// Reorder Accounts
+		/// </summary>
+		public static string SettingsReorderAccounts_Title => Resources.GetTranslatedString(@"SettingsReorderAccounts_Title");	
+	
+
+        /// <summary>
+		/// Change the order of accounts in the account list.
+		/// </summary>
+		public static string SettingsReorderAccounts_Description => Resources.GetTranslatedString(@"SettingsReorderAccounts_Description");	
+	
+
         /// <summary>
 		/// Move items to add new link or remove existing link.
 		/// </summary>