Commit 670e7f77 authored by Nicolas Jager's avatar Nicolas Jager

Assets : add flat ring logo

- make the client matching the Windows 10 UWP flat themes with
  flat logos.

Change-Id: I5e60c33ffb6578874f1c3b3858d0ef350ae6d7f5
Tuleap: #790
parent 593926fb
......@@ -63,7 +63,10 @@ App::OnLaunched(LaunchActivatedEventArgs^ e)
Window::Current->Content = rootFrame;
}
ApplicationView::GetForCurrentView()->SetPreferredMinSize(Size(500, 500));
Windows::UI::ViewManagement::ApplicationView::PreferredLaunchViewSize = Size(800, 700);
Windows::UI::ViewManagement::ApplicationView::PreferredLaunchWindowingMode
= Windows::UI::ViewManagement::ApplicationViewWindowingMode::PreferredLaunchViewSize;
Window::Current->Activate();
auto color = Windows::UI::ColorHelper::FromArgb(255, 59, 193, 211);
......@@ -78,7 +81,6 @@ App::OnLaunched(LaunchActivatedEventArgs^ e)
void App::OnsummonWizard()
{
ApplicationView::GetForCurrentView()->TryResizeView(Size(400, 600));
rootFrame->Navigate(Windows::UI::Xaml::Interop::TypeName(Views::Wizard::typeid));
}
......
Assets/LockScreenLogo.scale-200.png

3.22 KB | W: | H:

Assets/LockScreenLogo.scale-200.png

1.75 KB | W: | H:

Assets/LockScreenLogo.scale-200.png
Assets/LockScreenLogo.scale-200.png
Assets/LockScreenLogo.scale-200.png
Assets/LockScreenLogo.scale-200.png
  • 2-up
  • Swipe
  • Onion skin
Assets/SplashScreen.scale-200.png

41.9 KB | W: | H:

Assets/SplashScreen.scale-200.png

36.5 KB | W: | H:

Assets/SplashScreen.scale-200.png
Assets/SplashScreen.scale-200.png
Assets/SplashScreen.scale-200.png
Assets/SplashScreen.scale-200.png
  • 2-up
  • Swipe
  • Onion skin
Assets/Square150x150Logo.scale-200.png

27.1 KB | W: | H:

Assets/Square150x150Logo.scale-200.png

29.9 KB | W: | H:

Assets/Square150x150Logo.scale-200.png
Assets/Square150x150Logo.scale-200.png
Assets/Square150x150Logo.scale-200.png
Assets/Square150x150Logo.scale-200.png
  • 2-up
  • Swipe
  • Onion skin
Assets/Square44x44Logo.scale-200.png

6.48 KB | W: | H:

Assets/Square44x44Logo.scale-200.png

4.75 KB | W: | H:

Assets/Square44x44Logo.scale-200.png
Assets/Square44x44Logo.scale-200.png
Assets/Square44x44Logo.scale-200.png
Assets/Square44x44Logo.scale-200.png
  • 2-up
  • Swipe
  • Onion skin
Assets/StoreLogo.png

3.35 KB | W: | H:

Assets/StoreLogo.png

195 KB | W: | H:

Assets/StoreLogo.png
Assets/StoreLogo.png
Assets/StoreLogo.png
Assets/StoreLogo.png
  • 2-up
  • Swipe
  • Onion skin
Assets/Wide310x150Logo.scale-200.png

36.3 KB | W: | H:

Assets/Wide310x150Logo.scale-200.png

32.5 KB | W: | H:

Assets/Wide310x150Logo.scale-200.png
Assets/Wide310x150Logo.scale-200.png
Assets/Wide310x150Logo.scale-200.png
Assets/Wide310x150Logo.scale-200.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -55,8 +55,6 @@ MainPage::MainPage()
{
InitializeComponent();
ApplicationView::GetForCurrentView()->TryResizeView(Size(1024, 768));
UserModel::instance->getUserData();
Window::Current->SizeChanged += ref new WindowSizeChangedEventHandler(this, &MainPage::OnResize);
......
......@@ -91,6 +91,11 @@
<Setter Property="Foreground"
Value="Black"/>
</Style>
<Style x:Key="TextStyle7"
TargetType="TextBlock">
<Setter Property="Foreground"
Value="White"/>
</Style>
<Style x:Key="TextSegoeStyle1"
TargetType="TextBlock">
<Setter Property="FontFamily"
......@@ -285,6 +290,17 @@
<Setter Property="BorderThickness"
Value="0"/>
</Style>
<Style x:Key="ButtonStyle8"
TargetType="Button">
<Setter Property="Foreground"
Value="White"/>
<Setter Property="Background"
Value="#3bc1d3"/>
<Setter Property="BorderThickness"
Value="0"/>
<Setter Property="FontSize"
Value="30"/>
</Style>
<Style x:Key="ToggleButtonStyle1"
TargetType="ToggleButton">
<Setter Property="Width"
......
......@@ -12,14 +12,20 @@
<Grid>
<StackPanel Width="400">
<Rectangle Height="50"/>
<Image x:Name="_welcomeImage_"
Source="Assets\Wide310x150Logo.scale-200.png"
Width="310"
HorizontalAlignment="Center"
Margin="0 10 0 30"
Height="150"/>
<StackPanel Height="auto"
Background="#3bc1d3"
Grid.Column="0">
<Button x:Name="_showCreateAccountMenuTitle_"
Content="Create New Account"
Foreground="White"
FontSize="30"
Click="collapseMenus"
Style="{StaticResource ButtonStyle8}"
Visibility="Collapsed"
HorizontalAlignment="Center"/>
<Button x:Name="_showCreateAccountMenuBtn_"
......@@ -190,7 +196,7 @@
Content="Add Existing Account"
Foreground="White"
Visibility="Collapsed"
FontSize="30"
Style="{StaticResource ButtonStyle8}"
Click="collapseMenus"
HorizontalAlignment="Center"/>
<Button x:Name="_showAddAccountMenuBtn_"
......@@ -210,10 +216,14 @@
<StackPanel Orientation="Horizontal"
Grid.Row="0">
<Button x:Name="_step1button_"
Style="{StaticResource ButtonStyle4}"
Content="Step 1"
Click="_step1button__Click"/>
<TextBlock Text=">"/>
<TextBlock Text=">"
VerticalAlignment="Center"
Style="{StaticResource TextStyle7}"/>
<Button x:Name="_step2button_"
Style="{StaticResource ButtonStyle4}"
Click="_step2button__Click"
Content="Step 2"/>
</StackPanel>
......@@ -237,9 +247,11 @@
<TextBox x:Name="_PINTextBox_"
Margin="10"
GotFocus="_PINTextBox__GotFocus"
KeyUp="_PINTextBox__KeyUp"
PlaceholderText="Enter PIN"/>
<PasswordBox x:Name="_ArchivePassword_"
Margin="10"
KeyUp="_ArchivePassword__KeyUp"
PlaceholderText="Enter your password"/>
<TextBlock x:Name="_response_"
Foreground="Red"
......@@ -263,6 +275,7 @@
Visibility="Collapsed"
Content="&#xE081;"
Click="_addAccountYes__Click"
IsEnabled="False"
Style="{StaticResource ButtonStyle2}"/>
</StackPanel>
</Grid>
......
......@@ -100,7 +100,7 @@ Wizard::_avatarWebcamCaptureBtn__Click(Platform::Object^ sender, Windows::UI::Xa
std::string profilePath = RingD::instance->getLocalFolder() + ".profile";
_mkdir(profilePath.c_str());
std::ofstream file((profilePath + "\\profile_image.png"),
std::ios::out | std::ios::trunc | std::ios::binary);
std::ios::out | std::ios::trunc | std::ios::binary);
if (file.is_open()) {
file << fileBuffer;
file.close();
......@@ -118,6 +118,11 @@ Wizard::_avatarWebcamCaptureBtn__Click(Platform::Object^ sender, Windows::UI::Xa
void RingClientUWP::Views::Wizard::_addAccountYes__Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
{
if (_PINTextBox_->Text->IsEmpty() || _ArchivePassword_->Password->IsEmpty()) {
_addAccountYes_->IsEnabled = false;
return;
}
RingD::instance->_startingStatus = StartingStatus::REGISTERING_THIS_DEVICE;
this->Dispatcher->RunAsync(Windows::UI::Core::CoreDispatcherPriority::Normal, ref new Windows::UI::Core::DispatchedHandler([this]() {
......@@ -302,6 +307,7 @@ void RingClientUWP::Views::Wizard::OnregisteredNameFound(LookupStatus status, co
void RingClientUWP::Views::Wizard::OnregistrationStateErrorGeneric(const std::string &accountId)
{
_response_->Text = "Credentials error or PIN expired.";
_addAccountYes_->IsEnabled = false;
}
......@@ -309,3 +315,21 @@ void RingClientUWP::Views::Wizard::_PINTextBox__GotFocus(Platform::Object^ sende
{
_response_->Text = "";
}
void RingClientUWP::Views::Wizard::_ArchivePassword__KeyUp(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e)
{
if (_PINTextBox_->Text->IsEmpty() || _ArchivePassword_->Password->IsEmpty())
_addAccountYes_->IsEnabled = false;
else
_addAccountYes_->IsEnabled = true;
}
void RingClientUWP::Views::Wizard::_PINTextBox__KeyUp(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e)
{
if (_PINTextBox_->Text->IsEmpty() || _ArchivePassword_->Password->IsEmpty())
_addAccountYes_->IsEnabled = false;
else
_addAccountYes_->IsEnabled = true;
}
......@@ -40,6 +40,8 @@ private:
bool isFullNameValid;
void OnregistrationStateErrorGeneric(const std::string &accountId);
void _PINTextBox__GotFocus(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void _ArchivePassword__KeyUp(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e);
void _PINTextBox__KeyUp(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e);
};
}
......
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