From 9fce87235fe379bb55537cad135d00830fbe21f0 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Fri, 16 Dec 2016 01:13:16 +0100
Subject: [PATCH] refactoring

---
 BookAStar/BookAStar/App.xaml                  |  14 +++--
 BookAStar/BookAStar/App.xaml.cs               |   1 -
 BookAStar/BookAStar/BookAStar.csproj          |   3 ++
 BookAStar/BookAStar/Images/Chat/talk.png      | Bin 0 -> 1588 bytes
 .../Model/Social/Chat/ChatMessage.cs          |  11 +++-
 BookAStar/BookAStar/Pages/Chat/ChatPage.xaml  |  29 ++++++-----
 .../BookAStar/Pages/Chat/ChatPage.xaml.cs     |  34 +++++++------
 .../BookAStar/Pages/Chat/PrivateChatPage.xaml |   3 +-
 BookAStar/BookAStar/Pages/DocSigning.xaml     |   3 +-
 .../EstimatePages/EstimatesProviderPage.xaml  |   3 +-
 .../Pages/UserProfile/AccountChooserPage.xaml |   3 +-
 .../Pages/UserProfile/DashboardPage.xaml      |   2 +-
 .../ViewModels/Messaging/ChatUserInfo.cs      |  26 +++++++++-
 BookAStar/BookAStar/Views/UserListView.xaml   |  38 +++++++++++---
 .../BookAStar/Views/UserListView.xaml.cs      |  48 ++++++++++++++----
 15 files changed, 162 insertions(+), 56 deletions(-)
 create mode 100644 BookAStar/BookAStar/Images/Chat/talk.png

diff --git a/BookAStar/BookAStar/App.xaml b/BookAStar/BookAStar/App.xaml
index a9fb0040..aee77e6f 100644
--- a/BookAStar/BookAStar/App.xaml
+++ b/BookAStar/BookAStar/App.xaml
@@ -9,6 +9,8 @@
     <ResourceDictionary>
       
       <Color x:Key="PageBackgroundColor">#FFAAAAFF</Color>
+      <Color x:Key="DashboardPageBackgroundColor">#FFCCCCFF</Color>
+      
       <Color x:Key="ContentBackgroundColor">#80FFFFFF</Color>
       <Color x:Key="BackgroundColor">#FFFFFFFF</Color>
       <Color x:Key="LabelBackgroundColor">#FFFFFFFF</Color>
@@ -24,7 +26,10 @@
       <Color x:Key="OddColor">#207AFAFA</Color>
       <Color x:Key="EmphasisTextColor">#800080</Color>
       <Color x:Key="QuietTextColor">#404040</Color>
+      <Color x:Key="DisconnectedUserBgColor">#909090</Color>
+      <Color x:Key="ConnectedUserBgColor">#ffffff</Color>
       
+
       <OnPlatform x:TypeArguments="Font" Android="Large" iOS="Large" WinPhone="Large" x:Key="HeaderFont" />
       <OnPlatform x:TypeArguments="x:Double" Android="22" iOS="22" WinPhone="22" x:Key="LargeFontSize" />
       <OnPlatform x:TypeArguments="x:Double" Android="16" iOS="16" WinPhone="16" x:Key="MediumFontSize" />
@@ -90,11 +95,14 @@
       </Style>
       
       <Style x:Key="PageStyle" TargetType="ContentPage">
-        <Setter Property="Padding" Value="5,5,5,5" />
+        <Setter Property="Padding" Value="15,15,15,15" />
         <Setter Property="BackgroundColor" Value="{StaticResource PageBackgroundColor}" />
       </Style>
-      
-      
+      <Style x:Key="DashboardPageStyle" TargetType="ContentPage">
+        <Setter Property="Padding" Value="10,10,10,10" />
+        <Setter Property="BackgroundColor" Value="{StaticResource DashboardPageBackgroundColor}" />
+      </Style>
+
     </ResourceDictionary>
   </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index 00809aa3..36361d35 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -357,7 +357,6 @@ namespace BookAStar
                     msg
                     );
                 DataManager.Instance.ChatUsers.OnPrivateMessage(msg);
-
             });
         }
 
diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj
index c9d2a431..898fa16d 100644
--- a/BookAStar/BookAStar/BookAStar.csproj
+++ b/BookAStar/BookAStar/BookAStar.csproj
@@ -513,6 +513,9 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\Chat\talk.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/BookAStar/BookAStar/Images/Chat/talk.png b/BookAStar/BookAStar/Images/Chat/talk.png
new file mode 100644
index 0000000000000000000000000000000000000000..abc005767cedd87fff67e34718834601e5664a33
GIT binary patch
literal 1588
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
JH#`{ye*;VFzwH13

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Model/Social/Chat/ChatMessage.cs b/BookAStar/BookAStar/Model/Social/Chat/ChatMessage.cs
index 72f55a43..37153a36 100644
--- a/BookAStar/BookAStar/Model/Social/Chat/ChatMessage.cs
+++ b/BookAStar/BookAStar/Model/Social/Chat/ChatMessage.cs
@@ -1,4 +1,7 @@
-using System;
+using BookAStar.Data;
+using Newtonsoft.Json;
+using System;
+using System.Linq;
 
 namespace BookAStar.Model.Social.Messaging
 {
@@ -7,5 +10,11 @@ namespace BookAStar.Model.Social.Messaging
         public DateTime Date { get; set; }
         public string SenderId { get; set; }
         public string Message { get; set; }
+        public bool Read { get; set; }
+        [JsonIgnore]
+        public bool FromMe { get
+            {
+                return App.ChatHubConnection?.ConnectionId == SenderId;
+            } }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/Chat/ChatPage.xaml b/BookAStar/BookAStar/Pages/Chat/ChatPage.xaml
index d1e95cd4..4e498204 100644
--- a/BookAStar/BookAStar/Pages/Chat/ChatPage.xaml
+++ b/BookAStar/BookAStar/Pages/Chat/ChatPage.xaml
@@ -8,7 +8,7 @@
             xmlns:converters="clr-namespace:BookAStar.Converters;assembly=BookAStar"
             xmlns:local="clr-namespace:BookAStar;Assembly:BookAStar"
             xmlns:extensions="clr-namespace:BookAStar.Extensions;assembly=BookAStar"
-             >
+            Style="{StaticResource PageStyle}" >
    
   <TabbedPage.Resources>
     <ResourceDictionary>
@@ -100,18 +100,15 @@
     <ContentPage Title="Contacts" Icon="peer_to_peer.png" >
       <StackLayout Padding="5, 5, 5, 5">
         <StackLayout Spacing = "12"
-                        Orientation = "Horizontal"
-                        Padding="5, 0, 5, 0">
-          <Entry x:Name="pvEntry" Placeholder = "enter your private message"
-                 VerticalOptions = "Center"
-                      HorizontalOptions = "FillAndExpand"></Entry>
-
+                        Orientation = "Horizontal">
           
-          <Button x:Name="sendPVButton" Text = "Send" HorizontalOptions = "End"
-                           VerticalOptions = "Center"></Button>
         </StackLayout>
-        <!--  <ListView x:Name="PVList" HasUnevenRows="true" ItemsSource="{Binding PVs}">
-          <ListView.ItemTemplate HeightRequest="80" 
+        
+         <views:UserListView x:Name="chatUserList" />
+
+        <StackLayout BindingContext="{x:Reference Name=chatUserList}" IsVisible="{Binding HasASelection}">
+        <ListView x:Name="pvList" HasUnevenRows="true" ItemsSource="{Binding SelectedUser.PrivateMessages}" BindingContext="{x:Reference Name=chatUserList}">
+          <ListView.ItemTemplate HeightRequest="80"
                                  VerticalOptions="StartAndExpand">
             <DataTemplate>
               <ViewCell>
@@ -126,8 +123,14 @@
               </ViewCell>
             </DataTemplate>
           </ListView.ItemTemplate>
-        </ListView>  -->
-         <views:UserListView x:Name="chatUserList" />
+        </ListView>
+
+        <Entry x:Name="pvEntry" Placeholder = "enter your private message"
+                 VerticalOptions = "Center" HorizontalOptions = "FillAndExpand"></Entry>
+
+        <Button x:Name="sendPVButton" Text = "Send" HorizontalOptions = "End"
+                         VerticalOptions = "Center"></Button>
+        </StackLayout>
       </StackLayout>
 
     </ContentPage>
diff --git a/BookAStar/BookAStar/Pages/Chat/ChatPage.xaml.cs b/BookAStar/BookAStar/Pages/Chat/ChatPage.xaml.cs
index fe7c15bb..bc630dcd 100644
--- a/BookAStar/BookAStar/Pages/Chat/ChatPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/Chat/ChatPage.xaml.cs
@@ -44,25 +44,29 @@ namespace BookAStar.Pages.Chat
             };
             chatUserList.BindingContext = DataManager.Instance.ChatUsers;
             
