Refactoring controllers to use publicly accessible CursorLists

aurora-cradle-sharp/AuroraCradle/Src/Services/Signal/Events.cs

@@ -1,7 +0,0 @@
-namespace Aurora.Services.Signal
-{
-    public partial class SignalService : Signal.SignalBase
-    {
-
-    }
-}

aurora-proto/Proto/party.proto

@@ -105,13 +105,14 @@ message LeavePartyResponse {
 message Member {
     //Resource name of the party member to be returned (Added by server)
     string name = 1;
-    string userName = 2;
+    string id = 2;
+    string userName = 3;
 
     //Added by server
-    string ipAddress = 3;
+    string ipAddress = 4;
     
     //Added by server
-    google.protobuf.Timestamp addedOn = 4;
+    google.protobuf.Timestamp addedOn = 5;
 }
 
 message ListMembersRequest {

aurora-shared/.gitignore

@@ -0,0 +1,351 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+start*.sh

aurora-shared/Cursor/Cursor.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-#nullable enable
 namespace Aurora.Cursor
 {
     public enum SortDirection
@@ -15,8 +14,8 @@ namespace Aurora.Cursor
     {
         private CursorList<T> _list;
 
-        private string? _previousPageToken;
+        private string _previousPageToken;
-        private string? _nextPageToken;
+        private string _nextPageToken;
         private int _pageSize;
         private Func<KeyValuePair<string, T>, string> _sortDelgate;
         private SortDirection _direction;

aurora-shared/Cursor/CursorList.cs

@@ -4,7 +4,6 @@ using System;
 using System.Linq;
 using Aurora.Utils;
 
-#nullable enable
 namespace Aurora.Cursor
 {
 
@@ -23,12 +22,8 @@ namespace Aurora.Cursor
                 id = HashUtil.GetHash(new string[] { item.GetHashCode().ToString() }).ToString();
                 item.Id = id;
             }
-            bool res = this.TryAdd(id, item);
+            this.Add(id, item);
 
-            if (res == false)
-            {
-                throw new System.Exception("Failed to add item to cursor list");
-            }
             return this;
         }
 

aurora-shared/aurora-shared.csproj

@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>aurora_shared</RootNamespace>
+  </PropertyGroup>
+
+</Project>

aurora-sharp-desktop/Aurora.gtk/Aurora.gtk.csproj

@@ -505,6 +505,7 @@
       <Project>{17F51282-39BE-4FE3-8EC7-6D108F5DD0FD}</Project>
       <Name>Aurora</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\aurora-shared\aurora-shared.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Resources\play.png">

aurora-sharp-desktop/Aurora.test/Aurora.test.csproj

@@ -21,6 +21,7 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Aurora\Aurora.csproj" />
+        <ProjectReference Include="..\..\aurora-shared\aurora-shared.csproj" />
     </ItemGroup>
     <ItemGroup>
       <None Update="Resources\Jidenna\The Chief\04 Bambi.mp3">

aurora-sharp-desktop/Aurora/App.xaml.cs

@@ -7,8 +7,7 @@ using Aurora.Design.Views.Profile;
 using Aurora.Design.Views.Songs;
 using Aurora.Design.Views.Stations;
 using Aurora.Services.EventManager;
-using Aurora.Services.Server;
+using Aurora.Services;
-using Aurora.Services.Client;
 using Autofac;
 using LibVLCSharp.Shared;
 using Xamarin.Forms;
@@ -28,19 +27,19 @@ namespace Aurora
 
             //Register DI
             ContainerBuilder _builder = new ContainerBuilder();
-            // _builder.RegisterInstance<IPlayer>(new PlayerService()).SingleInstance();
+            _builder.RegisterInstance<IPlayer>(new PlayerService()).SingleInstance();
+            _builder.RegisterType<Global>().As<Global>().SingleInstance();
             _builder.RegisterType<PlayerService>().As<IPlayer>().SingleInstance();
             _builder.RegisterType<SettingsService>().As<ISettingsService>().SingleInstance();
             _builder.RegisterType<LibraryService>().As<ILibraryService>().SingleInstance();
             _builder.RegisterType<EventManager>().As<IEventManager>().SingleInstance();
-            _builder.RegisterType<ServerService>().As<IServerService>().SingleInstance();
-            _builder.RegisterType<ClientService>().As<IClientService>().SingleInstance();
             _builder.RegisterType<MainView>().SingleInstance();
             _builder.RegisterType<AlbumsViewModel>();
             _builder.RegisterType<ArtistsViewModel>();
             _builder.RegisterType<PartyViewModel>();
             _builder.RegisterType<ProfileViewModel>();
             _builder.RegisterType<SongsViewModel>();
+            _builder.RegisterType<HostPartyViewModel>();
             _builder.RegisterType<StationsViewModel>();
 
             // _builder.RegisterInstance<ISettingsService>(new SettingsService()).SingleInstance();

aurora-sharp-desktop/Aurora/Aurora.csproj

@@ -83,4 +83,7 @@
         <None Remove="Resources\like.png" />
         <None Remove="Resources\play.png" />
     </ItemGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\..\aurora-shared\aurora-shared.csproj" />
+    </ItemGroup>
 </Project>

aurora-sharp-desktop/Aurora/Models/Member.cs

@@ -1,11 +1,12 @@
 using System;
+using Aurora.Cursor;
 
 namespace Aurora.Proto.Party
 {
     /// <summary>
     /// Partial PartyMember class with a constructor that generates a new id
     /// </summary>
-    public partial class Member
+    public partial class Member : ICursorObject
     {
         public Member(string id)
         {

aurora-sharp-desktop/Aurora/Services/Client/ClientService.cs

@@ -1,46 +0,0 @@
-using Grpc.Core;
-using Aurora.Proto.Party;
-using Aurora.Services.Settings;
-
-namespace Aurora.Services.Client
-{
-
-    public class ClientService : IClientService
-    {
-        private RemotePartyService.RemotePartyServiceClient _remotePartyClient;
-
-        private Channel _channel;
-        private ISettingsService _settingsService;
-
-        public ClientService(ISettingsService settingsService)
-        {
-            this._settingsService = settingsService;
-        }
-
-        public bool IsStarted
-        {
-            get
-            {
-                return _remotePartyClient != null;
-            }
-        }
-
-        public RemotePartyService.RemotePartyServiceClient RemotePartyServiceClient
-        {
-            get { return this._remotePartyClient; }
-        }
-
-        public void Start(string hostname, string port)
-        {
-            _channel = new Channel(string.Format("{0}:{1}", hostname, port), ChannelCredentials.Insecure);
-
-            _remotePartyClient = new RemotePartyService.RemotePartyServiceClient(_channel);
-        }
-
-        public async void Close()
-        {
-            await _channel.ShutdownAsync();
-            _remotePartyClient = null;
-        }
-    }
-}

aurora-sharp-desktop/Aurora/Services/Client/IClientService.cs

@@ -1,15 +0,0 @@
-using Aurora.Proto.Party;
-
-namespace Aurora.Services.Client
-{
-    public interface IClientService
-    {
-        bool IsStarted { get; }
-
-        RemotePartyService.RemotePartyServiceClient RemotePartyServiceClient { get; }
-
-        void Start(string hostname, string port);
-
-        void Close();
-    }
-}

aurora-sharp-desktop/Aurora/Services/Controllers/Constructor.cs

@@ -6,9 +6,10 @@ using Aurora.Services.Library;
 using Aurora.Services.Settings;
 using Aurora.Models.Media;
 using Aurora.Services.EventManager;
-using Autofac;
+using Aurora.Utils; 
+using Aurora.Cursor;
 
-namespace Aurora.Services.Server.Controllers
+namespace Aurora.Services.Controllers
 {
     public partial class RemotePartyController : RemotePartyService.RemotePartyServiceBase
     {
@@ -24,7 +25,7 @@ namespace Aurora.Services.Server.Controllers
             this._startDateTime = DateTime.UtcNow;
             this._displayName = partyName;
             this._description = description;
-            this._memberList = new SortedList<string, Member>();
+            this._memberList = new CursorList<Member>();
             this._mediaList = new SortedList<string, Media>();
 
             _libraryService = libraryService;
@@ -36,9 +37,9 @@ namespace Aurora.Services.Server.Controllers
 
             this._hostMember = new Member()
             {
-                Name = GetNewMemberResourceName(_partyResourceName, ServerService.GetLocalIPAddress(), userName),
+                Name = GetNewMemberResourceName(_partyResourceName, IpUtil.GetLocalIPAddress(), userName),
                 UserName = userName,
-                IpAddress = ServerService.GetLocalIPAddress(),
+                IpAddress = IpUtil.GetLocalIPAddress(),
             };
 
             //Add media from library

aurora-sharp-desktop/Aurora/Services/Controllers/EventController.cs

@@ -4,7 +4,7 @@ using System.Threading;
 using Aurora.Proto.Party;
 using Aurora.Utils;
 
-namespace Aurora.Services.Server.Controllers
+namespace Aurora.Services.Controllers
 {
     public partial class RemotePartyController : RemotePartyService.RemotePartyServiceBase
     {

aurora-sharp-desktop/Aurora/Services/Controllers/EventSubscriptionController.cs

@@ -5,7 +5,7 @@ using Aurora.Proto.Party;
 using Aurora.Proto.General;
 using Aurora.Utils;
 
-namespace Aurora.Services.Server.Controllers
+namespace Aurora.Services.Controllers
 {
     public partial class RemotePartyController : RemotePartyService.RemotePartyServiceBase
     {

aurora-sharp-desktop/Aurora/Services/Controllers/MediaController.cs

@@ -8,7 +8,7 @@ using Aurora.Services.Library;
 using Aurora.Services.Player;
 using Autofac;
 
-namespace Aurora.Services.Server.Controllers
+namespace Aurora.Services.Controllers
 {
     public partial class RemotePartyController : RemotePartyService.RemotePartyServiceBase
     {

aurora-sharp-desktop/Aurora/Services/Controllers/MemberController.cs

@@ -6,40 +6,50 @@ using Aurora.Proto.General;
 using Aurora.Utils;
 using Grpc.Core;
 using Google.Protobuf.WellKnownTypes;
+using Aurora.Cursor;
 
-namespace Aurora.Services.Server.Controllers
+namespace Aurora.Services.Controllers
 {
     public partial class RemotePartyController : RemotePartyService.RemotePartyServiceBase
     {
-        private SortedList<string, Member> _memberList;
+        private CursorList<Member> _memberList;
+
+        public CursorList<Member> MemberList
+        {
+            get 
+            {
+                return this._memberList;
+            }
+            set 
+            {
+                if(this._memberList != value)
+                {
+                    _memberList = value;
+                }
+            }
+        }
 
         public override Task<ListMembersResponse> ListMembers(ListMembersRequest request, Grpc.Core.ServerCallContext context)
         {
+            Cursor<Member> cursor = new Cursor<Member>(ref this._memberList);
+
+            Aurora.Cursor.SortDirection direction = Aurora.Cursor.SortDirection.Asc;
+
+            CursorResult<Member> res = cursor
+                .WithNextPageToken(request.PageToken)
+                .WithSize(request.PageSize)
+                .GetNextPage();
+
             //Ignoring parent field because there is only one instance of the party
             ListMembersResponse resp = new ListMembersResponse();
 
-            //Determine start idx
+            resp.Members.AddRange(res.Result.ConvertAll(member => new Member()
-            int startIdx = 0;
-            if (!string.IsNullOrEmpty(request.PageToken))
             {
-                startIdx = _memberList.IndexOfKey(request.PageToken) + 1;
+                Name = member.Name,
-            }
+                UserName = member.UserName,
-
+                IpAddress = member.IpAddress,
-            int pageSize = request.PageSize;
+                AddedOn = member.AddedOn
-
+            }));
-            //Assign pageSize
-            if (pageSize > _memberList.Count)
-            {
-                pageSize = _memberList.Count;
-            }
-
-
-            //Gather page
-            List<Member> members = new List<Member>(_memberList.Values);
-            resp.Members.AddRange(members.GetRange(startIdx, pageSize));
-
-            //Set next page token
-            resp.NextPageToken = resp.Members[resp.Members.Count - 1].Name;
 
             return Task.FromResult(resp);
         }
@@ -76,7 +86,7 @@ namespace Aurora.Services.Server.Controllers
             request.Member.AddedOn = Timestamp.FromDateTime(DateTime.UtcNow);
             request.Member.IpAddress = context.Host;
 
-            _memberList.Add(resourceName, request.Member);
+            _memberList.Add(request.Member);
 
             BaseEvent @event = new BaseEvent
             {

aurora-sharp-desktop/Aurora/Services/Controllers/PartyController.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Threading.Tasks;
-using System.Collections.Generic;
+using Aurora.Utils;
 using Aurora.Proto.Party;
 using Google.Protobuf.WellKnownTypes;
 
 
-namespace Aurora.Services.Server.Controllers
+namespace Aurora.Services.Controllers
 {
     public partial class RemotePartyController : RemotePartyService.RemotePartyServiceBase
     {
@@ -22,7 +22,7 @@ namespace Aurora.Services.Server.Controllers
                 Name = _partyResourceName,
                 DisplayName = this._displayName,
                 Description = this._description,
-                HostIp = ServerService.GetLocalIPAddress(),
+                HostIp = IpUtil.GetLocalIPAddress(),
                 HostMember = this._hostMember,
                 CreatedOn = Timestamp.FromDateTime(_startDateTime)
             };

aurora-sharp-desktop/Aurora/Services/Global.cs

@@ -0,0 +1,19 @@
+namespace Aurora.Services
+{
+    public enum PartyState
+    {
+        Idle,
+        SelectingHost,
+        InParty,
+        Hosting,
+        Connecting,
+    }
+    public class Global
+    {
+        public Global()
+        {
+            this.State = PartyState.Idle;
+        }
+        public PartyState State {get; set;}
+    }
+}

aurora-sharp-desktop/Aurora/Services/Server/Server/IServerService.cs

@@ -1,27 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Aurora.Services.Server
-{
-    public interface IServerService
-    {
-        int Port { get; }
-
-        string Hostname { get; }
-
-        bool Initialized { get; }
-
-
-        /// <summary>
-        /// Start Server
-        /// </summary>
-        void Start(string partyName, string description);
-
-        /// <summary>
-        /// Shutdown server async.
-        /// </summary>
-        /// <returns>Task</returns>
-        Task Stop();
-
-        Task Reset();
-    }
-}

aurora-sharp-desktop/Aurora/Services/Server/Server/ServerService.cs

@@ -1,144 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Net;
-using System.Net.Sockets;
-using Grpc.Core;
-using Aurora.Services.Server.Controllers;
-using Aurora.Services.Settings;
-using Aurora.Services.Library;
-using Aurora.Services.EventManager;
-using Aurora.Proto.Party;
-
-
-namespace Aurora.Services.Server
-{
-    public class ServerService : IServerService
-    {
-        private int _port = 8080;
-        private string _hostname;
-        private Grpc.Core.Server _server;
-        private ILibraryService _libraryService;
-        private ISettingsService _settingsService;
-        private IEventManager _eventManager;
-
-        //Implementation class declarations
-        private RemotePartyController _remotePartyController;
-
-        /// <summary>
-        /// Constructor. Registers GRPC service implementations.
-        /// </summary>
-        public ServerService(ILibraryService libraryService, ISettingsService settingsService, IEventManager eventManager)
-        {
-            string host = GetLocalIPAddress();
-            this._libraryService = libraryService;
-            this._settingsService = settingsService;
-            this._eventManager = eventManager;
-            if (string.IsNullOrWhiteSpace(host))
-            {
-                throw new Exception("This device must have a valid IP address");
-            }
-
-            _hostname = host;
-        }
-
-        public int Port
-        {
-            get { return _port; }
-        }
-
-        public string Hostname
-        {
-            get { return _hostname; }
-        }
-
-        public bool Initialized
-        {
-            get
-            {
-                return (_remotePartyController != null &&
-                    _server != null);
-            }
-        }
-
-
-        /// <summary>
-        /// Start Server
-        /// </summary>
-        public void Start(string partyName, string description)
-        {
-            try
-            {
-
-                Console.WriteLine(string.Format("Starting gRPC server at hostname: {0}, port: {1}", _hostname, _port));
-
-                _server = new Grpc.Core.Server
-                {
-                    Ports = { new ServerPort(_hostname, _port, ServerCredentials.Insecure) }
-                };
-
-                //Construct implementations
-                _remotePartyController = new RemotePartyController(
-                    partyName,
-                    description,
-                    _libraryService,
-                    _settingsService,
-                    _eventManager);
-
-                // Register grpc RemoteService with singleton server service
-                RegisterService(RemotePartyService.BindService(_remotePartyController));
-
-
-                _server.Start();
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(string.Format("Error starting gRPC server: {0}", ex.Message));
-            }
-        }
-
-        /// <summary>
-        /// Shutdown server async.
-        /// </summary>
-        /// <returns>Task</returns>
-        public async Task Stop()
-        {
-            try
-            {
-                await _server.ShutdownAsync();
-                await _server.ShutdownTask;
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(string.Format("Error stopping gRPC server: {0}", ex.Message));
-            }
-        }
-
-        public async Task Reset()
-        {
-            await Stop();
-            _server = new Grpc.Core.Server
-            {
-                Ports = { new ServerPort("localhost", _port, ServerCredentials.Insecure) }
-            };
-        }
-
-        private void RegisterService(ServerServiceDefinition definition)
-        {
-            _server.Services.Add(definition);
-        }
-
-        public static string GetLocalIPAddress()
-        {
-            string returnIp = "";
-            var host = Dns.GetHostEntry(Dns.GetHostName());
-            foreach (var ip in host.AddressList)
-            {
-                if (ip.AddressFamily == AddressFamily.InterNetwork)
-                {
-                    returnIp = ip.ToString();
-                }
-            }
-            return returnIp;
-        }
-    }
-}

aurora-sharp-desktop/Aurora/UserInterface/Controls/NavigationMenu/NavigationItem.cs

@@ -12,7 +12,6 @@ namespace Aurora.Design.Components.NavigationMenu
         public NavigationItem()
         {
         }
-        public int Id { get; set; }
         public string Title { get; set; }
         public string Group { get; set; }
         public Type TargetType { get; set; }

aurora-sharp-desktop/Aurora/UserInterface/Views/BasePlayerViewModel.cs

@@ -0,0 +1,50 @@
+using Aurora.Models.Media;
+using Aurora.Design.Views.Main;
+
+namespace Aurora.Design.Views 
+{
+    public class BasePlayerViewModel  : BaseViewModel
+    {
+        public BasePlayerViewModel(): base()
+        {
+        }
+        /// <summary>
+        /// Delegate for interacting with main screen player control
+        /// </summary>
+        /// <value></value>
+        public SetPlayerDelegate ChangePlayerState { get; set; }
+
+        /// <summary>
+        /// Delegate for checking if main screen player control is currently playing
+        /// </summary>
+        /// <value></value>
+        public GetIsPlayingDelegate IsPlaying { get; set; }
+
+        /// <summary>
+        /// Command event handler for player play button
+        /// </summary>
+        public virtual void OnPlayButtonCommandExecute() { }
+        public virtual bool CanPlayButtonCommandExecute()
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// Command event handler for player next button
+        /// </summary>
+        public virtual void OnNextButtonExecute() { }
+        public virtual bool CanNextButtonCommandExecute()
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// Command event handler for player previous button
+        /// </summary>
+        public virtual void OnPreviousButtonExecute() { }
+        public virtual bool CanPreviousButtonCommandExecute()
+        {
+            return true;
+        }
+    }
+}

aurora-sharp-desktop/Aurora/UserInterface/Views/BaseViewModel.cs

@@ -15,55 +15,14 @@ namespace Aurora.Design.Views
         {
         }
 
-        #region Player 
-
-        /// <summary>
-        /// Command event handler for player play button
-        /// </summary>
-        public virtual void OnPlayButtonCommandExecute() { }
-        public virtual bool CanPlayButtonCommandExecute()
-        {
-            return true;
-        }
-
-        /// <summary>
-        /// Command event handler for player next button
-        /// </summary>
-        public virtual void OnNextButtonExecute() { }
-        public virtual bool CanNextButtonCommandExecute()
-        {
-            return true;
-        }
-
-        /// <summary>
-        /// Command event handler for player previous button
-        /// </summary>
-        public virtual void OnPreviousButtonExecute() { }
-        public virtual bool CanPreviousButtonCommandExecute()
-        {
-            return true;
-        }
-
-        /// <summary>
-        /// Delegate for interacting with main screen player control
-        /// </summary>
-        /// <value></value>
-        public SetPlayerDelegate ChangePlayerState { get; set; }
-
-        /// <summary>
-        /// Delegate for checking if main screen player control is currently playing
-        /// </summary>
-        /// <value></value>
-        public GetIsPlayingDelegate IsPlaying { get; set; }
-
         public ShowModalDelegate ShowModal { get; set; }
 
         public HideModalDelegate HideModal { get; set; }
 
+        public SetViewDelegate SetView { get; set; }
 
-        #endregion Player
 
-        #region Lifecycle
+        #region Lifecycle Callbacks
         /// <summary>
         /// Called by main screen on view appearing
         /// </summary>
@@ -78,7 +37,7 @@ namespace Aurora.Design.Views
         /// <returns></returns>
         public virtual Task OnInactive() { return Task.FromResult<object>(null); }
 
-        #endregion
+        #endregion Lifecycle Callbacks
 
         #region INotifyPropertyChanged Implementation
         public bool SetProperty<T>(ref T storage, T value, [CallerMemberName] string propertyName = null)

aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/MainView.xaml.cs

@@ -31,11 +31,12 @@ namespace Aurora.Design.Views.Main
     public delegate void ShowModalDelegate(Type view, BaseDialogViewModel viewModel);
     public delegate void HideModalDelegate();
     public delegate void FinishDialogDelegate();
+    public delegate void SetViewDelegate(Type viewType, Type viewModelType);
 
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class MainView : ContentPage//, IDisposable
     {
-        private Dictionary<int, BaseViewModel> _viewModels;
+        private Dictionary<string, BaseViewModel> _viewModels;
         private BaseViewModel _lastViewModel;
         private Player _playerComponent;
         private IPlayer _playerService;
@@ -45,7 +46,7 @@ namespace Aurora.Design.Views.Main
         {
             InitializeComponent();
             BindingContext = new MainViewModel();
-            _viewModels = new Dictionary<int, BaseViewModel>();
+            _viewModels = new Dictionary<string, BaseViewModel>();
 
             _playerComponent = Player;
 
@@ -74,29 +75,35 @@ namespace Aurora.Design.Views.Main
                 return;
 
             var view = (View)Activator.CreateInstance(item.TargetType);
+            string viewModelName = item.TargetViewModelType.Name;
 
             //Check if we have an instantiated viewModel
             BaseViewModel vm = new BaseViewModel();
-            if (_viewModels.ContainsKey(item.Id))
+            if (_viewModels.ContainsKey(viewModelName))
             {
-                _viewModels.TryGetValue(item.Id, out vm);
+                _viewModels.TryGetValue(viewModelName, out vm);
             }
             else
             {
-                if (item.TargetViewModelType.BaseType != typeof(BaseViewModel))
+                if (item.TargetViewModelType.IsAssignableFrom(typeof(BaseViewModel)))
                 {
                     throw new InvalidOperationException("TargetViewModel field must be of type BaseViewModel");
                 }
 
                 //Instantiate new view model
                 vm = (BaseViewModel)App.Container.Resolve(item.TargetViewModelType); //Activator.CreateInstance(item.TargetViewModelType);
-                _viewModels.Add(item.Id, vm);
+                _viewModels.Add(viewModelName, vm);
 
             }
 
             //Assign player controls to viewmodel
-            AssignPlayerControls(vm);
+            if(vm is BasePlayerViewModel)
+            {
+                AssignPlayerControls(vm as BasePlayerViewModel);
+            }
+            
             ChangeModalVisiblity(false);
+            vm.SetView = this.SetView;
 
             //Activate viewmodel
             vm.OnActive();
@@ -104,7 +111,10 @@ namespace Aurora.Design.Views.Main
             //Deactivate last viewModel
             _lastViewModel.OnInactive();
             //Unasign deactivating vm
-            UnassignPlayerControls(_lastViewModel);
+            if(_lastViewModel is BasePlayerViewModel)
+            {
+                UnassignPlayerControls(_lastViewModel as BasePlayerViewModel);
+            }
 
             //Assign viewModel
             _lastViewModel = vm;
@@ -128,20 +138,26 @@ namespace Aurora.Design.Views.Main
             var view = (View)Activator.CreateInstance(firstNavItem.TargetType);
 
             BaseViewModel vm = new BaseViewModel();
-            if (_viewModels.ContainsKey(firstNavItem.Id))
+            if (_viewModels.ContainsKey(nameof(firstNavItem.TargetViewModelType)))
             {
-                _viewModels.TryGetValue(firstNavItem.Id, out vm);
+                _viewModels.TryGetValue(nameof(firstNavItem.TargetViewModelType), out vm);
             }
             else
             {
                 //Instantiate new view model
                 vm = (BaseViewModel)App.Container.Resolve(firstNavItem.TargetViewModelType); //(BaseViewModel)Activator.CreateInstance(firstNavItem.TargetViewModelType);
-                _viewModels.Add(firstNavItem.Id, vm);
+                _viewModels.Add(nameof(firstNavItem.TargetViewModelType), vm);
             }
 
             view.BindingContext = vm;
             _lastViewModel = vm;
-            AssignPlayerControls(vm);
+            if(vm is BasePlayerViewModel)
+            {
+                AssignPlayerControls(vm as BasePlayerViewModel);
+            }
+
+            vm.SetView = this.SetView;
+            
             ChangeModalVisiblity(false);
             vm.OnActive();
 
@@ -153,7 +169,7 @@ namespace Aurora.Design.Views.Main
         /// Unassign setplayer delegate to prevent vms from changing player info when inactive
         /// </summary>
         /// <param name="vm"></param>
-        private void UnassignPlayerControls(BaseViewModel vm)
+        private void UnassignPlayerControls(BasePlayerViewModel vm)
         {
             vm.ChangePlayerState = null;
             vm.IsPlaying = null;
@@ -164,7 +180,7 @@ namespace Aurora.Design.Views.Main
         /// Assign main views music player controls to a view model
         /// </summary>
         /// <param name="vm">BaseViewModel to assign controls to</param>
-        private void AssignPlayerControls(BaseViewModel vm)
+        private void AssignPlayerControls(BasePlayerViewModel vm)
         {
             _playerComponent.PlayButtonCommand = new Command(vm.OnPlayButtonCommandExecute, vm.CanPlayButtonCommandExecute);
             _playerComponent.NextButtonCommand = new Command(vm.OnNextButtonExecute, vm.CanNextButtonCommandExecute);
@@ -259,5 +275,53 @@ namespace Aurora.Design.Views.Main
             Modal.IsVisible = isVisible;
             Content.IsVisible = !isVisible;
         }
+    
+        private void SetView(Type viewType, Type viewModelType)
+        {
+            BaseViewModel vm = new BaseViewModel();
+            if(this._viewModels.ContainsKey(viewModelType.Name))
+            {
+                this._viewModels.TryGetValue(viewModelType.Name, out vm);
+            }
+            else
+            {
+                if (viewModelType.IsAssignableFrom(typeof(BaseViewModel)))
+                {
+                    throw new InvalidOperationException("TargetViewModel field must be of type BaseViewModel");
+                }
+
+                //Instantiate new view model
+                vm = (BaseViewModel)App.Container.Resolve(viewModelType); //Activator.CreateInstance(item.TargetViewModelType);
+                _viewModels.Add(viewModelType.Name, vm);
+            }
+
+            //Assign player controls to viewmodel
+            if(vm is BasePlayerViewModel)
+            {
+                AssignPlayerControls(vm as BasePlayerViewModel);
+            }
+            
+            ChangeModalVisiblity(false);
+
+            //Activate viewmodel
+            vm.OnActive();
+
+            //Deactivate last viewModel
+            _lastViewModel.OnInactive();
+            //Unasign deactivating vm
+            if(_lastViewModel is BasePlayerViewModel)
+            {
+                UnassignPlayerControls(_lastViewModel as BasePlayerViewModel);
+            }
+
+            var view = (View)Activator.CreateInstance(viewType);
+            vm.SetView = this.SetView;
+
+            //Assign viewModel
+            _lastViewModel = vm;
+            view.BindingContext = vm;
+
+            _viewContent.Content = view;
+        }
     }
 }

aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/MainViewModel.cs

@@ -56,13 +56,13 @@ namespace Aurora.Design.Views.MainView
         {
             _pages = new ObservableCollection<NavigationItem>(new[]
             {
-                new NavigationItem { Id = 0, Title = "Songs", Group="Your Music", TargetType = typeof(SongsView), TargetViewModelType = typeof(SongsViewModel) },
+                new NavigationItem { Title = "Songs", Group="Your Music", TargetType = typeof(SongsView), TargetViewModelType = typeof(SongsViewModel) },
-                new NavigationItem { Id = 1, Title = "Artists", Group="Your Music", TargetType = typeof(ArtistsView), TargetViewModelType = typeof(ArtistsViewModel)},
+                new NavigationItem { Title = "Artists", Group="Your Music", TargetType = typeof(ArtistsView), TargetViewModelType = typeof(ArtistsViewModel)},
-                new NavigationItem { Id = 2, Title = "Albums", Group="Your Music", TargetType = typeof(AlbumsView), TargetViewModelType = typeof(AlbumsViewModel)},
+                new NavigationItem { Title = "Albums", Group="Your Music", TargetType = typeof(AlbumsView), TargetViewModelType = typeof(AlbumsViewModel)},
-                new NavigationItem { Id = 3, Title = "Stations", Group="Your Music", TargetType = typeof(StationsView), TargetViewModelType = typeof(StationsViewModel)},
+                new NavigationItem { Title = "Stations", Group="Your Music", TargetType = typeof(StationsView), TargetViewModelType = typeof(StationsViewModel)},
-                new NavigationItem { Id = 4, Title = "Party", Group="Social", TargetType = typeof(PartyView), TargetViewModelType = typeof(PartyViewModel)},
+                new NavigationItem { Title = "Party", Group="Social", TargetType = typeof(PartyView), TargetViewModelType = typeof(PartyViewModel)},
-                new NavigationItem { Id = 5, Title = "Profile", Group="Social", TargetType = typeof(ProfileView), TargetViewModelType = typeof(ProfileViewModel)},
+                new NavigationItem { Title = "Profile", Group="Social", TargetType = typeof(ProfileView), TargetViewModelType = typeof(ProfileViewModel)},
-                new NavigationItem { Id = 6, Title = "A + B", Group="Playlists", TargetType = typeof(StationsView), TargetViewModelType = typeof(StationsViewModel)}
+                new NavigationItem { Title = "A + B", Group="Playlists", TargetType = typeof(StationsView), TargetViewModelType = typeof(StationsViewModel)}
             });
 
         }

aurora-sharp-desktop/Aurora/UserInterface/Views/Party/BasePartyViewModel.cs

@@ -0,0 +1,65 @@
+using System.Collections.ObjectModel;
+using Aurora.Proto.Party;
+using Aurora.Models.Media;
+using Aurora.Services.Settings;
+using Aurora.Services;
+
+namespace Aurora.Design.Views.Party
+{
+    public class BasePartyViewModel : BasePlayerViewModel
+    {
+        protected string _hostname;
+        protected Global _global;
+
+        protected ISettingsService _settingsService;
+        private ObservableCollection<Member> _members;
+        private ObservableCollection<BaseMedia> _queue;
+        private BaseMedia _selectedMedia;
+        
+        private int _selectedTabIndex;
+
+        public BasePartyViewModel(
+            ISettingsService settingsService,
+            Global global
+        ) 
+        {
+            _members = new ObservableCollection<Member>();
+            _queue = new ObservableCollection<BaseMedia>();
+
+            this._settingsService = settingsService;
+            this._global = global;
+        }
+
+        public int SelectedTabIndex
+        {
+            get { return _selectedTabIndex; }
+            set { SetProperty(ref _selectedTabIndex, value); }
+        }
+
+        /// <summary>
+        /// Publc property for the members list
+        /// </summary>
+        /// <value></value>
+        public ObservableCollection<Member> Members
+        {
+            get
+            {
+                return _members;
+            }
+            set
+            {
+                SetProperty(ref _members, value);
+            }
+        }
+
+        /// <summary>
+        /// Public property for the currently selected song.
+        /// </summary>
+        /// <value></value>
+        public BaseMedia SelectedMedia
+        {
+            get { return _selectedMedia; }
+            set { SetProperty(ref _selectedMedia, value); }
+        }
+    }
+}

aurora-sharp-desktop/Aurora/UserInterface/Views/Party/HostPartyViewModel.cs

@@ -0,0 +1,225 @@
+using System;
+using System.Threading.Tasks;
+using System.Net;
+using System.Net.Sockets;
+using Grpc.Core;
+using Xamarin.Forms;
+using Aurora.Services.EventManager;
+using Aurora.Services.Library;
+using Aurora.Services.Settings;
+using Aurora.Services;
+using Aurora.Proto.Party;
+using Aurora.Models.Media;
+using Aurora.Services.Controllers;
+using Aurora.Utils;
+
+
+namespace Aurora.Design.Views.Party
+{
+    public class HostPartyViewModel : BasePartyViewModel
+    {
+        private IEventManager _eventManager;
+        private ILibraryService _libraryService;
+
+        private Grpc.Core.Server _server;
+        private RemotePartyController _remotePartyController;
+        private Channel _channel;
+        private int _port = 8080;
+        private bool _isServerStarted = false;
+
+        public HostPartyViewModel(
+            ISettingsService settingsService, 
+            IEventManager eventManager,
+            ILibraryService libraryService,
+            Global global
+        ): base(settingsService, global)
+        {
+            this._eventManager = eventManager;
+            this._global.State = PartyState.Hosting;
+            this._libraryService = libraryService;
+
+            // Create and start grpc server
+            string host = IpUtil.GetLocalIPAddress();
+            if(string.IsNullOrWhiteSpace(host))
+            {
+                // TODO display error to screen
+                throw new System.Exception("This device does not have a valid IP address");
+            }
+            this._hostname = IpUtil.GetLocalIPAddress();
+
+            this.StartServer("test", "test description");
+
+            // TODO assign members
+            // TODO assign songList
+
+            // Register commands
+            PlayCommand = new Command(OnDoubleClickCommandExecute, CanDoubleClickCommandExecute);
+            LeavePartyCommand = new Command(OnLeavePartyCommandExecute, CanLeavePartyCommandExecute);
+            
+        }
+
+        #region Properties
+
+        /// <summary>
+        /// Public property for playing media command
+        /// </summary>
+        /// <value></value>
+        public Command PlayCommand { get; private set; }
+
+        /// <summary>
+        /// Public property for leave party command
+        /// </summary>
+        /// <value></value>
+        public Command LeavePartyCommand { get; private set; }
+
+        #endregion Properties
+
+        /// <summary>
+        /// Called by framework when view becomes active
+        /// </summary>
+        /// <returns></returns>
+        public override Task OnActive()
+        {
+            // Start server if not already started
+            if(!this._isServerStarted)
+            {
+                this._hostname = IpUtil.GetLocalIPAddress();
+
+                this.StartServer("test", "test description");
+            }
+            return Task.FromResult<object>(null);
+        }
+
+        /// <summary>
+        /// Called by framework when view becomes inactive
+        /// </summary>
+        /// <returns></returns>
+        public override Task OnInactive()
+        {
+            return Task.FromResult<object>(null);
+        }
+
+        private async void OnLeavePartyCommandExecute()
+        {
+            await this._channel.ShutdownAsync();
+            await this._server.ShutdownAsync();
+            this._global.State = PartyState.Idle;
+            this.SetView(typeof(PartyView), typeof(PartyViewModel));
+        }
+
+        private bool CanLeavePartyCommandExecute()
+        {
+            return true;
+        }
+
+        public override void OnPlayButtonCommandExecute()
+        {
+            if (base.IsPlaying())
+            {
+                //Fire play stopped event
+                AudioMetadata meta = SelectedMedia.Metadata as AudioMetadata;
+                MediaPausedEvent mediaPaused = new MediaPausedEvent();
+
+                _eventManager.FireEvent(new BaseEvent()
+                {
+                    MediaPausedEvent = mediaPaused
+                });
+            }
+            else
+            {
+                //Fire play resume event
+                AudioMetadata meta = SelectedMedia.Metadata as AudioMetadata;
+                MediaResumedEvent mediaResumed = new MediaResumedEvent();
+
+                _eventManager.FireEvent(new BaseEvent()
+                {
+                    MediaResumedEvent = mediaResumed
+                });
+            }
+        }
+
+        public override bool CanPlayButtonCommandExecute()
+        {
+            return true;
+        }
+
+        public override bool CanNextButtonCommandExecute()
+        {
+            return true;
+        }
+
+        public override bool CanPreviousButtonCommandExecute()
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// On double click execute, fire media playing event
+        /// </summary>
+        public void OnDoubleClickCommandExecute()
+        {
+            //Fire Playing event
+            AudioMetadata meta = SelectedMedia.Metadata as AudioMetadata;
+            NewMediaPlayingEvent mediaPlaying = new NewMediaPlayingEvent()
+            {
+                Media = new Media()
+                {
+                    //TODO need full resource name
+                    Name = SelectedMedia.Id,
+                    Title = meta.Title,
+                    Artist = meta.Artist,
+                    Album = meta.Album,
+                }
+            };
+
+            _eventManager.FireEvent(new BaseEvent()
+            {
+                NewMediaPlayingEvent = mediaPlaying
+            });
+        }
+
+        public bool CanDoubleClickCommandExecute()
+        {
+            return true;
+        }
+
+        #region Private Methods
+
+        private void StartServer(string partyName, string description)
+        {
+            try
+            {
+
+                // TODO bmw replace with display in UI
+                Console.WriteLine(string.Format("Starting gRPC server at hostname: {0}, port: {1}", _hostname, _port));
+
+                _server = new Grpc.Core.Server
+                {
+                    Ports = { new ServerPort(_hostname, _port, ServerCredentials.Insecure) }
+                };
+
+                //Construct implementations
+                this._remotePartyController = new RemotePartyController(
+                    partyName,
+                    description,
+                    this._libraryService,
+                    base._settingsService,
+                    _eventManager);
+
+                // Register grpc RemoteService with singleton server service
+                RemotePartyService.BindService(this._remotePartyController);
+
+
+                _server.Start();
+                this._isServerStarted = true;
+            }
+            catch (Exception ex)
+            {
+                // TODO bmw replace with display in UI
+                Console.WriteLine(string.Format("Error starting gRPC server: {0}", ex.Message));
+            }
+        }
+        #endregion Private Methods
+
+    }
+}

aurora-sharp-desktop/Aurora/UserInterface/Views/Party/PartyViewModel.cs

@@ -1,182 +1,68 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using System.Threading;
-using System.Linq;
-using Xamarin.Forms;
 using Aurora.Proto.Party;
-using Aurora.Models.Media;
-using Aurora.Services.Client;
 using Aurora.Design.Views.Party.NewPartyDialog;
 using Aurora.Services.Settings;
-using Aurora.Services.Server;
+using Aurora.Services;
-using Aurora.Services.EventManager;
-using Grpc.Core;
 
 namespace Aurora.Design.Views.Party
 {
-    //TODO refactor
-    enum PartyState
-    {
-        SelectingHost,
-        InParty,
-        Hosting,
-        Connecting,
-    }
     delegate void EventHandler(BaseEvent e);
-    public class PartyViewModel : BaseViewModel
+    public class PartyViewModel : BasePartyViewModel
     {
-        private PartyState _state;
-        private string _hostname = "";
-        private ObservableCollection<Member> _members;
-        private ObservableCollection<BaseMedia> _queue;
-        private BaseMedia _selectedMedia;
-        private ISettingsService _settingsService;
-        private IClientService _clientService;
-        private IServerService _serverService;
-        private IEventManager _eventManager;
 
-        private CancellationTokenSource _eventCancellationTokenSource;
+        public PartyViewModel(ISettingsService settingsService, Global global): base(settingsService, global)
-
-        private Dictionary<BaseEvent.DerivedEventOneofCase, EventHandler> _eventHandlers;
-
-        private int _selectedTabIndex;
-
-        public PartyViewModel(
-            ISettingsService settingsService,
-            IServerService serverService,
-            IEventManager eventManager,
-            IClientService clientService)
         {
-            _members = new ObservableCollection<Member>();
-            _queue = new ObservableCollection<BaseMedia>();
-
-            this._settingsService = settingsService;
-            this._serverService = serverService;
-            this._eventManager = eventManager;
-            this._clientService = clientService;
-
-            SetState(PartyState.SelectingHost);
-
-            PlayCommand = new Command(OnDoubleClickCommandExecute, CanDoubleClickCommandExecute);
-
-            LeavePartyCommand = new Command(OnLeavePartyCommandExecute, CanLeavePartyCommandExecute);
-
-            //Setup event handlers
-            _eventHandlers = new Dictionary<BaseEvent.DerivedEventOneofCase, EventHandler>()
-            {
-                {BaseEvent.DerivedEventOneofCase.MediaPausedEvent, this.OnRemoteMediaPaused},
-                {BaseEvent.DerivedEventOneofCase.MediaResumedEvent, this.OnRemoteMediaResumed},
-                {BaseEvent.DerivedEventOneofCase.NewMediaPlayingEvent, this.OnNewRemoteMediaPlaying},
-                {BaseEvent.DerivedEventOneofCase.MemberCreatedEvent, this.OnPartyMemberJoined},
-                {BaseEvent.DerivedEventOneofCase.MemberDeletedEvent, this.OnPartyMemberLeft}
-            };
         }
 
-        #region Properties
-
-        public int SelectedTabIndex
-        {
-            get { return _selectedTabIndex; }
-            set { SetProperty(ref _selectedTabIndex, value); }
-        }
-
-        /// <summary>
-        /// Publc property for the members list
-        /// </summary>
-        /// <value></value>
-        public ObservableCollection<Member> Members
-        {
-            get
-            {
-                return _members;
-            }
-            set
-            {
-                SetProperty(ref _members, value);
-            }
-        }
-
-        /// <summary>
-        /// Public property for queue item source
-        /// </summary>
-        /// <value></value>
-        public ObservableCollection<BaseMedia> Queue
-        {
-            get
-            {
-                return _queue;
-            }
-            set
-            {
-                if (value != _queue)
-                {
-                    SetProperty(ref _queue, value);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Public property for the currently selected song.
-        /// </summary>
-        /// <value></value>
-        public BaseMedia SelectedSong
-        {
-            get { return _selectedMedia; }
-            set { SetProperty(ref _selectedMedia, value); }
-        }
-
-        /// <summary>
-        /// Public property for playing media
-        /// </summary>
-        /// <value></value>
-        public Command PlayCommand { get; private set; }
-
-        public Command LeavePartyCommand { get; private set; }
-
-        #endregion Properties
-
-        #region Events
         /// <summary>
         /// Called by framework when view becomes active
         /// </summary>
         /// <returns></returns>
-        public override async Task OnActive()
+        public override Task OnActive()
         {
             OnPropertyChanged("SelectedTabIndex");
-            if (this._state == PartyState.Hosting ||
+            switch(this._global.State)
-                this._state == PartyState.InParty)
             {
-                await this.GetEvents().ConfigureAwait(false);
+                case PartyState.Hosting: 
-            }
-            else
-            {
-                //Open host selection modal
-                NewPartyDialogViewModel vm = new NewPartyDialogViewModel();
-                ConnectionDetails details = new ConnectionDetails();
-                vm.Finish = () =>
                 {
-                    this.HideModal();
+                    this.SetView.Invoke(typeof(PartyView), typeof(HostPartyViewModel));
-                    details = vm.ReturnObject as ConnectionDetails;
+                    break;
-                    _hostname = details.HostName;
+                }
-                    switch (details.ConnectionType)
+                case PartyState.InParty:
+                {
+                    // TODO
+                    break;
+                }
+                default: 
+                {
+                    //Open host selection modal
+                    NewPartyDialogViewModel vm = new NewPartyDialogViewModel();
+                    ConnectionDetails details = new ConnectionDetails();
+                    vm.Finish = () =>
                     {
-                        case ConnectionType.Host:
+                        this.HideModal();
-                            {
+                        details = vm.ReturnObject as ConnectionDetails;
-                                OnHostCommandExecute();
+                        this._hostname = details.HostName;
-                                break;
+                        switch (details.ConnectionType)
-                            }
+                        {
-                        case ConnectionType.Join:
+                            case ConnectionType.Host:
-                            {
+                                {
-                                OnJoinCommandExecute();
+                                    this.SetView.Invoke(typeof(PartyView), typeof(HostPartyViewModel));
-                                break;
+                                    break;
-                            }
+                                }
-                    }
+                            case ConnectionType.Join:
-                };
+                                {
+                                    // TODO
+                                    break;
+                                }
+                        }
+                    };
 
-                this.ShowModal(typeof(NewPartyDialog.NewPartyDialog), vm);
+                    this.ShowModal(typeof(NewPartyDialog.NewPartyDialog), vm);
+                    break;
+                }
             }
+            return Task.FromResult<object>(null);
         }
 
         /// <summary>
@@ -185,393 +71,11 @@ namespace Aurora.Design.Views.Party
         /// <returns></returns>
         public override Task OnInactive()
         {
-            if(this._eventCancellationTokenSource != null){
+            // if(this._eventCancellationTokenSource != null){
-                this._eventCancellationTokenSource.Cancel();
+            //     this._eventCancellationTokenSource.Cancel();
-            }
+            // }
             
             return Task.FromResult<object>(null);
         }
-
-        /// <summary>
-        /// Remote media paused event
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="args"></param>
-        public void OnRemoteMediaPaused(BaseEvent e)
-        {
-            StopPlaying();
-        }
-
-        /// <summary>
-        /// Remote playing new media event
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="args"></param>
-        public void OnNewRemoteMediaPlaying(BaseEvent e)
-        {
-            PlayFromBeginning(GetMediaFromQueue(e.NewMediaPlayingEvent.Media.Name));
-        }
-
-        /// <summary>
-        /// Remote resumed playing event
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="args"></param>
-        public void OnRemoteMediaResumed(BaseEvent e)
-        {
-            PlayResume();
-        }
-
-        /// <summary>
-        /// Member joined party event
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="args"></param>
-        public void OnPartyMemberJoined(BaseEvent e)
-        {
-            Members.Add(e.MemberCreatedEvent.Member);
-        }
-
-        /// <summary>
-        /// Member left party event
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="args"></param>
-        public void OnPartyMemberLeft(BaseEvent e)
-        {
-            var found = Members.Where(x => x.Name == e.MemberDeletedEvent.MemberName);
-            foreach (Member member in found)
-            {
-                _members.Remove(member);
-            }
-        }
-
-        #endregion Events
-
-        #region Commands
-        private async void OnJoinCommandExecute()
-        {
-            SetState(PartyState.Connecting);
-            _clientService.Start(_hostname, this._settingsService.DefaultPort.ToString());
-            await JoinParty(false);
-
-            //TODO add cancellation token
-            try
-            {
-                SetState(PartyState.InParty);
-                await GetEvents().ConfigureAwait(true);
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("Exception occurred while receiviing events: ", ex.Message);
-            }
-        }
-
-        private bool CanJoinCommandExecute()
-        {
-            return true;
-        }
-
-        private async void OnHostCommandExecute()
-        {
-            //Change state
-            SetState(PartyState.Connecting);
-            _serverService.Start("test", "asdf");
-            string localHost = ServerService.GetLocalIPAddress();
-            _clientService.Start(localHost, this._settingsService.DefaultPort.ToString());
-            await JoinParty(true);
-
-
-            //TODO add cancellation token
-            try
-            {
-                SetState(PartyState.Hosting);
-                await GetEvents().ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("Exception occurred while receiviing events: ", ex.Message);
-            }
-        }
-
-        private bool CanHostCommandExecute()
-        {
-            return true;
-        }
-
-        private async void OnLeavePartyCommandExecute()
-        {
-            await _clientService.RemotePartyServiceClient.DeleteMemberAsync(new DeleteMemberRequest()
-            {
-                Name = _settingsService.ClientName
-            });
-        }
-
-        private bool CanLeavePartyCommandExecute()
-        {
-            return (this._state == PartyState.InParty || this._state == PartyState.Hosting) ? true : false;
-        }
-
-        public override void OnPlayButtonCommandExecute()
-        {
-            if (base.IsPlaying())
-            {
-                //Fire play stopped event
-                AudioMetadata meta = _selectedMedia.Metadata as AudioMetadata;
-                MediaPausedEvent mediaPaused = new MediaPausedEvent();
-
-                _eventManager.FireEvent(new BaseEvent()
-                {
-                    MediaPausedEvent = mediaPaused
-                });
-            }
-            else
-            {
-                //Fire play resume event
-                AudioMetadata meta = _selectedMedia.Metadata as AudioMetadata;
-                MediaResumedEvent mediaResumed = new MediaResumedEvent();
-
-                _eventManager.FireEvent(new BaseEvent()
-                {
-                    MediaResumedEvent = mediaResumed
-                });
-            }
-        }
-
-        public override bool CanPlayButtonCommandExecute()
-        {
-            return this._state == PartyState.Hosting;
-        }
-
-        public override bool CanNextButtonCommandExecute()
-        {
-            return this._state == PartyState.Hosting;
-        }
-
-        public override bool CanPreviousButtonCommandExecute()
-        {
-            return this._state == PartyState.Hosting;
-        }
-
-        /// <summary>
-        /// On double click execute, fire media playing event
-        /// </summary>
-        public void OnDoubleClickCommandExecute()
-        {
-            //Fire Playing event
-            AudioMetadata meta = _selectedMedia.Metadata as AudioMetadata;
-            NewMediaPlayingEvent mediaPlaying = new NewMediaPlayingEvent()
-            {
-                Media = new Media()
-                {
-                    //TODO need full resource name
-                    Name = _selectedMedia.Id,
-                    Title = meta.Title,
-                    Artist = meta.Artist,
-                    Album = meta.Album,
-                }
-            };
-
-            _eventManager.FireEvent(new BaseEvent()
-            {
-                NewMediaPlayingEvent = mediaPlaying
-            });
-        }
-
-        public bool CanDoubleClickCommandExecute()
-        {
-            return this._state == PartyState.Hosting;
-        }
-
-
-        #endregion Commands
-
-        #region Private Methods
-        /// <summary>
-        /// Join the remote party.
-        /// </summary>
-        /// <returns></returns>
-        private async Task JoinParty(bool asHost)
-        {
-            try
-            {
-                Member resp = await _clientService.RemotePartyServiceClient.CreateMemberAsync(new CreateMemberRequest
-                {
-                    Member = new Member()
-                    {
-                        UserName = this._settingsService.Username,
-                    }
-                });
-
-                this._settingsService.ClientName = resp.Name;
-
-                await RefreshMembers();
-
-                //Subscribe to events
-                await SubscribeToEvents();
-
-                Queue.Clear();
-
-                ListMediaResponse mediaResponse = await _clientService.RemotePartyServiceClient.ListMediaAsync(new ListMediaRequest()
-                {
-                    PageSize = 50,
-                    Parent = "TODO"
-                });
-
-                //Convert received data to remote audio models
-                foreach (Media data in mediaResponse.Media)
-                {
-                    //Assign received metadata (since this can't be aquired from a file)
-                    AudioMetadata meta = new AudioMetadata();
-                    meta.Title = data.Title;
-                    meta.Album = data.Album;
-                    meta.Artist = data.Artist;
-                    meta.Duration = data.Duration;
-
-                    RemoteAudio remote = new RemoteAudio(data.Name,
-                        asHost,
-                        meta,
-                        _clientService.RemotePartyServiceClient);
-
-                    Queue.Add(remote);
-                    OnPropertyChanged("Queue");
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("Error subscribing to events: " + ex.Message);
-            }
-        }
-
-        private async Task LeaveParty()
-        {
-            //Stop receiving events
-            // _client.StopEvents();
-
-            //Unsubscribe
-            await UnsubscribeFromEvents();
-
-            //Leave party
-            DeleteMemberRequest req = new DeleteMemberRequest()
-            {
-                Name = _settingsService.ClientName
-            };
-
-            await _clientService.RemotePartyServiceClient.DeleteMemberAsync(req);
-        }
-
-        private async Task SubscribeToEvents()
-        {
-            CreateEventSubscriptionListRequest req = new CreateEventSubscriptionListRequest();
-            req.Parent = this._settingsService.ClientName;
-            req.EventSubscriptions.Add(new EventSubscription() { Type = EventType.MemberCreated });
-            req.EventSubscriptions.Add(new EventSubscription() { Type = EventType.MemberDeleted });
-            req.EventSubscriptions.Add(new EventSubscription() { Type = EventType.MediaPlaying });
-            req.EventSubscriptions.Add(new EventSubscription() { Type = EventType.MediaStopped });
-
-            Console.WriteLine(string.Format("CLIENT {0} - SubscribeToEvents called from client with id", this._settingsService.ClientName));
-            await _clientService.RemotePartyServiceClient.CreateEventSubscriptionListAsync(req);
-        }
-        private async Task UnsubscribeFromEvents()
-        {
-            DeleteAllEventSubscriptionsRequest unsubscribeReq = new DeleteAllEventSubscriptionsRequest();
-            await _clientService.RemotePartyServiceClient.DeleteAllEventSubscriptionsAsync(unsubscribeReq);
-        }
-
-        /// <summary>
-        /// Refresh members list.
-        /// </summary>
-        private async Task RefreshMembers()
-        {
-            Members.Clear();
-            ListMembersResponse response = await _clientService.RemotePartyServiceClient.ListMembersAsync(
-                new ListMembersRequest()
-                {
-                    Parent = "TODO",
-                    PageSize = 50,
-                });
-            //Add members
-            foreach (Member member in response.Members)
-            {
-                Members.Add(member);
-            }
-        }
-
-        private void SetState(PartyState state)
-        {
-            _state = state;
-            OnPropertyChanged("IsSelectingHost");
-            OnPropertyChanged("IsNotSelectingHost");
-        }
-
-        private BaseMedia GetMediaFromQueue(string Id)
-        {
-            if (_queue.Any((BaseMedia media) => media.Id == Id))
-            {
-                BaseMedia media = _queue.First((BaseMedia med) => med.Id == Id);
-                return media;
-            }
-            else
-            {
-                return null;
-            }
-        }
-        private void PlayFromBeginning(BaseMedia args)
-        {
-            base.ChangePlayerState(args, Main.PlayAction.Play);
-        }
-
-        private void PlayResume()
-        {
-            base.ChangePlayerState(null, Main.PlayAction.Resume);
-        }
-
-        private void StopPlaying()
-        {
-            base.ChangePlayerState(null, Main.PlayAction.Pause);
-        }
-
-        /// <summary>
-        /// Asynchronous function for processing events off of the event stream.
-        /// </summary>
-        /// <returns></returns>
-        public async Task GetEvents()
-        {
-            _eventCancellationTokenSource = new CancellationTokenSource();
-            string clientName = this._settingsService.ClientName;
-            Console.WriteLine(string.Format("CLIENT {0} - GetEvents called from client with id", clientName));
-            using (AsyncServerStreamingCall<BaseEvent> eventStream = _clientService.RemotePartyServiceClient
-                .GetEvents(new GetEventsRequest { Parent = this._settingsService.ClientName }))
-            {
-                try
-                {
-                    while (!_eventCancellationTokenSource.Token.IsCancellationRequested &&
-                        await eventStream.ResponseStream.MoveNext(_eventCancellationTokenSource.Token))
-                    {
-                        try
-                        {
-                            BaseEvent e = new BaseEvent(eventStream.ResponseStream.Current);
-
-                            _eventHandlers.TryGetValue(e.DerivedEventCase, out EventHandler handler);
-
-                            if (handler != null && handler != null)
-                            {
-                                handler.Invoke(e);
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            Console.WriteLine("Exception while parsing event ---" + ex.Message);
-                        }
-
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine(string.Format("EXCEPTION while parsing events --- " + ex.Message));
-                }
-            }
-        }
-        #endregion Private Methods
     }
 }

aurora-sharp-desktop/Aurora/UserInterface/Views/Songs/SongsViewModel.cs

@@ -5,7 +5,7 @@ using Xamarin.Forms;
 
 namespace Aurora.Design.Views.Songs
 {
-    public class SongsViewModel : BaseViewModel
+    public class SongsViewModel : BasePlayerViewModel
     {
         #region Fields
         private ObservableCollection<BaseMedia> _songsList;

aurora-sharp-desktop/Aurora/Utils/IpUtil.cs

@@ -0,0 +1,22 @@
+using System.Net;
+using System.Net.Sockets;
+
+namespace Aurora.Utils
+{
+    public static class IpUtil
+    {
+        public static string GetLocalIPAddress()
+        {
+            string returnIp = "";
+            var host = Dns.GetHostEntry(Dns.GetHostName());
+            foreach (var ip in host.AddressList)
+            {
+                if (ip.AddressFamily == AddressFamily.InterNetwork)
+                {
+                    returnIp = ip.ToString();
+                }
+            }
+            return returnIp;
+        }
+    }
+}

aurora.code-workspace

@@ -1,5 +1,8 @@
 {
-  "folders": [
+  "folders": ['
+    {
+        "path": ".gitea"
+    },
     {
         "path": "aurora-sharp-desktop"
     },
@@ -10,7 +13,7 @@
         "path": "aurora-proto"
     },
     {
-        "path": ".gitea"
+        "path": "aurora-shared"
     }
 ],
 "settings": {