Skip to content
Snippets Groups Projects
Commit b9cddd3b authored by Nicolas Jager's avatar Nicolas Jager
Browse files

smartpanel : updates menu buttons 

- set the same style to all buttons.

Change-Id: Id70e6d0121521a45686b04ca6a86e75514b8089e
Tuleap: #790
parent 670e7f77
Branches
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Assets/qrCodeIconBlack.png 0 → 100644
+ 0
− 0
View file @ b9cddd3b
Assets/qrCodeIconBlack.png

1.31 KiB

Assets/qrCodeIconWhite.png 0 → 100644
+ 0
− 0
View file @ b9cddd3b
Assets/qrCodeIconWhite.png

1.31 KiB

MainPage.xaml
+ 2
− 0
View file @ b9cddd3b
...@@ -113,6 +113,8 @@ ...@@ -113,6 +113,8 @@
<!-- hamburger button. --> <!-- hamburger button. -->
<Button x:Name="_toggleSmartBoxButton_" <Button x:Name="_toggleSmartBoxButton_"
Grid.Row="0" Grid.Row="0"
FontWeight="Bold"
FontSize="20"
Content="&#xE700;" Content="&#xE700;"
Click="_toggleSmartBoxButton__Click" Click="_toggleSmartBoxButton__Click"
HorizontalAlignment="Center" HorizontalAlignment="Center"
......
SmartPanel.xaml
+ 37
− 35
View file @ b9cddd3b
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
<Grid.RowDefinitions> <Grid.RowDefinitions>
<!-- where the selected account is shown. --> <!-- where the selected account is shown. -->
<RowDefinition x:Name="_selectedAccountRow_" <RowDefinition x:Name="_selectedAccountRow_"
Height="90"/> Height="60"/>
<!-- where the drop down menus are shown. --> <!-- where the drop down menus are shown. -->
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
...@@ -399,13 +399,13 @@ ...@@ -399,13 +399,13 @@
<Grid Grid.Row="0"> <Grid Grid.Row="0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition x:Name="_selectedAccountAvatarColumn_" <ColumnDefinition x:Name="_selectedAccountAvatarColumn_"
Width="90"/> Width="60"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Ellipse <Ellipse
x:Name="_selectedAccountAvatarContainer_" x:Name="_selectedAccountAvatarContainer_"
Height="80" Height="50"
Width="80" Width="50"
Grid.Column="0" Grid.Column="0"
Stroke="White" Stroke="White"
StrokeThickness="3" StrokeThickness="3"
...@@ -422,8 +422,8 @@ ...@@ -422,8 +422,8 @@
<Ellipse <Ellipse
x:Name="_shaderPhotoboothIcon_" x:Name="_shaderPhotoboothIcon_"
Visibility="Collapsed" Visibility="Collapsed"
Height="80" Height="50"
Width="80" Width="50"
Grid.Column="0" Grid.Column="0"
IsHitTestVisible="False" IsHitTestVisible="False"
Fill="Black" Fill="Black"
...@@ -440,46 +440,52 @@ ...@@ -440,46 +440,52 @@
<StackPanel Grid.Column="1" <StackPanel Grid.Column="1"
VerticalAlignment="Bottom"> VerticalAlignment="Bottom">
<TextBlock x:Name="_selectedAccountName_" <TextBlock x:Name="_selectedAccountName_"
Text="[TEXT MISSING]" Text="the wizard will be sumoned..."
Margin="10,0,0,10" Margin="10"
VerticalAlignment="Center"
TextTrimming="CharacterEllipsis" TextTrimming="CharacterEllipsis"
Style="{StaticResource TextStyle2}"/> Style="{StaticResource TextStyle2}"/>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<!--Content="&#xE0A1;--> <!-- contacts list -->
<Button x:Name="_smartGridButton_" <ToggleButton x:Name="_contactsListMenuButton_"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Content="&#xe716;" Content="&#xe716;"
Click="_smartGridButton__Clicked" Click="_contactsListMenuButton__Click"
Style="{StaticResource smartGridButtonStyle}"/> Style="{StaticResource ToggleButtonStyle2}"/>
<!-- account menu -->
<ToggleButton x:Name="_accountsMenuButton_" <ToggleButton x:Name="_accountsMenuButton_"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Click="_accountsMenuButton__Click"
Content="&#xE168;" Content="&#xE168;"
Checked="_accountsMenuButton__Checked" Style="{StaticResource ToggleButtonStyle2}"/>
Unchecked="_accountsMenuButton__Unchecked"
Style="{StaticResource ToggleButtonStyle1}"/>
<!-- _shareMenuButton_ --> <!-- _shareMenuButton_ -->
<ToggleButton x:Name="_shareMenuButton_" <ToggleButton x:Name="_shareMenuButton_"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Checked="_shareMenuButton__Checked" Click="_shareMenuButton__Click"
Unchecked="_shareMenuButton__Unchecked" Style="{StaticResource ToggleButtonStyle2}">
Style="{StaticResource ToggleButtonStyle1}"> <StackPanel>
<Image Source="Assets/qrCodeIcon.png" <Image x:Name="_qrCodeIconWhite_"
Stretch="Uniform"/> Source="Assets/qrCodeIconWhite.png"
Visibility="Visible"
Stretch="None"/>
<Image x:Name="_qrCodeIconBlack_"
Visibility="Collapsed"
Source="Assets/qrCodeIconBlack.png"
Stretch="None"/>
</StackPanel>
</ToggleButton> </ToggleButton>
<!-- _devicesMenuButton_ --> <!-- _devicesMenuButton_ -->
<ToggleButton x:Name="_devicesMenuButton_" <ToggleButton x:Name="_devicesMenuButton_"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Click="_devicesMenuButton__Click"
Content="&#xE836;" Content="&#xE836;"
Checked="_devicesMenuButton__Checked" Style="{StaticResource ToggleButtonStyle2}"/>
Unchecked="_devicesMenuButton__Unchecked"
Style="{StaticResource ToggleButtonStyle1}"/>
<!-- _settingsMenuButton_ --> <!-- _settingsMenuButton_ -->
<ToggleButton x:Name="_settingsMenuButton_" <ToggleButton x:Name="_settingsMenuButton_"
Click="_settingsMenuButton__Click"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Content="&#xE115;" Content="&#xE115;"
Checked="_settingsMenu__Checked" Style="{StaticResource ToggleButtonStyle2}"/>
Unchecked="_settingsMenu__Unchecked"
Style="{StaticResource ToggleButtonStyle1}"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
...@@ -487,9 +493,6 @@ ...@@ -487,9 +493,6 @@
<!--sub menus like the accounts list or the share menu are just below, technicaly they are nested inside the <!--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--> same row. To summon them we use the visibility of their own grid, by linking it to a toggle button-->
</Grid> </Grid>
<!-- smartList and settings. --> <!-- smartList and settings. -->
<Grid Grid.Row="1" <Grid Grid.Row="1"
...@@ -916,8 +919,7 @@ ...@@ -916,8 +919,7 @@
Grid.Row="0" Grid.Row="0"
Background="#3bc1d3"> Background="#3bc1d3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="auto"/> <RowDefinition Height="*"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="30"/> <RowDefinition Height="30"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal"
...@@ -936,7 +938,7 @@ ...@@ -936,7 +938,7 @@
<StackPanel x:Name="_step1Menu_" <StackPanel x:Name="_step1Menu_"
Background="#FFE4F1F9" Background="#FFE4F1F9"
Padding="10" 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." <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" TextWrapping="Wrap"
TextAlignment="Justify"/> TextAlignment="Justify"/>
...@@ -948,7 +950,7 @@ ...@@ -948,7 +950,7 @@
<StackPanel x:Name="_step2Menu_" <StackPanel x:Name="_step2Menu_"
Background="#FFE4F1F9" Background="#FFE4F1F9"
Visibility="Collapsed" Visibility="Collapsed"
Grid.Row="1"> Grid.Row="0">
<TextBox x:Name="_PINTextBox_" <TextBox x:Name="_PINTextBox_"
Margin="10" Margin="10"
GotFocus="_PINTextBox__GotFocus" GotFocus="_PINTextBox__GotFocus"
...@@ -962,7 +964,7 @@ ...@@ -962,7 +964,7 @@
Text=""/> Text=""/>
</StackPanel> </StackPanel>
<!-- buttons next step and yes/no to add the account. --> <!-- buttons next step and yes/no to add the account. -->
<Grid Grid.Row="2"> <Grid Grid.Row="1">
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal"
Padding="10,0" Padding="10,0"
HorizontalAlignment="Center"> HorizontalAlignment="Center">
...@@ -1120,6 +1122,7 @@ ...@@ -1120,6 +1122,7 @@
<PasswordBox x:Name="_passwordForPinGenerator_" <PasswordBox x:Name="_passwordForPinGenerator_"
Margin="10" Margin="10"
Grid.Row="1" Grid.Row="1"
KeyUp="_passwordForPinGenerator__KeyUp"
PlaceholderText="Enter your password"/> PlaceholderText="Enter your password"/>
</Grid> </Grid>
<!-- buttons yes/no to generate a PIN. --> <!-- buttons yes/no to generate a PIN. -->
...@@ -1209,7 +1212,6 @@ ...@@ -1209,7 +1212,6 @@
Foreground="Black" Foreground="Black"
Background="White" Background="White"
TextWrapping="Wrap" TextWrapping="Wrap"
KeyDown="_ringTxtBx__KeyDown"
KeyUp="_ringTxtBx__KeyUp" KeyUp="_ringTxtBx__KeyUp"
Text=""> Text="">
</TextBox> </TextBox>
......
SmartPanel.xaml.cpp
+ 167
− 254
View file @ b9cddd3b
This diff is collapsed.
SmartPanel.xaml.h
+ 9
− 12
View file @ b9cddd3b
...@@ -121,7 +121,6 @@ public ref class SmartPanel sealed ...@@ -121,7 +121,6 @@ public ref class SmartPanel sealed
public: public:
SmartPanel(); SmartPanel();
void updatePageContent(); void updatePageContent();
void unselectContact();
internal: internal:
enum class Mode { Minimized, Normal }; enum class Mode { Minimized, Normal };
...@@ -135,19 +134,11 @@ internal: ...@@ -135,19 +134,11 @@ internal:
private: private:
/* functions */ /* 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 _addAccountBtn__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _createAccountYes__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 _createAccountNo__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _smartList__SelectionChanged(Platform::Object^ sender, Windows::UI::Xaml::Controls::SelectionChangedEventArgs^ 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 _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 _ringTxtBx__Click(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e);
void _rejectIncomingCallBtn__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e); void _rejectIncomingCallBtn__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _acceptIncomingCallBtn__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: ...@@ -155,7 +146,6 @@ private:
void _cancelCallBtn__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e); 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_PointerEntered(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e);
void Grid_PointerExited(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 generateQRcode();
void _videoDeviceComboBox__SelectionChanged(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^); void _videoDeviceComboBox__SelectionChanged(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^);
void _videoResolutionComboBox__SelectionChanged(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^); void _videoResolutionComboBox__SelectionChanged(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^);
...@@ -169,8 +159,6 @@ private: ...@@ -169,8 +159,6 @@ private:
void showLinkThisDeviceStep1(); void showLinkThisDeviceStep1();
/* members */ /* 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 _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 OndevicesListRefreshed(Platform::Collections::Vector<Platform::String ^, std::equal_to<Platform::String ^>, true> ^devicesList);
void _pinGeneratorYes__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e); void _pinGeneratorYes__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
...@@ -217,10 +205,19 @@ private: ...@@ -217,10 +205,19 @@ private:
SETTINGS SETTINGS
}; };
void selectMenu(MenuOpen menu);
MenuOpen menuOpen; MenuOpen menuOpen;
void Grid_PointerReleased(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e); void Grid_PointerReleased(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e);
void OnincomingAccountMessage(Platform::String ^accountId, Platform::String ^from, Platform::String ^payload); void OnincomingAccountMessage(Platform::String ^accountId, Platform::String ^from, Platform::String ^payload);
void _ringTxtBx__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e); 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();
}; };
} }
} }
Styles.xaml
+ 185
− 0
View file @ b9cddd3b
...@@ -492,5 +492,190 @@ ...@@ -492,5 +492,190 @@
<Setter Property="BorderThickness" <Setter Property="BorderThickness"
Value="0"/> Value="0"/>
</Style> </Style>
<Style x:Key="ToggleButtonStyle2" TargetType="ToggleButton">
<Setter Property="Width"
Value="40"/>
<Setter Property="Height"
Value="30"/>
<Setter Property="FontFamily"
Value="Segoe MDL2 Assets"/>
<Setter Property="FontSize"
Value="15"/>
<Setter Property="Foreground"
Value="White"/>
<Setter Property="Background"
Value="Transparent"/>
<Setter Property="BorderThickness"
Value="0"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ToggleButton">
<Grid x:Name="RootGrid" Background="{TemplateBinding Background}">
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal">
<Storyboard>
<PointerUpThemeAnimation Storyboard.TargetName="RootGrid"/>
</Storyboard>
</VisualState>
<VisualState x:Name="PointerOver">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="RootGrid">
<DiscreteObjectKeyFrame KeyTime="0" Value="#abdaf9"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="White"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>
</ObjectAnimationUsingKeyFrames>
<PointerUpThemeAnimation Storyboard.TargetName="RootGrid"/>
</Storyboard>
</VisualState>
<VisualState x:Name="Pressed">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="RootGrid">
<DiscreteObjectKeyFrame KeyTime="0" Value="#abdaf9"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="White"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>
</ObjectAnimationUsingKeyFrames>
<PointerDownThemeAnimation Storyboard.TargetName="RootGrid"/>
</Storyboard>
</VisualState>
<VisualState x:Name="Disabled">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="RootGrid">
<DiscreteObjectKeyFrame KeyTime="0" Value="#abdaf9"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="White"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
<VisualState x:Name="Checked">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="RootGrid">
<DiscreteObjectKeyFrame KeyTime="0" Value="#e4f1f9"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Black"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>
</ObjectAnimationUsingKeyFrames>
<PointerUpThemeAnimation Storyboard.TargetName="RootGrid"/>
</Storyboard>
</VisualState>
<VisualState x:Name="CheckedPointerOver">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="RootGrid">
<DiscreteObjectKeyFrame KeyTime="0" Value="#e4f1f9"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Black"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>
</ObjectAnimationUsingKeyFrames>
<PointerUpThemeAnimation Storyboard.TargetName="RootGrid"/>
</Storyboard>
</VisualState>
<VisualState x:Name="CheckedPressed">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="RootGrid">
<DiscreteObjectKeyFrame KeyTime="0" Value="#e4f1f9"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Black"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>
</ObjectAnimationUsingKeyFrames>
<PointerDownThemeAnimation Storyboard.TargetName="RootGrid"/>
</Storyboard>
</VisualState>
<VisualState x:Name="CheckedDisabled">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="RootGrid">
<DiscreteObjectKeyFrame KeyTime="0" Value="#e4f1f9"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Black"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
<VisualState x:Name="Indeterminate">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="RootGrid">
<DiscreteObjectKeyFrame KeyTime="0" Value="#abdaf9"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="White"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>
</ObjectAnimationUsingKeyFrames>
<PointerUpThemeAnimation Storyboard.TargetName="RootGrid"/>
</Storyboard>
</VisualState>
<VisualState x:Name="IndeterminatePointerOver">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="RootGrid">
<DiscreteObjectKeyFrame KeyTime="0" Value="#abdaf9"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="White"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>
</ObjectAnimationUsingKeyFrames>
<PointerUpThemeAnimation Storyboard.TargetName="RootGrid"/>
</Storyboard>
</VisualState>
<VisualState x:Name="IndeterminatePressed">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="RootGrid">
<DiscreteObjectKeyFrame KeyTime="0" Value="#abdaf9"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="White"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>
</ObjectAnimationUsingKeyFrames>
<PointerDownThemeAnimation Storyboard.TargetName="RootGrid"/>
</Storyboard>
</VisualState>
<VisualState x:Name="IndeterminateDisabled">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="RootGrid">
<DiscreteObjectKeyFrame KeyTime="0" Value="#abdaf9"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="White"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<ContentPresenter x:Name="ContentPresenter" AutomationProperties.AccessibilityView="Raw" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" Content="{TemplateBinding Content}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary> </ResourceDictionary>
ring-client-uwp.vcxproj
+ 2
− 1
View file @ b9cddd3b
...@@ -282,7 +282,8 @@ ...@@ -282,7 +282,8 @@
<Image Include="Assets\AccountTypeRING.png" /> <Image Include="Assets\AccountTypeRING.png" />
<Image Include="Assets\AccountTypeSIP.png" /> <Image Include="Assets\AccountTypeSIP.png" />
<Image Include="Assets\LockScreenLogo.scale-200.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\SplashScreen.scale-200.png" />
<Image Include="Assets\Square150x150Logo.scale-200.png" /> <Image Include="Assets\Square150x150Logo.scale-200.png" />
<Image Include="Assets\Square44x44Logo.scale-200.png" /> <Image Include="Assets\Square44x44Logo.scale-200.png" />
......
ring-client-uwp.vcxproj.filters
+ 4
− 1
View file @ b9cddd3b
...@@ -206,7 +206,10 @@ ...@@ -206,7 +206,10 @@
<Image Include="Assets\Wide310x150Logo.scale-200.png"> <Image Include="Assets\Wide310x150Logo.scale-200.png">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</Image> </Image>
<Image Include="Assets\qrCodeIcon.png"> <Image Include="Assets\qrCodeIconBlack.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\qrCodeIconWhite.png">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</Image> </Image>
</ItemGroup> </ItemGroup>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment