Commit aeb4a5c5 authored by atraczyk's avatar atraczyk Committed by Andreas Traczyk

ui/ux: homogenizes parts of the ui

- makes chat messages selectable
- changes ui colors to the Ring blue shades
- attempts to resize the window appropriately at app start
- adds confirmation modals for removing converstations and contacts
- corrects and error in the debug logger
- corrects vcardutils not handling JPEGs

Change-Id: I2c8a63f9c18c734a25dfd61086b137143cdac659
Tuleap: #790
parent 1f3cd1c4
...@@ -54,19 +54,27 @@ App::OnLaunched(LaunchActivatedEventArgs^ e) ...@@ -54,19 +54,27 @@ App::OnLaunched(LaunchActivatedEventArgs^ e)
rootFrame->Navigate(TypeName(Views::LoadingPage::typeid), e->Arguments); rootFrame->Navigate(TypeName(Views::LoadingPage::typeid), e->Arguments);
Window::Current->Content = rootFrame; Window::Current->Content = rootFrame;
Window::Current->Activate(); }
} else else {
rootFrame->Navigate(TypeName(Views::LoadingPage::typeid), e->Arguments); rootFrame->Navigate(TypeName(Views::LoadingPage::typeid), e->Arguments);
Window::Current->Content = rootFrame;
}
ApplicationView::GetForCurrentView()->SetPreferredMinSize(Size(500, 500));
Window::Current->Activate();
auto color = Windows::UI::ColorHelper::FromArgb(255, 59, 193, 211);
ApplicationView::GetForCurrentView()->TitleBar->ButtonBackgroundColor = Colors::LightBlue; ApplicationView::GetForCurrentView()->TitleBar->ButtonBackgroundColor = color;
ApplicationView::GetForCurrentView()->TitleBar->InactiveBackgroundColor = Colors::LightBlue; ApplicationView::GetForCurrentView()->TitleBar->InactiveBackgroundColor = color;
ApplicationView::GetForCurrentView()->TitleBar->ButtonInactiveBackgroundColor = Colors::LightBlue; ApplicationView::GetForCurrentView()->TitleBar->ButtonInactiveBackgroundColor = color;
ApplicationView::GetForCurrentView()->TitleBar->BackgroundColor = Colors::LightBlue; ApplicationView::GetForCurrentView()->TitleBar->BackgroundColor = color;
ApplicationView::GetForCurrentView()->TitleBar->ForegroundColor = Colors::White; ApplicationView::GetForCurrentView()->TitleBar->ForegroundColor = Colors::White;
ApplicationView::GetForCurrentView()->TitleBar->ButtonForegroundColor = Colors::White; ApplicationView::GetForCurrentView()->TitleBar->ButtonForegroundColor = Colors::White;
} }
void App::OnsummonWizard() void App::OnsummonWizard()
{ {
ApplicationView::GetForCurrentView()->TryResizeView(Size(400, 600));
rootFrame->Navigate(Windows::UI::Xaml::Interop::TypeName(Views::Wizard::typeid)); rootFrame->Navigate(Windows::UI::Xaml::Interop::TypeName(Views::Wizard::typeid));
} }
\ No newline at end of file
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<Grid x:Name="_hamburgerButtonBar_" <Grid x:Name="_hamburgerButtonBar_"
Canvas.ZIndex="0" Canvas.ZIndex="0"
Grid.Row="0" Grid.Row="0"
Background="LightBlue" Background="#3bc1d3"
Width="320" Width="320"
HorizontalAlignment="Left"> HorizontalAlignment="Left">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
......
...@@ -55,6 +55,8 @@ MainPage::MainPage() ...@@ -55,6 +55,8 @@ MainPage::MainPage()
{ {
InitializeComponent(); InitializeComponent();
ApplicationView::GetForCurrentView()->TryResizeView(Size(1024, 768));
UserModel::instance->getUserData(); UserModel::instance->getUserData();
Window::Current->SizeChanged += ref new WindowSizeChangedEventHandler(this, &MainPage::OnResize); Window::Current->SizeChanged += ref new WindowSizeChangedEventHandler(this, &MainPage::OnResize);
...@@ -156,7 +158,7 @@ RingClientUWP::MainPage::showLoadingOverlay(bool load, bool modal) ...@@ -156,7 +158,7 @@ RingClientUWP::MainPage::showLoadingOverlay(bool load, bool modal)
_loadingOverlayRect_->Opacity = 1.0; _loadingOverlayRect_->Opacity = 1.0;
} }
TimeSpan delay; TimeSpan delay;
delay.Duration = 500000; delay.Duration = 10000 * 50;
ThreadPoolTimer^ delayTimer = ThreadPoolTimer::CreateTimer( ThreadPoolTimer^ delayTimer = ThreadPoolTimer::CreateTimer(
ref new TimerElapsedHandler([this](ThreadPoolTimer^ source) ref new TimerElapsedHandler([this](ThreadPoolTimer^ source)
{ {
...@@ -167,7 +169,7 @@ RingClientUWP::MainPage::showLoadingOverlay(bool load, bool modal) ...@@ -167,7 +169,7 @@ RingClientUWP::MainPage::showLoadingOverlay(bool load, bool modal)
})); }));
}), delay); }), delay);
} }
else if (!load) { else if (!load && isLoading) {
isLoading = false; isLoading = false;
_fadeOutStoryboard_->Begin(); _fadeOutStoryboard_->Begin();
} }
...@@ -182,12 +184,6 @@ RingClientUWP::MainPage::PositionImage() ...@@ -182,12 +184,6 @@ RingClientUWP::MainPage::PositionImage()
auto bitmapImage = ref new Windows::UI::Xaml::Media::Imaging::BitmapImage(); auto bitmapImage = ref new Windows::UI::Xaml::Media::Imaging::BitmapImage();
Windows::Foundation::Uri^ uri; Windows::Foundation::Uri^ uri;
uri = ref new Windows::Foundation::Uri("ms-appx:///Assets/SplashScreen.scale-200.png");
bitmapImage->UriSource = uri;
img->Source = bitmapImage;
_loadingImage_->Source = img->Source;
_loadingImage_->SetValue(Canvas::LeftProperty, bounds.Width * 0.5 - _loadingImage_->Width * 0.5); _loadingImage_->SetValue(Canvas::LeftProperty, bounds.Width * 0.5 - _loadingImage_->Width * 0.5);
_loadingImage_->SetValue(Canvas::TopProperty, bounds.Height * 0.5 - _loadingImage_->Height * 0.5); _loadingImage_->SetValue(Canvas::TopProperty, bounds.Height * 0.5 - _loadingImage_->Height * 0.5);
} }
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<views:BubbleHorizontalAlignement x:Key="_bubbleHorizontalAlignement_" /> <views:BubbleHorizontalAlignement x:Key="_bubbleHorizontalAlignement_" />
<DataTemplate x:Key="ConversationMessageTemplate" <DataTemplate x:Key="ConversationMessageTemplate"
x:DataType="local:ConversationMessage"> x:DataType="local:ConversationMessage">
<Grid Margin="0" <Grid Margin="6,0,12,0"
HorizontalAlignment="{x:Bind FromContact, Converter={StaticResource _bubbleHorizontalAlignement_}}" > HorizontalAlignment="{x:Bind FromContact, Converter={StaticResource _bubbleHorizontalAlignement_}}" >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="2*" /> <ColumnDefinition Width="2*" />
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<!--Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."--> <!--Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."-->
<TextBlock x:Name="_msgContent_" <TextBlock x:Name="_msgContent_"
TextWrapping="Wrap" TextWrapping="Wrap"
IsTextSelectionEnabled="True"
Text="{x:Bind Payload}" Text="{x:Bind Payload}"
Foreground="White"/> Foreground="White"/>
</ContentPresenter> </ContentPresenter>
...@@ -89,7 +90,7 @@ ...@@ -89,7 +90,7 @@
Margin="{TemplateBinding BorderThickness}" Margin="{TemplateBinding BorderThickness}"
Opacity="1" Opacity="1"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
BorderBrush="LightBlue" BorderBrush="#3bc1d3"
BorderThickness="1" BorderThickness="1"
Grid.RowSpan="1"/> Grid.RowSpan="1"/>
<ScrollViewer x:Name="ContentElement" <ScrollViewer x:Name="ContentElement"
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
Background="Transparent" Background="Transparent"
Grid.Row="1" Grid.Row="1"
FontFamily="Segoe MDL2 Assets" FontFamily="Segoe MDL2 Assets"
Foreground="LightBlue" Foreground="#3bc1d3"
Content="&#xE122;" Content="&#xE122;"
IsTabStop="False" IsTabStop="False"
Grid.Column="1" Grid.Column="1"
...@@ -139,59 +140,92 @@ ...@@ -139,59 +140,92 @@
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="auto" /> <RowDefinition Height="auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" <Grid Grid.Row="0"
Background="White" Background="White"
Height="90" Height="90">
Orientation="Horizontal" <Grid.RowDefinitions>
Padding="10,10"> <RowDefinition Height="60" />
<Image Source="ms-appx:///contact-avatar-test.png" /> <RowDefinition Height="30" />
<StackPanel> </Grid.RowDefinitions>
<Grid> <Grid Grid.Row="0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="280"/>
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="140"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock x:Name="_title_" <Ellipse Grid.Column="0"
Grid.Column="0" Width="50"
Text="[TEXT MISSING]" Height="50">
TextWrapping="NoWrap" <Ellipse.Fill>
VerticalAlignment="Center" <ImageBrush x:Name="_contactBarAvatar_"
FontSize="20" ImageSource="ms-appx:///Assets/TESTS/contactAvatar.png"/>
Margin="20,0" /> </Ellipse.Fill>
<Button x:Name="_audioCall_" </Ellipse>
<TextBlock x:Name="_title_"
Grid.Column="1" Grid.Column="1"
Click="_audioCall__Click" Text="[TEXT MISSING]"
Content="audio call"/> TextWrapping="NoWrap"
<Button x:Name="_videoCall_" TextTrimming="CharacterEllipsis"
Click="_videoCall__Click" VerticalAlignment="Center"
FontSize="18"
Margin="6" />
<ComboBox x:Name="_associableAccountsList_"
Grid.Column="2" Grid.Column="2"
Content="video call"/> Margin="6,14,6,6"
</Grid> Visibility="Collapsed">
<StackPanel Orientation="Horizontal"> <ComboBox.ItemTemplate>
<ComboBox x:Name="_associableAccountsList_"> <DataTemplate x:DataType="local:Account">
<ComboBox.ItemTemplate> <TextBlock Text="{x:Bind name_, Mode=OneWay}" />
<DataTemplate x:DataType="local:Account"> </DataTemplate>
<StackPanel Orientation="Horizontal"> </ComboBox.ItemTemplate>
<TextBlock Text="{x:Bind name_, Mode=OneWay}" /> </ComboBox>
</StackPanel> </Grid>
</DataTemplate> <Grid Grid.Row="1">
</ComboBox.ItemTemplate> <Grid.ColumnDefinitions>
</ComboBox> <ColumnDefinition Width="auto"/>
<Button x:Name="_deleteContact_" <ColumnDefinition Width="auto"/>
Content="delete" <ColumnDefinition Width="auto"/>
Click="_deleteContact__Click"/> <ColumnDefinition Width="auto"/>
<Button x:Name="_clearConversation_" </Grid.ColumnDefinitions>
Content="clear conversation" <Button x:Name="_videoCall_"
Click="_clearConversation__Click"/> Click="_videoCall__Click"
</StackPanel> Grid.Column="0"
</StackPanel> Content="&#xE714;"
FontFamily="Segoe MDL2 Assets"
</StackPanel> FontSize="14"
Style="{StaticResource ButtonStyle4}"
Margin="6,2,6,6"/>
<Button x:Name="_audioCall_"
Grid.Column="1"
Click="_audioCall__Click"
Content="&#xE13A;"
FontSize="14"
FontFamily="Segoe MDL2 Assets"
Style="{StaticResource ButtonStyle4}"
Margin="6,2,6,6"/>
<Button x:Name="_clearConversation_"
Grid.Column="2"
Click="_clearConversation__Click"
Content="&#xE894;"
FontFamily="Segoe MDL2 Assets"
FontSize="14"
Style="{StaticResource ButtonStyle4}"
Margin="6,2,6,6"/>
<Button x:Name="_deleteContact_"
Grid.Column="3"
Click="_deleteContact__Click"
Content="&#xE74D;"
FontFamily="Segoe MDL2 Assets"
FontSize="14"
Style="{StaticResource ButtonStyle4}"
Margin="6,2,6,6"/>
</Grid>
</Grid>
<ScrollViewer x:Name="_scrollView_" <ScrollViewer x:Name="_scrollView_"
BorderThickness="0,1,0,0" BorderThickness="0,0,0,0"
BorderBrush="LightBlue" BorderBrush="#3bc1d3"
Grid.Row="1"> Grid.Row="1"
ScrollViewer.VerticalScrollBarVisibility="Auto">
<StackPanel> <StackPanel>
<ListBox x:Name="_messagesList_" <ListBox x:Name="_messagesList_"
Margin="0" Margin="0"
......
...@@ -40,6 +40,8 @@ using namespace Windows::ApplicationModel::Core; ...@@ -40,6 +40,8 @@ using namespace Windows::ApplicationModel::Core;
using namespace Platform; using namespace Platform;
using namespace Windows::UI::Core; using namespace Windows::UI::Core;
using namespace Windows::UI::Popups;
MessageTextPage::MessageTextPage() MessageTextPage::MessageTextPage()
{ {
InitializeComponent(); InitializeComponent();
...@@ -72,6 +74,10 @@ RingClientUWP::Views::MessageTextPage::updatePageContent() ...@@ -72,6 +74,10 @@ RingClientUWP::Views::MessageTextPage::updatePageContent()
/* show the name of contact on the page */ /* show the name of contact on the page */
_title_->Text = contact->name_; _title_->Text = contact->name_;
String^ image_path = Utils::toPlatformString(RingD::instance->getLocalFolder()) + ".vcards\\" + contact->_vcardUID + ".png";
auto uri = ref new Windows::Foundation::Uri(image_path);
_contactBarAvatar_->ImageSource = ref new Windows::UI::Xaml::Media::Imaging::BitmapImage(uri);
/* show messages */ /* show messages */
_messagesList_->ItemsSource = contact->_conversation->_messages; _messagesList_->ItemsSource = contact->_conversation->_messages;
...@@ -138,10 +144,9 @@ RingClientUWP::Views::MessageTextPage::sendMessage() ...@@ -138,10 +144,9 @@ RingClientUWP::Views::MessageTextPage::sendMessage()
Object ^ RingClientUWP::Views::BubbleBackground::Convert(Object ^ value, Windows::UI::Xaml::Interop::TypeName targetType, Object ^ parameter, String ^ language) Object ^ RingClientUWP::Views::BubbleBackground::Convert(Object ^ value, Windows::UI::Xaml::Interop::TypeName targetType, Object ^ parameter, String ^ language)
{ {
auto settings = ref new Windows::UI::ViewManagement::UISettings(); auto color1 = Windows::UI::ColorHelper::FromArgb(255, 0, 76, 96);
auto color = settings->GetColorValue(Windows::UI::ViewManagement::UIColorType::Accent); auto color2 = Windows::UI::ColorHelper::FromArgb(255, 58, 192, 210);
return ((bool)value) ? ref new SolidColorBrush(color1) : ref new SolidColorBrush(color2);
return ((bool)value) ? ref new SolidColorBrush(color) : ref new SolidColorBrush(Windows::UI::Colors::LightBlue);
} }
// we only do OneWay so the next function is not used // we only do OneWay so the next function is not used
...@@ -185,10 +190,20 @@ void RingClientUWP::Views::MessageTextPage::_deleteContact__Click(Platform::Obje ...@@ -185,10 +190,20 @@ void RingClientUWP::Views::MessageTextPage::_deleteContact__Click(Platform::Obje
auto item = SmartPanelItemsViewModel::instance->_selectedItem; auto item = SmartPanelItemsViewModel::instance->_selectedItem;
auto contact = item->_contact; auto contact = item->_contact;
closeMessageTextPage(); auto messageDialog = ref new MessageDialog("Are you sure you want to remove this contact?", "Remove Contact");
messageDialog->Commands->Append(ref new UICommand("Cancel", ref new UICommandInvokedHandler([this](IUICommand^ command)
{})));
messageDialog->Commands->Append(ref new UICommand("Remove", ref new UICommandInvokedHandler([=](IUICommand^ command)
{
closeMessageTextPage();
ContactsViewModel::instance->deleteContact(contact);
SmartPanelItemsViewModel::instance->removeItem(item);
})));
messageDialog->DefaultCommandIndex = 1;
ContactsViewModel::instance->deleteContact(contact); messageDialog->ShowAsync();
SmartPanelItemsViewModel::instance->removeItem(item);
} }
...@@ -196,8 +211,20 @@ void RingClientUWP::Views::MessageTextPage::_clearConversation__Click(Platform:: ...@@ -196,8 +211,20 @@ void RingClientUWP::Views::MessageTextPage::_clearConversation__Click(Platform::
{ {
auto item = SmartPanelItemsViewModel::instance->_selectedItem; auto item = SmartPanelItemsViewModel::instance->_selectedItem;
auto contact = item->_contact; auto contact = item->_contact;
contact->_conversation->_messages->Clear();
contact->saveConversationToFile(); auto messageDialog = ref new MessageDialog("Are you sure you want to clear the conversation?", "Clear conversation");
messageDialog->Commands->Append(ref new UICommand("Cancel", ref new UICommandInvokedHandler([this](IUICommand^ command)
{})));
messageDialog->Commands->Append(ref new UICommand("Clear", ref new UICommandInvokedHandler([=](IUICommand^ command)
{
contact->_conversation->_messages->Clear();
contact->saveConversationToFile();
})));
messageDialog->DefaultCommandIndex = 1;
messageDialog->ShowAsync();
} }
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="Savoir-faireLinux.GNURing" Publisher="CN=8121A5F7-3CA1-4CAA-92B2-4F595B011941" Version="1.1.10.0" /> <Identity Name="Savoir-faireLinux.GNURing" Publisher="CN=8121A5F7-3CA1-4CAA-92B2-4F595B011941" Version="1.1.11.0" />
<mp:PhoneIdentity PhoneProductId="2385953f-9019-423d-aa82-d1bbacfa258b" PhonePublisherId="00000000-0000-0000-0000-000000000000" /> <mp:PhoneIdentity PhoneProductId="2385953f-9019-423d-aa82-d1bbacfa258b" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties> <Properties>
<DisplayName>GNU Ring</DisplayName> <DisplayName>GNU Ring</DisplayName>
......
...@@ -71,6 +71,7 @@ RingDebug::print(const std::string& message, const Type& type, ...@@ -71,6 +71,7 @@ RingDebug::print(const std::string& message, const Type& type,
/* set message type. */ /* set message type. */
wString = (type>Type::WNG)?(L"(EE) "):((type>Type::MSG)?(L"(WW) "):(L"")) + wString; wString = (type>Type::WNG)?(L"(EE) "):((type>Type::MSG)?(L"(WW) "):(L"")) + wString;
String^ msg;
#if UWP_DBG_VS #if UWP_DBG_VS
/* screen it into VS debug console */ /* screen it into VS debug console */
OutputDebugString((wString + L"\n").c_str()); OutputDebugString((wString + L"\n").c_str());
...@@ -78,7 +79,7 @@ RingDebug::print(const std::string& message, const Type& type, ...@@ -78,7 +79,7 @@ RingDebug::print(const std::string& message, const Type& type,
#if UWP_DBG_CLIENT #if UWP_DBG_CLIENT
/* fire the event. */ /* fire the event. */
auto msg = ref new String(wString.c_str(), wString.length()); msg = ref new String(wString.c_str(), wString.length());
messageToScreen(msg); messageToScreen(msg);
#endif #endif
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#define UWP_DBG_CLIENT 0 #define UWP_DBG_CLIENT 0
#define UWP_DBG_VS 1 #define UWP_DBG_VS 1
#define UWP_DBG_FILE 0 #define UWP_DBG_FILE 1
using namespace Windows::Storage; using namespace Windows::Storage;
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<Grid Margin="0,10"> <Grid Margin="0,10">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="40"/> <ColumnDefinition Width="40"/>
<ColumnDefinition Width="290"/> <ColumnDefinition Width="280"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Grid.Column="0" <Border Grid.Column="0"
Margin="5,0" Margin="5,0"
...@@ -113,10 +113,14 @@ ...@@ -113,10 +113,14 @@
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Background="Transparent" Background="Transparent"
BorderThickness="0"
Padding="0,4,0,2"
Margin="0,0,12,0"
Width="28"
Visibility="{x:Bind _isSelected, Converter={StaticResource _AccountSelectedToVisibility_}, Mode=OneWay}" Visibility="{x:Bind _isSelected, Converter={StaticResource _AccountSelectedToVisibility_}, Mode=OneWay}"
Grid.Column="1"> Grid.Column="1">
<Button.RenderTransform> <Button.RenderTransform>
<TranslateTransform X="-5" Y="-5"/> <TranslateTransform Y="-10"/>
</Button.RenderTransform> </Button.RenderTransform>
</Button> </Button>
<StackPanel Grid.Column="1"> <StackPanel Grid.Column="1">
...@@ -277,7 +281,7 @@ ...@@ -277,7 +281,7 @@
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- drop down menus. --> <!-- drop down menus. -->
<Grid Background="LightBlue"> <Grid Background="#3bc1d3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<!-- where the selected account is shown. --> <!-- where the selected account is shown. -->
<RowDefinition x:Name="_selectedAccountRow_" <RowDefinition x:Name="_selectedAccountRow_"
...@@ -332,7 +336,8 @@ ...@@ -332,7 +336,8 @@
VerticalAlignment="Bottom"> VerticalAlignment="Bottom">
<TextBlock x:Name="_selectedAccountName_" <TextBlock x:Name="_selectedAccountName_"
Text="[TEXT MISSING]" Text="[TEXT MISSING]"
Margin="10" Margin="10,0,0,10"
TextTrimming="CharacterEllipsis"
Style="{StaticResource TextStyle2}"/> Style="{StaticResource TextStyle2}"/>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<!--Content="&#xE0A1;--> <!--Content="&#xE0A1;-->
...@@ -377,7 +382,7 @@ ...@@ -377,7 +382,7 @@
MaxHeight="350" MaxHeight="350"
Grid.Row="1" Grid.Row="1"
Visibility="Collapsed" Visibility="Collapsed"
Background="LightBlue"> Background="#3bc1d3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="30"/> <RowDefinition Height="30"/>
...@@ -415,7 +420,7 @@ ...@@ -415,7 +420,7 @@
<Grid x:Name="_accountCreationMenuGrid_" <Grid x:Name="_accountCreationMenuGrid_"
Grid.Row="2" Grid.Row="2"
Visibility="Collapsed" Visibility="Collapsed"
Background="LightBlue"> Background="#3bc1d3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="30"/> <RowDefinition Height="30"/>
...@@ -627,7 +632,7 @@ ...@@ -627,7 +632,7 @@
<Grid x:Name="_accountAddMenuGrid_" <Grid x:Name="_accountAddMenuGrid_"
Visibility="Collapsed" Visibility="Collapsed"
Grid.Row="2" Grid.Row="2"
Background="LightBlue"> Background="#3bc1d3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
...@@ -713,7 +718,7 @@ ...@@ -713,7 +718,7 @@
<Grid x:Name="_accountEditionGrid_" <Grid x:Name="_accountEditionGrid_"
Grid.Row="2" Grid.Row="2"
Visibility="Collapsed" Visibility="Collapsed"
Background="LightBlue"> Background="#3bc1d3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="30"/> <RowDefinition Height="30"/>
...@@ -881,7 +886,7 @@ ...@@ -881,7 +886,7 @@
<Grid x:Name="_shareMenuGrid_" <Grid x:Name="_shareMenuGrid_"
Grid.Row="2" Grid.Row="2"
Visibility="Collapsed" Visibility="Collapsed"
Background="LightBlue"> Background="#3bc1d3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="30"/> <RowDefinition Height="30"/>
...@@ -894,7 +899,7 @@ ...@@ -894,7 +899,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Background="white" <Grid Background="white"
Margin="10" Margin="10"
MaxHeight="150" MaxHeight="140"
MaxWidth="140" MaxWidth="140"
Padding="5"> Padding="5">
<Image x:Name="_selectedAccountQrCode_" <Image x:Name="_selectedAccountQrCode_"
...@@ -924,14 +929,11 @@ ...@@ -924,14 +929,11 @@
<Grid x:Name="_devicesMenuGrid_" <Grid x:Name="_devicesMenuGrid_"
Grid.Row="2" Grid.Row="2"
Visibility="Collapsed" Visibility="Collapsed"
Background="LightBlue"> Background="#3bc1d3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="30"/> <RowDefinition Height="30"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ScrollViewer x:Name="_scrollViewerDevicesMenu_"
Grid.Row="0"
MaxHeight="400">
<Grid Background="#FFE4F1F9"> <Grid Background="#FFE4F1F9">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
...@@ -942,14 +944,14 @@ ...@@ -942,14 +944,14 @@
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- about this device --> <!-- about this device -->
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal"
Grid.Row="0" Grid.Row="0"
Margin="10,20"> Margin="10,20">
<TextBlock Style="{StaticResource TextSegoeStyle-20pt-black}" <TextBlock Style="{StaticResource TextSegoeStyle-20pt-black}"
Margin="0,0,10,0" Margin="0,0,10,0"
Text="&#xE211;"/> Text="&#xE211;"/>
<TextBlock Text="Your device ID"/> <TextBlock Text="Your device ID"/>
</StackPanel> </StackPanel>
<TextBlock x:Name="_deviceId_" <TextBlock x:Name="_deviceId_"
Margin="10" Margin="10"
Text="[TEXT_MISSING]" Text="[TEXT_MISSING]"
...@@ -958,16 +960,16 @@ ...@@ -958,16 +960,16 @@
Grid.Row="1" Grid.Row="1"
IsTextSelectionEnabled="True" IsTextSelectionEnabled="True"
HorizontalAlignment="Center"/> HorizontalAlignment="Center"/>
<!-- about linked devices --> <!-- about linked devices -->
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal"
Grid.Row="2" Grid.Row="2"
Margin="10,20"> Margin="10,20">
<TextBlock Style="{StaticResource TextSegoeStyle-20pt-black}" <TextBlock Style="{StaticResource TextSegoeStyle-20pt-black}"
Margin="0,0,10,0" Margin="0,0,10,0"
Text="&#xEBD2;"/> Text="&#xEBD2;"/>
<TextBlock Text="other linked devices"/> <TextBlock Text="other linked devices"/>
</StackPanel> </StackPanel>
<TextBlock x:Name="_waitingDevicesList_" <TextBlock x:Name="_waitingDevicesList_"
Text="waiting for devices list..." Text="waiting for devices list..."
Grid.Row="3" Grid.Row="3"
IsTextSelectionEnabled="True" IsTextSelectionEnabled="True"
...@@ -978,7 +980,6 @@ ...@@ -978,7 +980,6 @@
Background="#FFE4F1F9" Background="#FFE4F1F9"
Grid.Row="3"/> Grid.Row="3"/>
</Grid> </Grid>
</ScrollViewer>
<!-- button to add device. --> <!-- button to add device. -->
<Button x:Name="_addDevice_" <Button x:Name="_addDevice_"
Grid.Row="1" Grid.Row="1"
...@@ -992,7 +993,7 @@ ...@@ -992,7 +993,7 @@
<Grid x:Name="_addingDeviceGrid_" <Grid x:Name="_addingDeviceGrid_"
Grid.Row="2" Grid.Row="2"
Visibility="Collapsed" Visibility="Collapsed"
Background="LightBlue"> Background="#3bc1d3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="30"/> <RowDefinition Height="30"/>
...@@ -1038,7 +1039,7 @@ ...@@ -1038,7 +1039,7 @@
<Grid x:Name="_waitingForPin_" <Grid x:Name="_waitingForPin_"
Grid.Row="2" Grid.Row="2"
Visibility="Collapsed" Visibility="Collapsed"
Background="LightBlue"> Background="#3bc1d3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="30"/> <RowDefinition Height="30"/>
...@@ -1112,11 +1113,12 @@ ...@@ -1112,11 +1113,12 @@
Background="Transparent" Background="Transparent"
Grid.Column="1" Grid.Column="1"
FontFamily="Segoe MDL2 Assets" FontFamily="Segoe MDL2 Assets"
Foreground="LightBlue" Foreground="#3bc1d3"
Content=" &#xE1E2;" Content=" &#xE1E2;"
Click="_ringTxtBx__Click" Click="_ringTxtBx__Click"
BorderThickness="0" BorderThickness="0"
Visibility="Visible" Visibility="Visible"
IsTabStop="False"
FontSize="20" FontSize="20"
Width="38" Width="38"
Margin="6" Margin="6"
...@@ -1140,11 +1142,13 @@ ...@@ -1140,11 +1142,13 @@
<!-- settings. --> <!-- settings. -->
<Grid x:Name="_settingsMenu_" <Grid x:Name="_settingsMenu_"
Grid.Row="0" Grid.Row="0"
Visibility="Collapsed"> Visibility="Collapsed"
Background="#FFE4F1F9">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ScrollViewer> <ScrollViewer
ScrollViewer.VerticalScrollBarVisibility="Auto">
<Grid x:Name="_videoSettings_"