-            /*
+            
             sendPVButton.Clicked += async (sender, args) =>
             {
-                string userName = contactPicker.SelectedItem as string;
-                if (string.IsNullOrEmpty(userName)) return;
-                var user = DataManager.Current.Contacts.Single(
-                    c => c.UserName == userName);
-                IsBusy = true;
-                try
-                {
-                    await App.ChatHubProxy.Invoke<string>("SendPV", user.ChatHubConnectionId, pvEntry.Text);
-                    pvEntry.Text = null;
-                }
-                catch (Exception ex)
+                var dest = chatUserList.SelectedUser;
+                if (dest!=null)
                 {
-                    Debug.WriteLine(ex);
+                    IsBusy = true;
+                    try
+                    {
+                        foreach (var cx in dest.ObservableConnections)
+                        {
+                            if (cx.Connected)
+                                await App.ChatHubProxy.Invoke<string>("SendPV", cx.ConnectionId, pvEntry.Text);
+                        }
+                        pvEntry.Text = null;
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.WriteLine(ex);
+                    }
+                    IsBusy = false;
                 }
-                IsBusy = false;
-            };*/
+            };
 
         }
 
diff --git a/BookAStar/BookAStar/Pages/Chat/PrivateChatPage.xaml b/BookAStar/BookAStar/Pages/Chat/PrivateChatPage.xaml
index 795bbfc1..8fda0eb7 100644
--- a/BookAStar/BookAStar/Pages/Chat/PrivateChatPage.xaml
+++ b/BookAStar/BookAStar/Pages/Chat/PrivateChatPage.xaml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="BookAStar.Pages.Chat.PrivateChatPage">
+             x:Class="BookAStar.Pages.Chat.PrivateChatPage"
+             Style="{StaticResource PageStyle}">
   <Label Text="{Binding MainText}" VerticalOptions="Center" HorizontalOptions="Center" />
 </ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/DocSigning.xaml b/BookAStar/BookAStar/Pages/DocSigning.xaml
index 284d5707..636171f3 100644
--- a/BookAStar/BookAStar/Pages/DocSigning.xaml
+++ b/BookAStar/BookAStar/Pages/DocSigning.xaml
@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:signature="clr-namespace:SignaturePad.Forms;assembly=SignaturePad.Forms"
              xmlns:views="clr-namespace:BookAStar.Views;assembly=BookAStar"
-             x:Class="BookAStar.ViewModels.Signing.Signing">
+             x:Class="BookAStar.ViewModels.Signing.Signing"
+             Style="{StaticResource PageStyle}">
   <StackLayout>
     <views:MarkdownView x:Name="mdView"
                               Editable="False"
diff --git a/BookAStar/BookAStar/Pages/EstimatePages/EstimatesProviderPage.xaml b/BookAStar/BookAStar/Pages/EstimatePages/EstimatesProviderPage.xaml
index c16bd7ea..6df82d7c 100644
--- a/BookAStar/BookAStar/Pages/EstimatePages/EstimatesProviderPage.xaml
+++ b/BookAStar/BookAStar/Pages/EstimatePages/EstimatesProviderPage.xaml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="BookAStar.Pages.EstimatesProviderPage">
+             x:Class="BookAStar.Pages.EstimatesProviderPage"
+             Style="{StaticResource PageStyle}">
 
   <ScrollView>
     <StackLayout Padding="10,10,10,10" x:Name="mainLayout">
diff --git a/BookAStar/BookAStar/Pages/UserProfile/AccountChooserPage.xaml b/BookAStar/BookAStar/Pages/UserProfile/AccountChooserPage.xaml
index e263319c..e405395f 100644
--- a/BookAStar/BookAStar/Pages/UserProfile/AccountChooserPage.xaml
+++ b/BookAStar/BookAStar/Pages/UserProfile/AccountChooserPage.xaml
@@ -3,7 +3,8 @@
              xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="BookAStar.Pages.UserProfile.AccountChooserPage"
-             Title="{x:Static local:Strings.UserAccounts}" Style="{StaticResource PageStyle}"
+             Title="{x:Static local:Strings.UserAccounts}" 
+             Style="{StaticResource PageStyle}"
              xmlns:lc="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
              xmlns:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms">
 
diff --git a/BookAStar/BookAStar/Pages/UserProfile/DashboardPage.xaml b/BookAStar/BookAStar/Pages/UserProfile/DashboardPage.xaml
index b5fb276b..8b3ccc0f 100644
--- a/BookAStar/BookAStar/Pages/UserProfile/DashboardPage.xaml
+++ b/BookAStar/BookAStar/Pages/UserProfile/DashboardPage.xaml
@@ -7,7 +7,7 @@
              x:Class="BookAStar.Pages.UserProfile.DashboardPage"
              xmlns:lc="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
              xmlns:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms"
