🎨 merge C# model into master
continuous-integration/drone/push Build is passing Details

pull/13/head
Antoine PEREDERII 2 years ago
commit 95c2d548c0

@ -0,0 +1,22 @@
kind: pipeline
type: docker
name: myFirstPipeline
trigger:
branch:
- master
- C#/model
event:
- push
steps:
- name: build
image: mcr.microsoft.com/dotnet/sdk:6.0
commands:
- cd src/Banquale
#- dotnet restore Banquale.sln
#- dotnet build Banquale.sln -c Debug --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0
#- dotnet publish Banquale/Banquale.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net6.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk
# this last line can be replaced by the following one, if you have only one project in your solution:
#- dotnet publish Banquale.sln -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk

File diff suppressed because it is too large Load Diff

@ -9,21 +9,47 @@
NavigationPage.HasNavigationBar="True" NavigationPage.HasNavigationBar="True"
NavigationPage.HasBackButton="True" NavigationPage.HasBackButton="True"
NavigationPage.BackButtonTitle="Retour" NavigationPage.BackButtonTitle="Retour"
Title="Page"> Title="Page"
Shell.FlyoutBehavior="Disabled">
<TabBar> <TabBar>
<Tab Icon="home.png"
Title="Compte">
<ShellContent <ShellContent
Title="Solde" Title="Solde"
ContentTemplate="{DataTemplate local:BalancePage}" ContentTemplate="{DataTemplate local:BalancePage}"
Route="Views" /> Route="Views" />
<!--<FlyoutItem> a pas l'air de servir --> </Tab>
<Tab Icon="transactions.png"
Title="Transactions">
<ShellContent <ShellContent
Title="Solde" Title="Solde"
ContentTemplate="{DataTemplate local:NewPage1}" ContentTemplate="{DataTemplate local:MenuTransferPage}"
Route="Views" /> Route="Views" />
<!--</FlyoutItem>-->
</Tab>
<Tab Icon="help.png"
Title="Aide">
<ShellContent
Title="Help"
ContentTemplate="{DataTemplate local:HelpPage}"
Route="Views" />
</Tab>
<Tab Icon="accounts.png"
Title="Compte">
</Tab>
</TabBar> </TabBar>

@ -56,11 +56,21 @@
<ItemGroup> <ItemGroup>
<None Remove="Views\" /> <None Remove="Views\" />
<None Remove="Resources\Images\account_balance_FILL0_wght400_GRAD0_opsz48.svg" />
<None Remove="Resources\Images\home_FILL0_wght400_GRAD0_opsz48.png" />
<None Remove="Resources\Images\accountIcon.svg" />
<None Remove="Resources\Images\backArrowIcon.svg" />
<None Remove="Resources\Images\swipeAccountIcon.svg" />
<None Remove="Resources\Images\helpIcon.svg" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Views\" /> <Folder Include="Views\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<BundleResource Include="Resources\Images\back_arrow_icon.svg" />
<MauiXaml Remove="Resources\Images\Images.xaml" /> <MauiXaml Remove="Resources\Images\Images.xaml" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="Syncfusion.Maui.Inputs" Version="21.2.3" />
</ItemGroup>
</Project> </Project>

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="M167 896v-60h130l-15-12q-64-51-93-111t-29-134q0-106 62.5-190.5T387 272v62q-75 29-121 96.5T220 579q0 63 23.5 109.5T307 769l30 21V666h60v230H167Zm407-15v-63q76-29 121-96.5T740 573q0-48-23.5-97.5T655 388l-29-26v124h-60V256h230v60H665l15 14q60 56 90 120t30 123q0 106-62 191T574 881Z"/></svg>

Before

Width:  |  Height:  |  Size: 382 B

@ -55,7 +55,7 @@
AlignContent="Start" AlignContent="Start"
Direction="Row" Direction="Row"
Wrap="Wrap"> Wrap="Wrap">
<local:BalanceView /> <local:BalanceView/>
<local:BalanceView/> <local:BalanceView/>
<local:BalanceView/> <local:BalanceView/>
<local:BalanceView/> <local:BalanceView/>

