commit 8a85e1f2d073602a8a53f53c4758493613980dfc
author Nicolas Jager <nicolas.jager@savoirfairelinux.com> Mon Aug 15 15:11:06 2016 -0400
committer Nicolas Jager <nicolas.jager@savoirfairelinux.com> Wed Aug 24 13:33:57 2016 -0400
tree e09a3f6de3e6423b70373d87bf36ffcbd2d468e3
parent e069c41c1397d6c3ea108011db483a5c070c84b6

Work on Message Text Page

Change-Id: I5c05ff878df38aa83ed73efad65c5c84914a3331

MainPage.xaml.cpp

diff --git a/MainPage.xaml.cpp b/MainPage.xaml.cpp
index 32f3bbd..d0e1d25 100644
--- a/MainPage.xaml.cpp
+++ b/MainPage.xaml.cpp
@@ -17,6 +17,8 @@
 **************************************************************************/

 #include "pch.h"

 

+#include "ContactsViewModel.h"

+#include "MessageTextPage.xaml.h"

 #include "SmartPanel.xaml.h"

 #include "RingConsolePanel.xaml.h"

 #include "VideoPage.xaml.h"

@@ -26,6 +28,7 @@
 

 using namespace RingClientUWP;

 using namespace RingClientUWP::Views;

+using namespace RingClientUWP::ViewModel;

 

 using namespace Platform;

 using namespace Windows::ApplicationModel::Core;

@@ -54,6 +57,15 @@
     _smartPanel_->Navigate(TypeName(RingClientUWP::Views::SmartPanel::typeid));

     _consolePanel_->Navigate(TypeName(RingClientUWP::Views::RingConsolePanel::typeid));

     _videoFrame_->Navigate(TypeName(RingClientUWP::Views::VideoPage::typeid));

+    _messageTextFrame_->Navigate(TypeName(RingClientUWP::Views::MessageTextPage::typeid));

+

+    /* connect to delegates */

+    ContactsViewModel::instance->newContactSelected += ref new NewContactSelected([&]() {

+        showFrame(_messageTextFrame_);

+    });

+    ContactsViewModel::instance->noContactSelected += ref new NoContactSelected([&]() {

+        showFrame(_welcomeFrame_);

+    });

 }

 

 void

@@ -69,3 +81,20 @@
 {

     _innerSplitView_->IsPaneOpen = !_innerSplitView_->IsPaneOpen;

 }

+

+void

+RingClientUWP::MainPage::showFrame(Windows::UI::Xaml::Controls::Frame^ frame)

+{

+    _navGrid_->SetRow(_welcomeFrame_, 0);

+    _navGrid_->SetRow(_messageTextFrame_, 0);

+    _navGrid_->SetRow(_videoFrame_, 0);

+

+    if (frame == _welcomeFrame_) {

+        _navGrid_->SetRow(_welcomeFrame_, 1);

+    } else if (frame == _videoFrame_) {

+        _navGrid_->SetRow(_videoFrame_, 1);

+    } else if (frame == _messageTextFrame_) {

+        _navGrid_->SetRow(_messageTextFrame_, 1);

+        dynamic_cast<MessageTextPage^>(_messageTextFrame_->Content)->updatePageContent();

+    }

+}