From 5c9e85d954d9b72552f877b3a31aab539a277d8c Mon Sep 17 00:00:00 2001
From: Nicolas Jager <nicolas.jager@savoirfairelinux.com>
Date: Sat, 10 Dec 2016 18:17:25 -0500
Subject: [PATCH] smartpanel : move items during events.
- moves item to the top whem incoming/outgoing call
and when account message recieved.
Change-Id: Ie8588e934586b122d45e98c1bbc7f204728f9685
Tuleap: #790
---
SmartPanel.xaml.cpp | 51 ++++++++++++++++++++++++++++--------
SmartPanel.xaml.h | 1 +
SmartPanelItemsViewModel.cpp | 13 +++++++++
SmartPanelItemsViewModel.h | 1 +
4 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/SmartPanel.xaml.cpp b/SmartPanel.xaml.cpp
index 5df2299..d553670 100644
--- a/SmartPanel.xaml.cpp
+++ b/SmartPanel.xaml.cpp
@@ -104,6 +104,14 @@ SmartPanel::SmartPanel()
auto item = SmartPanelItemsViewModel::instance->findItem(contact);
item->_callId = callId;
+ /* move the item of the top of the list */
+ unsigned int index;
+ if (_smartList_->Items->IndexOf(item, &index)) {
+ SmartPanelItemsViewModel::instance->moveItemToTheTop(item);
+ _smartList_->UpdateLayout();
+ _smartList_->ScrollIntoView(item);
+ }
+
});
RingD::instance->stateChange += ref new StateChange([this](String^ callId, CallStatus state, int code) {
@@ -136,14 +144,14 @@ SmartPanel::SmartPanel()
}
case CallStatus::IN_PROGRESS:
{
- _smartList_->SelectedItem = item;
+ SmartPanelItemsViewModel::instance->_selectedItem = item;
summonVideoPage();
break;
}
case CallStatus::PEER_PAUSED:
case CallStatus::PAUSED:
{
- _smartList_->SelectedItem = item;
+ SmartPanelItemsViewModel::instance->_selectedItem = item;
summonVideoPage();
break;
}
@@ -170,6 +178,7 @@ SmartPanel::SmartPanel()
RingD::instance->registrationStateErrorGeneric += ref new RingClientUWP::RegistrationStateErrorGeneric(this, &RingClientUWP::Views::SmartPanel::OnregistrationStateErrorGeneric);
RingD::instance->registrationStateRegistered += ref new RingClientUWP::RegistrationStateRegistered(this, &RingClientUWP::Views::SmartPanel::OnregistrationStateRegistered);
RingD::instance->callPlaced += ref new RingClientUWP::CallPlaced(this, &RingClientUWP::Views::SmartPanel::OncallPlaced);
+ RingD::instance->incomingAccountMessage += ref new RingClientUWP::IncomingAccountMessage(this, &RingClientUWP::Views::SmartPanel::OnincomingAccountMessage);
menuOpen = MenuOpen::CONTACTS_LIST;
}
@@ -214,9 +223,10 @@ RingClientUWP::Views::SmartPanel::updatePageContent()
}
+// refacto : rm me
void RingClientUWP::Views::SmartPanel::unselectContact()
{
- _smartList_->SelectedItem = nullptr;
+ // _smartList_->SelectedItem = nullptr;
}
void RingClientUWP::Views::SmartPanel::_smartGridButton__Clicked(Object^ sender, RoutedEventArgs^ e)
@@ -535,6 +545,13 @@ SmartPanel::_callContact__Click(Platform::Object^ sender, Windows::UI::Xaml::Rou
RingD::instance->placeCall(contact);
}
+ /* move the item of the top of the list */
+ unsigned int index;
+ if (_smartList_->Items->IndexOf(item, &index)) {
+ SmartPanelItemsViewModel::instance->moveItemToTheTop(item);
+ _smartList_->UpdateLayout();
+ _smartList_->ScrollIntoView(item);
+ }
}
}
}
@@ -577,17 +594,17 @@ void RingClientUWP::Views::SmartPanel::Grid_PointerExited(Platform::Object^ send
}
}
-
+// refacto : rm
void RingClientUWP::Views::SmartPanel::_contactItem__PointerReleased(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e)
{
- auto listBoxItem = dynamic_cast<ListBoxItem^>(sender);
+ /*auto listBoxItem = dynamic_cast<ListBoxItem^>(sender);
auto smartPanelItem = dynamic_cast<SmartPanelItem^>(listBoxItem->DataContext);
if (_smartList_->SelectedItem != smartPanelItem)
_smartList_->SelectedItem = smartPanelItem;
else
_smartList_->SelectedItem = nullptr;
-
+ */
}
void RingClientUWP::Views::SmartPanel::generateQRcode()
@@ -1646,10 +1663,9 @@ SmartPanel::populateVideoRateSettingsComboBox()
void RingClientUWP::Views::SmartPanel::_ringTxtBx__KeyUp(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e)
{
if (e->Key == Windows::System::VirtualKey::Enter) {
- /// (XXX) RingD::instance->lookUpName(_ringTxtBx_->Text);
for (auto item : SmartPanelItemsViewModel::instance->itemsList) {
if (item->_contact->_name == _ringTxtBx_->Text) {
- _smartList_->SelectedItem = item;
+ SmartPanelItemsViewModel::instance->_selectedItem = item;
return;
}
}
@@ -1744,7 +1760,7 @@ void RingClientUWP::Views::SmartPanel::OnregistrationStateRegistered()
void RingClientUWP::Views::SmartPanel::OncallPlaced(Platform::String ^callId)
{
- _smartList_->SelectedItem = nullptr;
+ SmartPanelItemsViewModel::instance->_selectedItem = nullptr;
}
Object ^ RingClientUWP::Views::ContactStatusNotification::Convert(Object ^ value, Windows::UI::Xaml::Interop::TypeName targetType, Object ^ parameter, String ^ language)
@@ -1783,14 +1799,12 @@ void RingClientUWP::Views::SmartPanel::Grid_PointerReleased(Platform::Object^ se
}
if (contact->_contactStatus == ContactStatus::WAITING_FOR_ACTIVATION) {
- //_smartList_->SelectedItem = nullptr;
return;
}
/* if the contact was already selected, just do a deselection and live the message text page*/
if (item == SmartPanelItemsViewModel::instance->_selectedItem)
{
- //_smartList_->SelectedItem = nullptr;
SmartPanelItemsViewModel::instance->_selectedItem = nullptr;
summonWelcomePage();
return;
@@ -1834,3 +1848,18 @@ Object ^ RingClientUWP::Views::boolToVisibility::ConvertBack(Object ^ value, Win
RingClientUWP::Views::boolToVisibility::boolToVisibility()
{}
+
+
+void RingClientUWP::Views::SmartPanel::OnincomingAccountMessage(Platform::String ^accountId, Platform::String ^from, Platform::String ^payload)
+{
+ auto contact = ContactsViewModel::instance->findContactByRingId(from);
+ auto item = SmartPanelItemsViewModel::instance->findItem(contact);
+
+ /* move the item of the top of the list */
+ unsigned int index;
+ if (_smartList_->Items->IndexOf(item, &index)) {
+ SmartPanelItemsViewModel::instance->moveItemToTheTop(item);
+ _smartList_->UpdateLayout();
+ _smartList_->ScrollIntoView(item);
+ }
+}
diff --git a/SmartPanel.xaml.h b/SmartPanel.xaml.h
index 93926ce..72e47a5 100644
--- a/SmartPanel.xaml.h
+++ b/SmartPanel.xaml.h
@@ -197,6 +197,7 @@ private:
MenuOpen menuOpen;
void Grid_PointerReleased(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e);
+ void OnincomingAccountMessage(Platform::String ^accountId, Platform::String ^from, Platform::String ^payload);
};
}
}
diff --git a/SmartPanelItemsViewModel.cpp b/SmartPanelItemsViewModel.cpp
index 8147ff0..b06cd06 100644
--- a/SmartPanelItemsViewModel.cpp
+++ b/SmartPanelItemsViewModel.cpp
@@ -84,3 +84,16 @@ void RingClientUWP::ViewModel::SmartPanelItemsViewModel::removeItem(SmartPanelIt
if (itemsList->IndexOf(item, &index))
itemsList->RemoveAt(index);
}
+
+void RingClientUWP::ViewModel::SmartPanelItemsViewModel::moveItemToTheTop(SmartPanelItem ^ item)
+{
+ unsigned int index;
+
+ if (itemsList->IndexOf(item, &index)) {
+ if (index != 0) {
+ itemsList->RemoveAt(index);
+ itemsList->InsertAt(0, item);
+ item->_isHovered = false;
+ }
+ }
+}
diff --git a/SmartPanelItemsViewModel.h b/SmartPanelItemsViewModel.h
index e365699..ea854e0 100644
--- a/SmartPanelItemsViewModel.h
+++ b/SmartPanelItemsViewModel.h
@@ -47,6 +47,7 @@ internal:
unsigned int getIndex(String^ callId);
unsigned int getIndex(Contact^ contact);
void removeItem(SmartPanelItem^ item);
+ void moveItemToTheTop(SmartPanelItem^ item);
property Vector<SmartPanelItem^>^ itemsList
{
--
GitLab