@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Banquale.Views.HelpPage">
<VerticalStackLayout VerticalOptions="Center">
<Frame CornerRadius="10"
HeightRequest="40"
WidthRequest="300"
Padding="3">
<Entry Placeholder="Quel est votre demande ?"
HorizontalOptions="Center"
WidthRequest="280"/>
</Frame>
<Frame CornerRadius="10"
HeightRequest="40"
WidthRequest="300"
Margin="0, 5, 0, 5"
Padding="3">
<Entry Placeholder="Quel est le sujet de votre demande ?"
HorizontalOptions="Center"
WidthRequest="280"/>
</Frame>
<Frame CornerRadius="10"
HeightRequest="250"
WidthRequest="300"
Margin="0, 0, 0, 10"
Padding="15, 5, 15, 5">
<Editor Placeholder="Decrivez votre demande ici." />
</Frame>
<Button
Text="Envoyer"
Margin="0, 75, 0, 0"
MinimumHeightRequest="80"
WidthRequest="300"
MaximumWidthRequest="400"
Clicked="Send_Clicked"/>
</VerticalStackLayout>
</ContentPage>

@ -0,0 +1,19 @@
namespace Banquale.Views;
public partial class HelpPage : ContentPage
{
public HelpPage()
{
InitializeComponent();
}
void ContentPage_NavigatedTo(System.Object sender, Microsoft.Maui.Controls.NavigatedToEventArgs e)
{
}
public async void Send_Clicked(Object sender, EventArgs e)
{
await Shell.Current.Navigation.PushAsync(new BalancePage());
}
}

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Banquale.Views.MenuTransferPage">
<Grid RowDefinitions="auto, auto"
ColumnDefinitions="auto, auto"
HorizontalOptions="Center"
VerticalOptions="Center">
<Button
Text="Faire un virement"
Grid.Column="0"
Grid.Row="0"
Margin="20"
MinimumWidthRequest="160"
MinimumHeightRequest="160"
Clicked="Transfer_Clicked"/>
<Button
Text="Demander de l'argent"
Grid.Column="1"
Grid.Row="0"
Margin="20"
MinimumWidthRequest="160"
MinimumHeightRequest="160"
Clicked="Request_Clicked"/>
<Button
Text="Afficher mon RIB"
Grid.ColumnSpan="2"
Grid.Row="1"
Margin="20"
MinimumHeightRequest="160"
MinimumWidthRequest="360"
Clicked="RIB_Clicked"/>
</Grid>
</ContentPage>

@ -0,0 +1,29 @@
namespace Banquale.Views;
public partial class MenuTransferPage : ContentPage
{
public MenuTransferPage()
{
InitializeComponent();
}
void ContentPage_NavigatedTo(System.Object sender, Microsoft.Maui.Controls.NavigatedToEventArgs e)
{
}
public async void RIB_Clicked(Object sender, EventArgs e)
{
await Navigation.PushAsync(new RibPage());
}
public async void Request_Clicked(System.Object sender, System.EventArgs e)
{
await Navigation.PushAsync(new RequestPage());
}
public async void Transfer_Clicked(System.Object sender, System.EventArgs e)
{
await Navigation.PushAsync(new TransferPage());
}
}

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Banquale.Views.RequestPage">
<VerticalStackLayout VerticalOptions="Center">
<Frame CornerRadius="10"
HeightRequest="40"
WidthRequest="300"
Margin="0, 5, 0, 5"
Padding="3">
<Entry Placeholder="Destinataire"
HorizontalOptions="Center"
WidthRequest="280"/>
</Frame>
<Frame CornerRadius="10"
HeightRequest="40"
WidthRequest="300"
Margin="0, 5, 0, 5"
Padding="3">
<Entry Placeholder="IBAN"
HorizontalOptions="Center"
WidthRequest="280"/>
</Frame>
<Frame CornerRadius="10"
HeightRequest="40"
WidthRequest="300"
Margin="0, 5, 0, 5"
Padding="3">
<Entry Placeholder="Montant"
HorizontalOptions="Center"
WidthRequest="280"/>
</Frame>
<Button
Text="Envoyer la demande"
Margin="0, 75, 0, 0"
MinimumHeightRequest="80"
WidthRequest="300"
MaximumWidthRequest="400"/>
</VerticalStackLayout>
</ContentPage>

@ -0,0 +1,9 @@
namespace Banquale.Views;
public partial class RequestPage : ContentPage
{
public RequestPage()
{
InitializeComponent();
}
}

