merging master in xaml/transfer-page

pull/11/head
Titouan LOUVET 2 years ago
commit 106c9cf66e

@ -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

@ -4,12 +4,19 @@
xmlns:local="clr-namespace:Banquale"
x:Class="Banquale.App">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Resources/Styles/Colors.xaml" />
<ResourceDictionary Source="Resources/Styles/Styles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>

@ -49,6 +49,7 @@
</Tab>
</TabBar>
</Shell>

@ -33,6 +33,9 @@
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-ios|AnyCPU'">
<CreatePackage>false</CreatePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-ios|AnyCPU'">
<CreatePackage>false</CreatePackage>
</PropertyGroup>
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
@ -68,5 +71,9 @@
<BundleResource Include="Resources\Images\back_arrow_icon.svg" />
<BundleResource Include="Resources\Images\swipe_account_icon.svg" />
<BundleResource Include="Resources\Images\help_icon.svg" />
<MauiXaml Remove="Resources\Images\Images.xaml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Syncfusion.Maui.Inputs" Version="21.2.3" />
</ItemGroup>
</Project>

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="M271 936 80 745l192-192 42 42-120 120h649v60H194l119 119-42 42Zm418-337-42-42 119-119H117v-60h649L646 258l42-42 192 192-191 191Z"/></svg>

After

Width:  |  Height:  |  Size: 232 B

@ -0,0 +1 @@
<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>

After

Width:  |  Height:  |  Size: 382 B

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="M480 976q-83 0-156-31.5T197 859q-54-54-85.5-127T80 576q0-83 31.5-156T197 293q54-54 127-85.5T480 176q83 0 156 31.5T763 293q54 54 85.5 127T880 576q0 83-31.5 156T763 859q-54 54-127 85.5T480 976Zm-121-80 63-150q-38-13-67.5-41.5T310 635l-150 60q31 71 82 123t117 78Zm-50-378q16-41 45-70t67-42l-60-150q-75 31-127 83.5T160 458l149 60Zm171 178q50 0 85-35t35-85q0-50-35-85t-85-35q-50 0-85 35t-35 85q0 50 35 85t85 35Zm121 200q69-28 120-79.5T800 697l-150-62q-15 42-44.5 70.5T538 746l63 150Zm49-379 150-62q-28-68-79.5-119.5T601 256l-61 150q38 13 66 41.5t44 69.5Z"/></svg>

After

Width:  |  Height:  |  Size: 653 B

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="M212 815V476h60v339h-60Zm242 0V476h60v339h-60ZM80 935v-60h800v60H80Zm608-120V476h60v339h-60ZM80 416v-53l400-228 400 228v53H80Zm134-60h532-532Zm0 0h532L480 204 214 356Z"/></svg>

After

Width:  |  Height:  |  Size: 271 B

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="M480 1016q-112 0-216-66T100 799v137H40V696h240v60H143q51 77 145.5 138.5T480 956q78 0 147.5-30t121-81.5Q800 793 830 723.5T860 576h60q0 91-34.5 171T791 887q-60 60-140 94.5T480 1016Zm-29-153v-54q-45-12-75.5-38.5T324 698l51-17q12 38 42.5 60t69.5 22q40 0 66.5-19.5T580 692q0-33-25-55.5T463 586q-60-25-90-54t-30-78q0-44 30-75t80-38v-51h55v51q38 4 66 24t45 55l-48 23q-15-28-37-42t-52-14q-39 0-61.5 18T398 454q0 32 26 51t84 43q69 29 98 61t29 83q0 25-9 46t-25.5 36Q584 789 560 798.5T506 811v52h-55ZM40 576q0-91 34.5-171T169 265q60-60 140-94.5T480 136q112 0 216 66t164 151V216h60v240H680v-60h137q-51-77-145-138.5T480 196q-78 0-147.5 30t-121 81.5Q160 359 130 428.5T100 576H40Z"/></svg>

After

Width:  |  Height:  |  Size: 769 B

@ -4,11 +4,19 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
<Color x:Key="Primary">#512BD4</Color>
<Color x:Key="Primary">#074bab</Color>
<Color x:Key="PrimaryDark">#074bab</Color>
<Color x:Key="LightBackground">#FFF</Color>
<Color x:Key="Darkground">#000</Color>
<Color x:Key="Secondary">#DFD8F7</Color>
<Color x:Key="Tertiary">#2B0B98</Color>
<Color x:Key="White">White</Color>
<Color x:Key="Black">Black</Color>
<Color x:Key="Gray100">#E1E1E1</Color>
<Color x:Key="Gray200">#C8C8C8</Color>
<Color x:Key="Gray300">#ACACAC</Color>

@ -0,0 +1,133 @@
<?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"
xmlns:local="clr-namespace:Banquale.Views"
x:Class="Banquale.Views.BalancePage"
Title="BalancePage"
>
<Grid RowDefinitions="auto, *">
<Grid BackgroundColor="Beige"
HorizontalOptions="Center"
HeightRequest="100"
MaximumHeightRequest="150"
WidthRequest="230"
RowDefinitions="auto, 35, *"
ColumnDefinitions="250, auto"
Grid.Row="0"
Margin="30"
>
<Label
Text="Compte Professionnel"
HorizontalOptions="Center"
BackgroundColor="AliceBlue"
Margin="0, 15, 0, 0"/>
<Label
Text="Mme Perotte"
Grid.Row="1"
Grid.ColumnSpan="2"
HorizontalOptions="Center"
BackgroundColor="SaddleBrown"/> <!-- colspan permet de redefinir la taille de la colonne -->
<Grid ColumnDefinitions="*, *" Grid.Row="2" >
<Label
Text="Solde"
WidthRequest="75"
HorizontalOptions="Center"/>
<Label
Text="1999,00 €"
Grid.Column="1"
MinimumWidthRequest="70"
HorizontalOptions="Center"/>
</Grid>
</Grid>
<ScrollView
Grid.Row="1">
<FlexLayout JustifyContent="Center"
AlignItems="Start"
AlignContent="Start"
Direction="Row"
Wrap="Wrap">
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView />
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView />
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView />
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView />
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
<local:BalanceView/>
</FlexLayout>
</ScrollView>
</Grid>
</ContentPage>

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Banquale.Views.BalanceView">
<VerticalStackLayout>
<BoxView BackgroundColor="Black"
HorizontalOptions="FillAndExpand"
HeightRequest="1.3"
Margin="20, 0, 20, 0"/>
<Grid
ColumnDefinitions="40, 3*, *"
Margin="20, 5, 20, 5"
HorizontalOptions="Fill">
<Image Source="dotnet_bot.png"
Grid.Column="0"
MaximumHeightRequest="30"/>
<Label
Text="Depense"
Grid.Column="1"
VerticalOptions="Center"
Margin="10, 0, 0, 0"/>
<Label
Text="Prix"
Grid.Column="2"
VerticalOptions="Center"
HorizontalOptions="End"
Margin="0, 0, 20, 0"/>
</Grid>
</VerticalStackLayout>
</ContentView>

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

@ -0,0 +1,50 @@
<?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"/>
</VerticalStackLayout>
</ContentPage>

@ -0,0 +1,13 @@
namespace Banquale.Views;
public partial class HelpPage : ContentPage
{
public HelpPage()
{
InitializeComponent();
}
void ContentPage_NavigatedTo(System.Object sender, Microsoft.Maui.Controls.NavigatedToEventArgs e)
{
}
}
Loading…
Cancel
Save