-             Style="{StaticResource PageStyle}">
+             Style="{StaticResource DashboardPageStyle}">
   <ContentPage.Resources>
     <ResourceDictionary>
       <Style TargetType="Label">
diff --git a/BookAStar/BookAStar/ViewModels/Messaging/ChatUserInfo.cs b/BookAStar/BookAStar/ViewModels/Messaging/ChatUserInfo.cs
index b0cc26d1..31dbbcbf 100644
--- a/BookAStar/BookAStar/ViewModels/Messaging/ChatUserInfo.cs
+++ b/BookAStar/BookAStar/ViewModels/Messaging/ChatUserInfo.cs
@@ -13,6 +13,15 @@ namespace BookAStar.Model.Social.Chat
 {
     public class ChatUserInfo : ViewModel, IChatUserInfo
     {
+        public ChatUserInfo()
+        {
+            PrivateMessages.CollectionChanged += PrivateMessages_CollectionChanged;
+        }
+
+        private void PrivateMessages_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            NotifyPropertyChanged("Unread");
+        }
 
         public string avatar;
         public string Avatar
@@ -132,7 +141,7 @@ namespace BookAStar.Model.Social.Chat
                 throw new NotImplementedException();
             }
         }
-        ObservableCollection<ChatMessage> privateMessages ;
+        ObservableCollection<ChatMessage> privateMessages = new ObservableCollection<ChatMessage>();
         [JsonIgnore]
         public ObservableCollection<ChatMessage> PrivateMessages
         {
@@ -142,6 +151,21 @@ namespace BookAStar.Model.Social.Chat
             }
         }
 
+        public bool Unread
+        {
+            get
+            {
+                return PrivateMessages==null?false: PrivateMessages.Any(
+                    m => !m.Read);
+            }
+        }
+        public ImageSource MessagesBadge
+        {
+            get
+            {
+                return Unread ? ImageSource.FromResource("BookAStar.Images.Chat.talk.png") :null;
+            }
+        }
         public void OnConnected(string cxId)
         {
             // We do assume this cxId dosn't already exist in this list.
diff --git a/BookAStar/BookAStar/Views/UserListView.xaml b/BookAStar/BookAStar/Views/UserListView.xaml
index 0931d857..30112349 100644
--- a/BookAStar/BookAStar/Views/UserListView.xaml
+++ b/BookAStar/BookAStar/Views/UserListView.xaml
@@ -3,7 +3,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="BookAStar.Views.UserListView"
              xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
-             xmlns:extensions="clr-namespace:BookAStar.Extensions;assembly=BookAStar">
+             xmlns:extensions="clr-namespace:BookAStar.Extensions;assembly=BookAStar"
+             xmlns:converters="clr-namespace:BookAStar.Converters;assembly=BookAStar"
+            >
   <ContentView.Resources>
     <ResourceDictionary>
       <Style TargetType="Label">
@@ -12,21 +14,45 @@
       <Style TargetType="Button">
         <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
       </Style>
+     
+      <converters:BooleanToObjectConverter x:Key="cxtdToBck" x:TypeArguments="Style">
+
+        <converters:BooleanToObjectConverter.FalseObject>
+          <Style TargetType="StackLayout">
+            <Setter Property="BackgroundColor" Value="{StaticResource DisconnectedUserBgColor}" />
+          </Style>
+        </converters:BooleanToObjectConverter.FalseObject>
+
+        <converters:BooleanToObjectConverter.TrueObject>
+          <Style TargetType="StackLayout">
+            <Setter Property="BackgroundColor" Value="{StaticResource ConnectedUserBgColor}" />
+          </Style>
+        </converters:BooleanToObjectConverter.TrueObject>
+
+      </converters:BooleanToObjectConverter>
+      
     </ResourceDictionary>
   </ContentView.Resources>
   <ContentView.Content>
     <ListView x:Name="list" IsPullToRefreshEnabled="True" 
               HasUnevenRows="true" RowHeight="80" ItemsSource="{Binding .}"
               SeparatorVisibility="Default" SeparatorColor="Black">
-      <ListView.ItemTemplate HeightRequest="80" VerticalOptions="StartAndExpand">
+      <ListView.ItemTemplate HeightRequest="80" VerticalOptions="StartAndExpand" >
         <DataTemplate>
           <ViewCell>
             <ViewCell.View>
-              <StackLayout Orientation="Horizontal" Padding="10,10,10,10" VerticalOptions="StartAndExpand">
-                <Image Source="{Binding AvatarSource}" Aspect="AspectFit" />
-                <Label Text="{Binding UserName}" />
+              <StackLayout 
+                Orientation="Horizontal" Padding="3,3,3,3" VerticalOptions="StartAndExpand">
+                <StackLayout Orientation="Horizontal" Padding="5,5,5,5"
+                             Style="{Binding IsConnected, Converter={StaticResource cxtdToBck}}" >
+                             
+                  <Image Source="{Binding AvatarSource}" Aspect="AspectFit" />
+                  <Image Source="{Binding MessagesBadge}" Aspect="AspectFit" />
+                  <Label Text="{Binding UserName}"  />
+                </StackLayout>
                 <Label Text="{Binding RolesAsAString}" TextColor="{StaticResource QuietTextColor}" 
-                       FontSize="{StaticResource SmallFontSize}"/>
+                       FontSize="{StaticResource SmallFontSize}" />
+            
               </StackLayout>
             </ViewCell.View>
           </ViewCell>
diff --git a/BookAStar/BookAStar/Views/UserListView.xaml.cs b/BookAStar/BookAStar/Views/UserListView.xaml.cs
index 507f7fef..e4b080b0 100644
--- a/BookAStar/BookAStar/Views/UserListView.xaml.cs
+++ b/BookAStar/BookAStar/Views/UserListView.xaml.cs
@@ -1,4 +1,5 @@
 using BookAStar.Model;
+using BookAStar.Model.Social.Chat;
 using BookAStar.ViewModels.Messaging;
 using System;
 using System.Collections;
@@ -18,22 +19,36 @@ namespace BookAStar.Views
             "ItemsSource", typeof(ChatUserCollection), typeof(UserListView), default(ChatUserCollection),
             BindingMode.OneWay);
 