@ -0,0 +1,125 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Banquale.Views.RibPage">
<VerticalStackLayout>
<Grid RowDefinitions="auto, auto"
ColumnDefinitions="*, *">
<Label Text="Code Banque" />
<Label Text="Code agence"
Grid.Column="1" />
<Label Text="102 330"
Grid.Row="1" />
<Label Text="01 009"
Grid.Column="1"
Grid.Row="1" />
</Grid>
<Grid RowDefinitions="auto, auto, auto"
ColumnDefinitions="*, *, auto" >
<Label Text="N° de Compte" />
<Label Text="0000545090"
Grid.Row="1" />
<Label Text="Clé RIB"
Grid.Column="1" />
<Label Text="55"
Grid.Column="1"
Grid.Row="1" />
<Image Source="dotnet_bot.png"
Grid.Column="2"
Grid.RowSpan="2"
MaximumHeightRequest="45"/>
<BoxView Color="Gray"
Grid.ColumnSpan="3"
Grid.Row="2"
WidthRequest="400"
HeightRequest="1.5"/>
</Grid>
<Grid RowDefinitions="auto, auto, auto"
ColumnDefinitions="*, auto" >
<Label Text="RIB" />
<Label Text="FR56 9989 9900 7723 7732 7324 048"
Grid.Row="1" />
<Image Source="dotnet_bot.png"
Grid.Column="1"
Grid.RowSpan="2"
MaximumHeightRequest="50" />
<BoxView Color="Gray"
Grid.ColumnSpan="2"
Grid.Row="2"
WidthRequest="400"
HeightRequest="1.5" />
</Grid>
<Grid RowDefinitions="auto, auto, auto"
ColumnDefinitions="*, auto" >
<Label Text="RIB" />
<Label Text="FR56 9989 9900 7723 7732 7324 048"
Grid.Row="1" />
<Image Source="dotnet_bot.png"
Grid.Column="1"
Grid.RowSpan="2"
MaximumHeightRequest="50" />
<BoxView Color="Gray"
Grid.ColumnSpan="2"
Grid.Row="2"
WidthRequest="400"
HeightRequest="1.5" />
</Grid>
<Grid RowDefinitions="auto, auto, auto"
ColumnDefinitions="*, auto" >
<Label Text="RIB" />
<Label Text="FR56 9989 9900 7723 7732 7324 048"
Grid.Row="1" />
<Image Source="dotnet_bot.png"
Grid.Column="1"
Grid.RowSpan="2"
MaximumHeightRequest="50" />
<BoxView Color="Gray"
Grid.ColumnSpan="2"
Grid.Row="2"
WidthRequest="400"
HeightRequest="1.5" />
</Grid>
<Label
Text="Titulaire du compte" />
<Label Text="M BOURAUD DESCHAMPS" />
<Button Text="Télécharger le RIB"
HeightRequest="150"
WidthRequest="300" />
</VerticalStackLayout>
</ContentPage>

@ -0,0 +1,9 @@
namespace Banquale.Views;
public partial class RibPage : ContentPage
{
public RibPage()
{
InitializeComponent();
}
}

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Banquale.Views.TransferPage">
<VerticalStackLayout VerticalOptions="Center">
<Frame CornerRadius="10"
HeightRequest="40"
WidthRequest="300"
Margin="0, 5, 0, 5"
Padding="3">
<Entry Placeholder="Destinataire"
HorizontalOptions="Center"
WidthRequest="280"/>
</Frame>
<Frame CornerRadius="10"
HeightRequest="40"
WidthRequest="300"
Margin="0, 5, 0, 5"
Padding="3">
<Entry Placeholder="IBAN"
HorizontalOptions="Center"
WidthRequest="280"/>
</Frame>
<Frame CornerRadius="10"
HeightRequest="40"
WidthRequest="300"
Margin="0, 5, 0, 5"
Padding="3">
<Entry Placeholder="Montant"
HorizontalOptions="Center"
WidthRequest="280"/>
</Frame>
<Button
Text="Effectuer le virement"
Margin="0, 75, 0, 0"
MinimumHeightRequest="80"
WidthRequest="300"
MaximumWidthRequest="400"/>
</VerticalStackLayout>
</ContentPage>

@ -0,0 +1,9 @@
namespace Banquale.Views;
public partial class TransferPage : ContentPage
{
public TransferPage()
{
InitializeComponent();
}
}
Loading…
Cancel
Save