Commit b9cddd3b authored by Nicolas Jager's avatar Nicolas Jager

smartpanel : updates menu buttons

- set the same style to all buttons.

Change-Id: Id70e6d0121521a45686b04ca6a86e75514b8089e
Tuleap: #790
parent 670e7f77
......@@ -113,6 +113,8 @@
<!-- hamburger button. -->
<Button x:Name="_toggleSmartBoxButton_"
Grid.Row="0"
FontWeight="Bold"
FontSize="20"
Content="&#xE700;"
Click="_toggleSmartBoxButton__Click"
HorizontalAlignment="Center"
......
......@@ -391,7 +391,7 @@
<Grid.RowDefinitions>
<!-- where the selected account is shown. -->
<RowDefinition x:Name="_selectedAccountRow_"
Height="90"/>
Height="60"/>
<!-- where the drop down menus are shown. -->
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
......@@ -399,13 +399,13 @@
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition x:Name="_selectedAccountAvatarColumn_"
Width="90"/>
Width="60"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Ellipse
x:Name="_selectedAccountAvatarContainer_"
Height="80"
Width="80"
Height="50"
Width="50"
Grid.Column="0"
Stroke="White"
StrokeThickness="3"
......@@ -422,8 +422,8 @@
<Ellipse
x:Name="_shaderPhotoboothIcon_"
Visibility="Collapsed"
Height="80"
Width="80"
Height="50"
Width="50"
Grid.Column="0"
IsHitTestVisible="False"
Fill="Black"
......@@ -440,46 +440,52 @@
<StackPanel Grid.Column="1"
VerticalAlignment="Bottom">
<TextBlock x:Name="_selectedAccountName_"
Text="[TEXT MISSING]"
Margin="10,0,0,10"
Text="the wizard will be sumoned..."
Margin="10"
VerticalAlignment="Center"
TextTrimming="CharacterEllipsis"
Style="{StaticResource TextStyle2}"/>
<StackPanel Orientation="Horizontal">
<!--Content="&#xE0A1;-->
<Button x:Name="_smartGridButton_"
<!-- contacts list -->
<ToggleButton x:Name="_contactsListMenuButton_"
VerticalAlignment="Bottom"
Content="&#xe716;"
Click="_smartGridButton__Clicked"
Style="{StaticResource smartGridButtonStyle}"/>
Click="_contactsListMenuButton__Click"
Style="{StaticResource ToggleButtonStyle2}"/>
<!-- account menu -->
<ToggleButton x:Name="_accountsMenuButton_"
VerticalAlignment="Bottom"
Click="_accountsMenuButton__Click"
Content="&#xE168;"
Checked="_accountsMenuButton__Checked"
Unchecked="_accountsMenuButton__Unchecked"
Style="{StaticResource ToggleButtonStyle1}"/>
Style="{StaticResource ToggleButtonStyle2}"/>
<!-- _shareMenuButton_ -->
<ToggleButton x:Name="_shareMenuButton_"
VerticalAlignment="Bottom"
Checked="_shareMenuButton__Checked"
Unchecked="_shareMenuButton__Unchecked"
Style="{StaticResource ToggleButtonStyle1}">
<Image Source="Assets/qrCodeIcon.png"
Stretch="Uniform"/>
Click="_shareMenuButton__Click"
Style="{StaticResource ToggleButtonStyle2}">
<StackPanel>
<Image x:Name="_qrCodeIconWhite_"
Source="Assets/qrCodeIconWhite.png"
Visibility="Visible"
Stretch="None"/>
<Image x:Name="_qrCodeIconBlack_"
Visibility="Collapsed"
Source="Assets/qrCodeIconBlack.png"
Stretch="None"/>
</StackPanel>
</ToggleButton>
<!-- _devicesMenuButton_ -->
<ToggleButton x:Name="_devicesMenuButton_"
VerticalAlignment="Bottom"
Click="_devicesMenuButton__Click"
Content="&#xE836;"
Checked="_devicesMenuButton__Checked"
Unchecked="_devicesMenuButton__Unchecked"
Style="{StaticResource ToggleButtonStyle1}"/>
Style="{StaticResource ToggleButtonStyle2}"/>
<!-- _settingsMenuButton_ -->
<ToggleButton x:Name="_settingsMenuButton_"
Click="_settingsMenuButton__Click"
VerticalAlignment="Bottom"
Content="&#xE115;"
Checked="_settingsMenu__Checked"
Unchecked="_settingsMenu__Unchecked"
Style="{StaticResource ToggleButtonStyle1}"/>
Style="{StaticResource ToggleButtonStyle2}"/>
</StackPanel>
</StackPanel>
</Grid>
......@@ -487,9 +493,6 @@
<!--sub menus like the accounts list or the share menu are just below, technicaly they are nested inside the
same row. To summon them we use the visibility of their own grid, by linking it to a toggle button-->
</Grid>
<!-- smartList and settings. -->
<Grid Grid.Row="1"
......@@ -916,8 +919,7 @@
Grid.Row="0"
Background="#3bc1d3">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="30"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal"
......@@ -936,7 +938,7 @@
<StackPanel x:Name="_step1Menu_"
Background="#FFE4F1F9"
Padding="10"
Grid.Row="1">
Grid.Row="0">
<TextBlock Text="To link this device to a Ring account, you'll first need to generate a PIN from Ring on a device hosting the account."
TextWrapping="Wrap"
TextAlignment="Justify"/>
......@@ -948,7 +950,7 @@
<StackPanel x:Name="_step2Menu_"
Background="#FFE4F1F9"
Visibility="Collapsed"
Grid.Row="1">
Grid.Row="0">
<TextBox x:Name="_PINTextBox_"
Margin="10"
GotFocus="_PINTextBox__GotFocus"
......@@ -962,7 +964,7 @@
Text=""/>
</StackPanel>
<!-- buttons next step and yes/no to add the account. -->
<Grid Grid.Row="2">
<Grid Grid.Row="1">
<StackPanel Orientation="Horizontal"
Padding="10,0"
HorizontalAlignment="Center">
......@@ -1120,6 +1122,7 @@
<PasswordBox x:Name="_passwordForPinGenerator_"
Margin="10"
Grid.Row="1"
KeyUp="_passwordForPinGenerator__KeyUp"
PlaceholderText="Enter your password"/>
</Grid>
<!-- buttons yes/no to generate a PIN. -->
......@@ -1209,7 +1212,6 @@
Foreground="Black"
Background="White"
TextWrapping="Wrap"
KeyDown="_ringTxtBx__KeyDown"
KeyUp="_ringTxtBx__KeyUp"
Text="">
</TextBox>
......
This diff is collapsed.
......@@ -121,7 +121,6 @@ public ref class SmartPanel sealed
public:
SmartPanel();
void updatePageContent();
void unselectContact();
internal:
enum class Mode { Minimized, Normal };
......@@ -135,19 +134,11 @@ internal:
private:
/* functions */
void _smartGridButton__Clicked(Object^ sender, RoutedEventArgs^ e);
void _accountsMenuButton__Checked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _accountsMenuButton__Unchecked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _settingsMenu__Checked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _settingsMenu__Unchecked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _shareMenuButton__Checked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _shareMenuButton__Unchecked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _addAccountBtn__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _createAccountYes__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _createAccountNo__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _smartList__SelectionChanged(Platform::Object^ sender, Windows::UI::Xaml::Controls::SelectionChangedEventArgs^ e);
void _accountList__SelectionChanged(Platform::Object^ sender, Windows::UI::Xaml::Controls::SelectionChangedEventArgs^ e);
void _ringTxtBx__KeyDown(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e);
void _ringTxtBx__Click(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e);
void _rejectIncomingCallBtn__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _acceptIncomingCallBtn__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
......@@ -155,7 +146,6 @@ private:
void _cancelCallBtn__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void Grid_PointerEntered(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e);
void Grid_PointerExited(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e);
void _contactItem__PointerReleased(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e);
void generateQRcode();
void _videoDeviceComboBox__SelectionChanged(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^);
void _videoResolutionComboBox__SelectionChanged(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^);
......@@ -169,8 +159,6 @@ private:
void showLinkThisDeviceStep1();
/* members */
void _devicesMenuButton__Unchecked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _devicesMenuButton__Checked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _addDevice__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void OndevicesListRefreshed(Platform::Collections::Vector<Platform::String ^, std::equal_to<Platform::String ^>, true> ^devicesList);
void _pinGeneratorYes__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
......@@ -217,10 +205,19 @@ private:
SETTINGS
};
void selectMenu(MenuOpen menu);
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);
void _ringTxtBx__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _contactsListMenuButton__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _accountsMenuButton__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _shareMenuButton__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _devicesMenuButton__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _settingsMenuButton__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _passwordForPinGenerator__KeyUp(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e);
void requestPin();
};
}
}
This diff is collapsed.
......@@ -282,7 +282,8 @@
<Image Include="Assets\AccountTypeRING.png" />
<Image Include="Assets\AccountTypeSIP.png" />
<Image Include="Assets\LockScreenLogo.scale-200.png" />
<Image Include="Assets\qrCodeIcon.png" />
<Image Include="Assets\qrCodeIconBlack.png" />
<Image Include="Assets\qrCodeIconWhite.png" />
<Image Include="Assets\SplashScreen.scale-200.png" />
<Image Include="Assets\Square150x150Logo.scale-200.png" />
<Image Include="Assets\Square44x44Logo.scale-200.png" />
......
......@@ -206,7 +206,10 @@
<Image Include="Assets\Wide310x150Logo.scale-200.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\qrCodeIcon.png">
<Image Include="Assets\qrCodeIconBlack.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\qrCodeIconWhite.png">
<Filter>Assets</Filter>
</Image>
</ItemGroup>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment