Skip to content

Commit

Permalink
Refact: modal open migrate to AccountsList and translation to english
Browse files Browse the repository at this point in the history
  • Loading branch information
@andavgc
andavgc committed Aug 27, 2023
1 parent 746d395 commit d9468e0
Show file tree
Hide file tree
Showing 11 changed files with 398 additions and 406 deletions.
18 changes: 9 additions & 9 deletions REZ/AccountInfo.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</StackPanel>
</Button>
<StackPanel Orientation="Horizontal" Margin="0,4,0,0">
<Button Click="CreateAccount" Width="160" CornerRadius="16" Style="{StaticResource AccentButtonStyle}" HorizontalContentAlignment="Center" Margin="0,0,4,0">
<Button Click="CreateAccount_ButtonClick" Width="160" CornerRadius="16" Style="{StaticResource AccentButtonStyle}" HorizontalContentAlignment="Center" Margin="0,0,4,0">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock FontFamily="Segoe Fluent Icons" Text="&#xECC8;" VerticalAlignment="Center"/>
<TextBlock Text=" Adicionar conta" VerticalAlignment="Center"/>
Expand Down Expand Up @@ -60,9 +60,9 @@
Text=""
TextWrapping="Wrap"
FontSize="20"
Margin="12, 12, 12, 0" />
Margin="12, 12, 12, 0" />

<TextBlock Text="Revise seu histórico de pedidos"
<TextBlock Text="This is your order history"
TextWrapping="Wrap"
FontSize="20"
FontWeight="Bold"
Expand All @@ -85,7 +85,7 @@
<Run Text="{Binding Name, Mode=TwoWay}"></Run>
</TextBlock>
<TextBlock FontSize="12">
<Run Text="Número do pedido: "/>
<Run Text="Order number: "/>
<Run Text="{Binding OrderId}"/>
</TextBlock>
<TextBlock Text="{Binding FinalPrice}" FontSize="12"/>
Expand All @@ -107,8 +107,8 @@
</RelativePanel>

<RelativePanel Width="468" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="Taxa de serviço (10%):" TextAlignment="Left" Foreground="Gray"/>
<TextBlock x:Name="Taxa" TextWrapping="Wrap" TextAlignment="Right" RelativePanel.AlignRightWithPanel="True" Foreground="Gray"/>
<TextBlock Text="Service taxes (10%):" TextAlignment="Left" Foreground="Gray"/>
<TextBlock x:Name="Tax" TextWrapping="Wrap" TextAlignment="Right" RelativePanel.AlignRightWithPanel="True" Foreground="Gray"/>
</RelativePanel>

<RelativePanel Width="468" VerticalAlignment="Center" HorizontalAlignment="Center">
Expand All @@ -118,15 +118,15 @@


<StackPanel Orientation="Horizontal" Margin="0,24,0,0" Width="468">
<Button Click="CloseAccount" Style="{StaticResource AccentButtonStyle}" Width="230" HorizontalContentAlignment="Center" VerticalAlignment="Center" Margin="0,0,4,0">
<Button Click="CloseAccount_ButtonClick" Style="{StaticResource AccentButtonStyle}" Width="230" HorizontalContentAlignment="Center" VerticalAlignment="Center" Margin="0,0,4,0">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock FontFamily="Segoe Fluent Icons" Text="&#xF3B1;" VerticalAlignment="Center"/>
<TextBlock Text=" Fechar conta" VerticalAlignment="Center"/>
<TextBlock Text=" Close Account" VerticalAlignment="Center"/>
</StackPanel>
</Button>
<Button Click="BackToMainMenu" Margin="4,0,0,0" Width="230">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="Voltar ao Menu Principal" VerticalAlignment="Center"/>
<TextBlock Text="Back to Main Menu" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
Expand Down
76 changes: 23 additions & 53 deletions REZ/AccountInfo.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ public void UpdatePrice(List<Product> productsList)

double subtotal = SubtotalValueCalculator(productsList);
string subtotalValue = subtotal.ToString("0.00");
double taxa = subtotal * 0.1;
string taxaServico = taxa.ToString("0.00");
double total = subtotal + taxa;
double tax = subtotal * 0.1;
string serviceTax = tax.ToString("0.00");
double total = subtotal + tax;
string totalPrice = total.ToString("0.00");
Subtotal.Text = $"R$ {subtotalValue}";
Taxa.Text = $"R$ {taxaServico}";
Tax.Text = $"R$ {serviceTax}";
TotalPrice.Text = $"R$ {totalPrice}";
}

Expand All @@ -70,8 +70,22 @@ public double SubtotalValueCalculator(List<Product> productsList)
}

//----------------------------------------------------------------------------
public void ShowUserInformation(Account currentUser)
public void CreateAccount_ButtonClick(object sender, RoutedEventArgs e)
{
AccountsList.OpenAddAccountModal(this, UpdateUser);

}

//----------------------------------------------------------------------------
public void SwitchUser_ButtonClick(object sender, RoutedEventArgs e)
{
AccountsList.OpenSwitchAccountModal(this, UpdateUser);

}

public void CloseAccount_ButtonClick(object sender, RoutedEventArgs e)
{
AccountsList.OpenCloseAccountModal(this, Frame);

}

Expand All @@ -93,52 +107,13 @@ private async void CloseAccount(object sender, RoutedEventArgs e)
{
Frame.Navigate(typeof(AccountClosed), null, new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight });
}
}

//----------------------------------------------------------------------------
private void BackToMainMenu(object sender, RoutedEventArgs e)
{
Frame.Navigate(typeof(MainPage), null, new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromLeft });
}

//----------------------------------------------------------------------------
public async void SwitchAccount(object sender, RoutedEventArgs e)
{
ContentDialog dialog = new ContentDialog();
dialog.XamlRoot = this.XamlRoot;
dialog.Style = Microsoft.UI.Xaml.Application.Current.Resources["DefaultContentDialogStyle"] as Style;
dialog.Title = "Olá! Vamos começar?";
dialog.PrimaryButtonText = "Trocar usuário";
dialog.CloseButtonText = "Cancelar";
dialog.DefaultButton = ContentDialogButton.Primary;
dialog.Content = new SwitchAccountModal();
//dialog.PrimaryButtonClick += delegate { AddAccount(dialog.Content); };
var result = await dialog.ShowAsync();

}

//----------------------------------------------------------------------------
private async void CreateAccount(object sender, RoutedEventArgs e)
{
ContentDialog dialog = new ContentDialog();
dialog.XamlRoot = this.XamlRoot;
dialog.Style = Microsoft.UI.Xaml.Application.Current.Resources["DefaultContentDialogStyle"] as Style;
dialog.Title = "Olá! Vamos começar?";
dialog.PrimaryButtonText = "Adicionar usuário";
dialog.CloseButtonText = "Cancelar";
dialog.DefaultButton = ContentDialogButton.Primary;
dialog.Content = new AddAccountModal(dialog);
dialog.PrimaryButtonClick += delegate { AddAccount(dialog.Content); };
var result = await dialog.ShowAsync();
}

//----------------------------------------------------------------------------
public void AddAccount(object sender)
private void BackToMainMenu(object sender, RoutedEventArgs e)
{
AddAccountModal aam = sender as AddAccountModal;
Account NewUser = aam.CreateNewAccount();
List<Account> accountsList = AccountsList.AddNewAccount(NewUser);
UpdateUser(AccountsList.SelectedAccount);
Frame.Navigate(typeof(MainPage), null, new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromLeft });
}

//----------------------------------------------------------------------------
Expand All @@ -152,15 +127,10 @@ public void UpdateUser(Account user)
Debug.WriteLine($"[AccountInfo] Account changed to {User.Name}");
CurrentUsername.Content = User.Name;

Greetings.Text = $"Ola, {AccountsList.SelectedAccount.Name}!";
TitleGreetings.Text = $"Ola, {AccountsList.SelectedAccount.Name}!";
Greetings.Text = $"Hello, {AccountsList.SelectedAccount.Name}!";
TitleGreetings.Text = $"Hello, {AccountsList.SelectedAccount.Name}!";
ShoppingCart.DefineUser(User);
}

public void SwitchUser_ButtonClick(object sender, RoutedEventArgs e)
{
AccountsList.OpenSwitchAccountModal(this, UpdateUser);

}
}
}
52 changes: 48 additions & 4 deletions REZ/AccountsList.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media.Animation;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
Expand Down Expand Up @@ -45,7 +46,7 @@ public static List<Account> AddNewAccount(Account account)
{

Accounts.Add(account);
Debug.WriteLine($"Contas ativas: {Accounts.Count}");
Debug.WriteLine($"Active accounts: {Accounts.Count}");
return Accounts;
}

Expand Down Expand Up @@ -115,16 +116,59 @@ public static async void OpenSwitchAccountModal(Page page, Action<Account> Updat
ContentDialog dialog = new ContentDialog();
dialog.XamlRoot = page.XamlRoot;
dialog.Style = Microsoft.UI.Xaml.Application.Current.Resources["DefaultContentDialogStyle"] as Style;
dialog.Title = "Olá! Vamos começar?";
dialog.PrimaryButtonText = "Trocar usuário";
dialog.CloseButtonText = "Cancelar";
dialog.Title = "Select an account.";
dialog.PrimaryButtonText = "Switch account";
dialog.CloseButtonText = "Cancel";
dialog.DefaultButton = ContentDialogButton.Primary;
dialog.Content = new SwitchAccountModal();
dialog.PrimaryButtonClick += delegate { UpdateUser(SwitchAccountModal.UserToChange); };
var result = await dialog.ShowAsync();

}

//----------------------------------------------------------------------------
public static async void OpenAddAccountModal(Page page, Action<Account> UpdateUser)
{
ContentDialog dialog = new ContentDialog();
dialog.XamlRoot = page.XamlRoot;
dialog.Style = Microsoft.UI.Xaml.Application.Current.Resources["DefaultContentDialogStyle"] as Style;
dialog.Title = "Hello, let's start!?";
dialog.PrimaryButtonText = "Add account";
dialog.CloseButtonText = "Cancel";
dialog.DefaultButton = ContentDialogButton.Primary;
dialog.Content = new AddAccountModal(dialog);
dialog.PrimaryButtonClick += delegate { AddAccount(dialog.Content, UpdateUser); };
var result = await dialog.ShowAsync();
}

public static void AddAccount(object sender, Action<Account> UpdateUser)
{
AddAccountModal aam = sender as AddAccountModal;
Account NewUser = aam.CreateNewAccount();
List<Account> accountsList = AddNewAccount(NewUser);
UpdateUser(AccountsList.SelectedAccount);
}

//----------------------------------------------------------------------------
public static async void OpenCloseAccountModal(Page page, Frame frame)
{
ContentDialog CloseAccountDialog = new ContentDialog();
CloseAccountDialog.XamlRoot = page.XamlRoot;
CloseAccountDialog.Style = Microsoft.UI.Xaml.Application.Current.Resources["DefaultContentDialogStyle"] as Style;
CloseAccountDialog.Title = "Are you sure you want to close this account?";
CloseAccountDialog.PrimaryButtonText = "Yes, close account";
CloseAccountDialog.PrimaryButtonClick += delegate { RemoveAccount(SelectedAccount); };
CloseAccountDialog.CloseButtonText = "Cancel";
CloseAccountDialog.DefaultButton = ContentDialogButton.Primary;
CloseAccountDialog.Content = new CloseAccountConfirmation();
var result = await CloseAccountDialog.ShowAsync();

if (result == ContentDialogResult.Primary)
{
frame.Navigate(typeof(AccountClosed), null, new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight });
}

}

}
}
Expand Down
16 changes: 8 additions & 8 deletions REZ/FoodMenu.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,27 @@
<StackPanel>
<TextBlock x:Name="Greetings" Text="" Style="{ThemeResource BaseTextBlockStyle}" Margin="0" />
<TextBlock Margin="0,0,0,12">
<Run Text="Você está na Mesa" />
<Run Text="You are in table" />
<Run Text="#1." />
</TextBlock>
<StackPanel Orientation="Vertical">
<Button Click="AccountInfoRedirect" Width="328" CornerRadius="16" Margin="0,4,0,4">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock FontFamily="Segoe Fluent Icons" Text="&#xEA37;" VerticalAlignment="Center"/>
<TextBlock Text=" Ver pedidos" VerticalAlignment="Center"/>
<TextBlock Text=" See previous orders" VerticalAlignment="Center"/>
</StackPanel>
</Button>
<StackPanel Orientation="Horizontal" Margin="0,4,0,0">
<Button Click="CreateAccount" Width="160" CornerRadius="16" Style="{StaticResource AccentButtonStyle}" HorizontalContentAlignment="Center" Margin="0,0,4,0">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock FontFamily="Segoe Fluent Icons" Text="&#xECC8;" VerticalAlignment="Center"/>
<TextBlock Text=" Adicionar conta" VerticalAlignment="Center"/>
<TextBlock Text=" Add account" VerticalAlignment="Center"/>
</StackPanel>
</Button>
<Button Click="SwitchUser_ButtonClick" Width="160" CornerRadius="16" Margin="4,0,0,0">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock FontFamily="Segoe Fluent Icons" Text="&#xE748;" VerticalAlignment="Center"/>
<TextBlock Text=" Trocar conta" VerticalAlignment="Center"/>
<TextBlock Text=" Switch account" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
Expand All @@ -72,10 +72,10 @@
</StackPanel>

<StackPanel x:Name="CategoriesButtonRow" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,16,0,0">
<Button Content="Tudo" CornerRadius="18" Click="FilterByCategory_ButtonClick" Style="{StaticResource AccentButtonStyle}"/>
<Button Content="Bebidas" CornerRadius="18" Click="FilterByCategory_ButtonClick"/>
<Button Content="Comida" CornerRadius="18" Click="FilterByCategory_ButtonClick"/>
<Button Content="Cafeteria" CornerRadius="18" Click="FilterByCategory_ButtonClick"/>
<Button Content="All" CornerRadius="18" Click="FilterByCategory_ButtonClick" Style="{StaticResource AccentButtonStyle}"/>
<Button Content="Drinks" CornerRadius="18" Click="FilterByCategory_ButtonClick"/>
<Button Content="Food" CornerRadius="18" Click="FilterByCategory_ButtonClick"/>
<Button Content="Coffee and Desserts" CornerRadius="18" Click="FilterByCategory_ButtonClick"/>
</StackPanel>

<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,24,0,0">
Expand Down
Loading

0 comments on commit d9468e0

Please sign in to comment.