-        public BindableProperty ItemSelectedProperty = BindableProperty.Create(
-            "ItemSelected", typeof(ICommand), typeof(UserListView), default(ICommand));
+        public BindableProperty ItemSelectedCommandProperty = BindableProperty.Create(
+            "ItemSelectedCommand", typeof(ICommand), typeof(UserListView), default(ICommand));
 
         public BindableProperty DisableSelectionProperty = BindableProperty.Create(
             "DisableSelection", typeof(bool), typeof(UserListView), false);
 
+        public BindableProperty HasASelectionProperty = BindableProperty.Create(
+            "HasASelection", typeof(bool), typeof(UserListView), false);
+        
+        public BindableProperty SelectedUserProperty = BindableProperty.Create(
+            "SelectedUser", typeof(ChatUserInfo), typeof(UserListView), default(ChatUserInfo));
+
         public ChatUserCollection ItemsSource
         {
             get { return (ChatUserCollection) GetValue(ItemsSourceProperty); }
             set { SetValue(ItemsSourceProperty, value); }
         }
-        
-        public ICommand ItemSelected
+
+        public ChatUserInfo SelectedUser
+        {
+            get
+            {
+                return (ChatUserInfo) GetValue(SelectedUserProperty);
+            }
+        }
+
+        public ICommand ItemSelectedCommand
         {
-            get { return (ICommand) GetValue(ItemSelectedProperty); }
-            set { SetValue(ItemSelectedProperty, value); }
+            get { return (ICommand) GetValue(ItemSelectedCommandProperty); }
+            set { SetValue(ItemSelectedCommandProperty, value); }
         }
 
         public bool DisableSelection
@@ -42,12 +57,18 @@ namespace BookAStar.Views
             set { SetValue(DisableSelectionProperty, value); }
         }
 
+        public bool HasASelection
+        {
+            get { return (bool)GetValue(HasASelectionProperty); }
+            set { SetValue(HasASelectionProperty, value); }
+        }
+
         public UserListView()
         {
             InitializeComponent();
             list.ItemSelected += OnUserSelected;
-
         }
+
         protected override void OnBindingContextChanged()
         {
             base.OnBindingContextChanged();
@@ -58,14 +79,19 @@ namespace BookAStar.Views
                     list.EndRefresh();
                 });
         }
+
         public void OnUserSelected(object sender, SelectedItemChangedEventArgs ev)
         {
-            if (ItemSelected != null)
-                if (ItemSelected.CanExecute(ev.SelectedItem))
+            if (ItemSelectedCommand != null)
+                if (ItemSelectedCommand.CanExecute(ev.SelectedItem))
                 {
-                    ItemSelected.Execute(ev.SelectedItem);
+                    ItemSelectedCommand.Execute(ev.SelectedItem);
                 }
-            if (DisableSelection) list.SelectedItem = null;
+            if (DisableSelection)
+                list.SelectedItem = null;
+            SetValue(SelectedUserProperty, list.SelectedItem);
+            HasASelection = list.SelectedItem != null;
         }
+
     }
 }