Members now appearing on host

Aurora/Design/Views/Party/PartyViewModel.cs

@@ -3,6 +3,7 @@ using System.Collections.ObjectModel;
 using Aurora.Executors;
 using Aurora.Design.Components.HostSelector;
 using Aurora.Services;
+using Aurora.Models;
 using Xamarin.Forms;
 
 namespace Aurora.Design.Views.Party
@@ -16,8 +17,6 @@ namespace Aurora.Design.Views.Party
 
     public class PartyViewModel : BaseViewModel
     {
-        private ObservableCollection<string> _members;
-
         private PartyState _state;
 
         private BaseExecutor _executor;
@@ -26,32 +25,25 @@ namespace Aurora.Design.Views.Party
 
         private string _port;
 
+        private ObservableCollection<PartyMember> _members;
+
 
         public PartyViewModel()
         {
-            _members = new ObservableCollection<string>()
-            {
-                "Kevin",
-                "Brandon",
-                "Sheila",
-                "Dale",
-                "Austin",
-                "Tori",
-                "Ashley",
-                "Spencer",
-            };
-            OnPropertyChanged("Members");
-
             this.JoinCommand = new Command(OnJoinExecute, CanJoinExecute);
             this.HostCommand = new Command(OnHostExecute, CanHostExecute);
+            _members = new ObservableCollection<PartyMember>();
 
             State(PartyState.SelectingHost);
         }
         #region Properties
 
-        public ObservableCollection<string> Members
+        public ObservableCollection<PartyMember> Members
         {
-            get { return _members; }
+            get
+            {
+                return _members;
+            }
             set { SetProperty(ref _members, value); }
         }
 
@@ -87,6 +79,7 @@ namespace Aurora.Design.Views.Party
         {
             _state = state;
             OnPropertyChanged("IsSelectingHost");
+            OnPropertyChanged("IsNotSelectingHost");
         }
 
         #region Commands
@@ -117,6 +110,13 @@ namespace Aurora.Design.Views.Party
 
             ServerService.Instance.Start();
 
+            _members = _executor.PartyMembers;
+            OnPropertyChanged("Members");
+            _executor.PartyMembers.CollectionChanged += (sender, e) =>
+            {
+                OnPropertyChanged("Members");
+            };
+
             //Change state
             State(PartyState.Connecting);
         }