antoine.perederii
/
Banquale
0
7
Fork 0
Code Issues Pull Requests Packages Projects 5 Releases Wiki Activity

💥 🎨 🚚 Merge pull request 'C#/themes' (#44) from C#/themes into master
continuous-integration/drone/push Build is passing Details

Browse Source 
Reviewed-on: #44
pull/47/head
Antoine PEREDERII 2 years ago
parent 23b8474733 3e3c63a29c
commit e6e4cd4a4f
17 changed files with 118 additions and 164 deletions
Show Stats Download Patch File Download Diff File

2
src/Banquale/Banquale/App.xaml
Unescape View File

@ -1,7 +1,6 @@
<?xml version = "1.0" encoding = "UTF-8" ?> <?xml version = "1.0" encoding = "UTF-8" ?>
<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui" <Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:Banquale"
x:Class="Banquale.App"> x:Class="Banquale.App">
<Application.Resources> <Application.Resources>
@ -9,6 +8,7 @@
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<!-- Only light theme -->
<ResourceDictionary Source="Resources/Styles/Colors.xaml" /> <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
<ResourceDictionary Source="Resources/Styles/Styles.xaml" /> <ResourceDictionary Source="Resources/Styles/Styles.xaml" />

4
src/Banquale/Banquale/App.xaml.cs
Unescape View File

@ -21,7 +21,5 @@ public partial class App : Application
MainPage = new AppShell(); MainPage = new AppShell();
//MyManager.DataSave(); //MyManager.DataSave();
}
}
} }

4
src/Banquale/Banquale/AppShell.xaml
Unescape View File

@ -9,8 +9,8 @@
Shell.FlyoutBehavior="Disabled"> Shell.FlyoutBehavior="Disabled">
<!--<ShellContent ContentTemplate="{DataTemplate views:ConnectionPage}" <ShellContent ContentTemplate="{DataTemplate views:ConnectionPage}"
Route="connection"/>--> Route="connection"/>
<TabBar> <TabBar>

2
src/Banquale/Banquale/AppShell.xaml.cs
Unescape View File

@ -14,6 +14,4 @@ public partial class AppShell : Shell
Routing.RegisterRoute("menu/ribdetails", typeof(RibPage)); Routing.RegisterRoute("menu/ribdetails", typeof(RibPage));
Routing.RegisterRoute("menu/transferdetails", typeof(TransferPage)); Routing.RegisterRoute("menu/transferdetails", typeof(TransferPage));
} }
} }

2
src/Banquale/Banquale/Banquale.csproj
Unescape View File

@ -43,7 +43,7 @@
<MauiIcon Include="Resources\AppIcon\appicon.png" Color="#512BD4" /> <MauiIcon Include="Resources\AppIcon\appicon.png" Color="#512BD4" />
<!-- Splash Screen --> <!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.png" Color="#512BD4" BaseSize="128,128" /> <MauiSplashScreen Include="Resources\Splash\splash.png" Color="#a8daab" BaseSize="128,128" />
<!-- Images --> <!-- Images -->
<MauiImage Include="Resources\Images\*" /> <MauiImage Include="Resources\Images\*" />

8
src/Banquale/Banquale/Resources/Styles/Colors.xaml
Unescape View File

@ -4,14 +4,12 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
<Color x:Key="Primary">#074bab</Color> <Color x:Key="Primary">#aad7aa</Color>
<Color x:Key="PrimaryDark">#074bab</Color>
<Color x:Key="LightBackground">#FFF</Color> <Color x:Key="Background">#FFF</Color>
<Color x:Key="Darkground">#000</Color>
<Color x:Key="Secondary">#DFD8F7</Color> <Color x:Key="Secondary">#DFD8F7</Color>
<Color x:Key="Tertiary">#2B0B98</Color> <Color x:Key="Tertiary">#aad7aa</Color>
<Color x:Key="White">White</Color> <Color x:Key="White">White</Color>
<Color x:Key="Black">Black</Color> <Color x:Key="Black">Black</Color>

145
src/Banquale/Banquale/Resources/Styles/Styles.xaml
Unescape View File

@ -5,39 +5,40 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
<Style TargetType="ActivityIndicator"> <Style TargetType="ActivityIndicator">
<Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" /> <Setter Property="Color" Value="{StaticResource Primary}" />
</Style> </Style>
<Style TargetType="IndicatorView"> <Style TargetType="IndicatorView">
<Setter Property="IndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}"/> <Setter Property="IndicatorColor" Value="{StaticResource Gray200}"/>
<Setter Property="SelectedIndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray100}}"/> <Setter Property="SelectedIndicatorColor" Value="{StaticResource Gray950}"/>
</Style> </Style>
<Style TargetType="Border"> <Style TargetType="Border">
<Setter Property="Stroke" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" /> <Setter Property="Stroke" Value="{StaticResource Gray200}" />
<Setter Property="StrokeShape" Value="Rectangle"/> <Setter Property="StrokeShape" Value="Rectangle"/>
<Setter Property="StrokeThickness" Value="1"/> <Setter Property="StrokeThickness" Value="1"/>
</Style> </Style>
<Style TargetType="BoxView"> <Style TargetType="BoxView">
<Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" /> <Setter Property="Color" Value="{StaticResource Gray950}" />
</Style> </Style>
<Style TargetType="Button"> <Style TargetType="Button">
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Primary}}" /> <Setter Property="TextColor" Value="{StaticResource White}" />
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" /> <Setter Property="BackgroundColor" Value="{StaticResource Primary}" />
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="OpenSansRegular"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="14"/>
<Setter Property="CornerRadius" Value="8"/> <Setter Property="CornerRadius" Value="8"/>
<Setter Property="Padding" Value="14,10"/> <Setter Property="Padding" Value="14,10"/>
<Setter Property="BorderColor" Value="Red"/>
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList> <VisualStateGroupList>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" /> <Setter Property="TextColor" Value="{StaticResource Gray950}" />
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}" /> <Setter Property="BackgroundColor" Value="{StaticResource Gray200}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -46,14 +47,14 @@
</Style> </Style>
<Style TargetType="CheckBox"> <Style TargetType="CheckBox">
<Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" /> <Setter Property="Color" Value="{StaticResource Primary}" />
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList> <VisualStateGroupList>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="Color" Value="{StaticResource Gray300}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -62,7 +63,7 @@
</Style> </Style>
<Style TargetType="DatePicker"> <Style TargetType="DatePicker">
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="{StaticResource Gray900}" />
<Setter Property="BackgroundColor" Value="Transparent" /> <Setter Property="BackgroundColor" Value="Transparent" />
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="OpenSansRegular"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="14"/>
@ -72,7 +73,7 @@
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" /> <Setter Property="TextColor" Value="{StaticResource Gray200}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -81,18 +82,18 @@
</Style> </Style>
<Style TargetType="Editor"> <Style TargetType="Editor">
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="Black" />
<Setter Property="BackgroundColor" Value="Transparent" /> <Setter Property="BackgroundColor" Value="Transparent" />
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="OpenSansRegular"/>
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" /> <Setter Property="PlaceholderColor" Value="{StaticResource Gray200}" />
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList> <VisualStateGroupList>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="TextColor" Value="{StaticResource Gray300}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -101,18 +102,18 @@
</Style> </Style>
<Style TargetType="Entry"> <Style TargetType="Entry">
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="Black" />
<Setter Property="BackgroundColor" Value="Transparent" /> <Setter Property="BackgroundColor" Value="Transparent" />
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="OpenSansRegular"/>
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" /> <Setter Property="PlaceholderColor" Value="{StaticResource Gray200}" />
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList> <VisualStateGroupList>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="TextColor" Value="{StaticResource Gray300}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -122,7 +123,7 @@
<Style TargetType="Frame"> <Style TargetType="Frame">
<Setter Property="HasShadow" Value="False" /> <Setter Property="HasShadow" Value="False" />
<Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" /> <Setter Property="BorderColor" Value="{StaticResource Gray200}" />
<Setter Property="CornerRadius" Value="8" /> <Setter Property="CornerRadius" Value="8" />
</Style> </Style>
@ -146,7 +147,7 @@
</Style> </Style>
<Style TargetType="Label"> <Style TargetType="Label">
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="{StaticResource Gray900}" />
<Setter Property="FontFamily" Value="OpenSansRegular" /> <Setter Property="FontFamily" Value="OpenSansRegular" />
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
@ -155,7 +156,7 @@
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="TextColor" Value="{StaticResource Gray300}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -164,13 +165,13 @@
</Style> </Style>
<Style TargetType="ListView"> <Style TargetType="ListView">
<Setter Property="SeparatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" /> <Setter Property="SeparatorColor" Value="{StaticResource Gray200}" />
<Setter Property="RefreshControlColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" /> <Setter Property="RefreshControlColor" Value="{StaticResource Gray900}" />
</Style> </Style>
<Style TargetType="Picker"> <Style TargetType="Picker">
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="{StaticResource Gray900}" />
<Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" /> <Setter Property="TitleColor" Value="{StaticResource Gray900}" />
<Setter Property="BackgroundColor" Value="Transparent" /> <Setter Property="BackgroundColor" Value="Transparent" />
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="OpenSansRegular"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="14"/>
@ -180,8 +181,8 @@
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="TextColor" Value="{StaticResource Gray300}" />
<Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="TitleColor" Value="{StaticResource Gray300}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -190,14 +191,14 @@
</Style> </Style>
<Style TargetType="ProgressBar"> <Style TargetType="ProgressBar">
<Setter Property="ProgressColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" /> <Setter Property="ProgressColor" Value="{StaticResource Primary}" />
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList> <VisualStateGroupList>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="ProgressColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="ProgressColor" Value="{StaticResource Gray300}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -207,7 +208,7 @@
<Style TargetType="RadioButton"> <Style TargetType="RadioButton">
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="Black" />
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="OpenSansRegular"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="14"/>
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
@ -216,7 +217,7 @@
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="TextColor" Value="{StaticResource Gray300}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -225,11 +226,11 @@
</Style> </Style>
<Style TargetType="RefreshView"> <Style TargetType="RefreshView">
<Setter Property="RefreshColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" /> <Setter Property="RefreshColor" Value="{StaticResource Gray900}" />
</Style> </Style>
<Style TargetType="SearchBar"> <Style TargetType="SearchBar">
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="{StaticResource Gray900}" />
<Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" /> <Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" />
<Setter Property="CancelButtonColor" Value="{StaticResource Gray500}" /> <Setter Property="CancelButtonColor" Value="{StaticResource Gray500}" />
<Setter Property="BackgroundColor" Value="Transparent" /> <Setter Property="BackgroundColor" Value="Transparent" />
@ -241,8 +242,8 @@
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="TextColor" Value="{StaticResource Gray300}" />
<Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="PlaceholderColor" Value="{StaticResource Gray300}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -251,7 +252,7 @@
</Style> </Style>
<Style TargetType="SearchHandler"> <Style TargetType="SearchHandler">
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="{StaticResource Gray900}" />
<Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" /> <Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" />
<Setter Property="BackgroundColor" Value="Transparent" /> <Setter Property="BackgroundColor" Value="Transparent" />
<Setter Property="FontFamily" Value="OpenSansRegular" /> <Setter Property="FontFamily" Value="OpenSansRegular" />
@ -262,8 +263,8 @@
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="TextColor" Value="{StaticResource Gray300}" />
<Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="PlaceholderColor" Value="{StaticResource Gray300}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -274,23 +275,23 @@
<Style TargetType="Shadow"> <Style TargetType="Shadow">
<Setter Property="Radius" Value="15" /> <Setter Property="Radius" Value="15" />
<Setter Property="Opacity" Value="0.5" /> <Setter Property="Opacity" Value="0.5" />
<Setter Property="Brush" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource White}}" /> <Setter Property="Brush" Value="{StaticResource White}" />
<Setter Property="Offset" Value="10,10" /> <Setter Property="Offset" Value="10,10" />
</Style> </Style>
<Style TargetType="Slider"> <Style TargetType="Slider">
<Setter Property="MinimumTrackColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" /> <Setter Property="MinimumTrackColor" Value="{StaticResource Primary}" />
<Setter Property="MaximumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}" /> <Setter Property="MaximumTrackColor" Value="{StaticResource Gray200}" />
<Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" /> <Setter Property="ThumbColor" Value="{StaticResource Primary}" />
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList> <VisualStateGroupList>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="MinimumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/> <Setter Property="MinimumTrackColor" Value="{StaticResource Gray300}"/>
<Setter Property="MaximumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/> <Setter Property="MaximumTrackColor" Value="{StaticResource Gray300}"/>
<Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/> <Setter Property="ThumbColor" Value="{StaticResource Gray300}"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -299,11 +300,11 @@
</Style> </Style>
<Style TargetType="SwipeItem"> <Style TargetType="SwipeItem">
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" /> <Setter Property="BackgroundColor" Value="{StaticResource White}" />
</Style> </Style>
<Style TargetType="Switch"> <Style TargetType="Switch">
<Setter Property="OnColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" /> <Setter Property="OnColor" Value="{StaticResource Primary}" />
<Setter Property="ThumbColor" Value="{StaticResource White}" /> <Setter Property="ThumbColor" Value="{StaticResource White}" />
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList> <VisualStateGroupList>
@ -311,19 +312,19 @@
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="OnColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="OnColor" Value="{StaticResource Gray300}" />
<Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="ThumbColor" Value="{StaticResource Gray300}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="On"> <VisualState x:Name="On">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="OnColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource Gray200}}" /> <Setter Property="OnColor" Value="{StaticResource Secondary}" />
<Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" /> <Setter Property="ThumbColor" Value="{StaticResource Primary}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="Off"> <VisualState x:Name="Off">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray500}}" /> <Setter Property="ThumbColor" Value="{StaticResource Gray400}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -332,7 +333,7 @@
</Style> </Style>
<Style TargetType="TimePicker"> <Style TargetType="TimePicker">
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="{StaticResource Gray900}" />
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="OpenSansRegular"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="14"/>
@ -342,7 +343,7 @@
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" /> <Setter Property="TextColor" Value="{StaticResource Gray300}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -352,33 +353,33 @@
<Style TargetType="Page" ApplyToDerivedTypes="True"> <Style TargetType="Page" ApplyToDerivedTypes="True">
<Setter Property="Padding" Value="0"/> <Setter Property="Padding" Value="0"/>
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" /> <Setter Property="BackgroundColor" Value="{StaticResource White}" />
</Style> </Style>
<Style TargetType="Shell" ApplyToDerivedTypes="True"> <Style TargetType="Shell" ApplyToDerivedTypes="True">
<Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Gray950}}" /> <Setter Property="Shell.BackgroundColor" Value="{StaticResource Primary}" />
<Setter Property="Shell.ForegroundColor" Value="{OnPlatform WinUI={StaticResource Primary}, Default={StaticResource White}}" /> <Setter Property="Shell.ForegroundColor" Value="{StaticResource Gray900}" />
<Setter Property="Shell.TitleColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource White}}" /> <Setter Property="Shell.TitleColor" Value="{StaticResource White}" />
<Setter Property="Shell.DisabledColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" /> <Setter Property="Shell.DisabledColor" Value="{StaticResource Gray200}" />
<Setter Property="Shell.UnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray200}}" /> <Setter Property="Shell.UnselectedColor" Value="{StaticResource Gray200}" />
<Setter Property="Shell.NavBarHasShadow" Value="False" /> <Setter Property="Shell.NavBarHasShadow" Value="False" />
<Setter Property="Shell.TabBarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" /> <Setter Property="Shell.TabBarBackgroundColor" Value="{StaticResource White}" />
<Setter Property="Shell.TabBarForegroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" /> <Setter Property="Shell.TabBarForegroundColor" Value="{StaticResource Primary}" />
<Setter Property="Shell.TabBarTitleColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" /> <Setter Property="Shell.TabBarTitleColor" Value="{StaticResource Primary}" />
<Setter Property="Shell.TabBarUnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" /> <Setter Property="Shell.TabBarUnselectedColor" Value="{StaticResource Gray900}" />
</Style> </Style>
<Style TargetType="NavigationPage"> <Style TargetType="NavigationPage">
<Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Gray950}}" /> <Setter Property="BarBackgroundColor" Value="{StaticResource Primary}" />
<Setter Property="BarTextColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource White}}" /> <Setter Property="BarTextColor" Value="{StaticResource Gray200}" />
<Setter Property="IconColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource White}}" /> <Setter Property="IconColor" Value="{StaticResource Gray200}" />
</Style> </Style>
<Style TargetType="TabbedPage"> <Style TargetType="TabbedPage">
<Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray950}}" /> <Setter Property="BarBackgroundColor" Value="White" />
<Setter Property="BarTextColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" /> <Setter Property="BarTextColor" Value="{StaticResource Primary}" />
<Setter Property="UnselectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" /> <Setter Property="UnselectedTabColor" Value="{StaticResource Gray200}" />
<Setter Property="SelectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" /> <Setter Property="SelectedTabColor" Value="{StaticResource Gray950}" />
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>

6
src/Banquale/Banquale/Views/Balance/BalancePage.xaml
Unescape View File

@ -43,13 +43,11 @@
<Label <Label
Text="Solde" Text="Solde"
WidthRequest="75" Margin="0, 0, 50, 0"/>
TextColor="Black"
HorizontalOptions="Center"/>
<Label <Label
Text="{Binding CustomersList[0].AccountsList[0].Balance} " Text="{Binding CustomersList[0].AccountsList[0].Balance} "
Grid.Column="1" Grid.Column="1"
Margin="0, 0, 5, 0"/> Margin="50, 0, 5, 0"/>
<Label Text="€" <Label Text="€"
Grid.Column="2"/> Grid.Column="2"/>

1
src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
Unescape View File

@ -1,4 +1,5 @@
using Banquale.Model; using Banquale.Model;
namespace Banquale.Views.Balance; namespace Banquale.Views.Balance;

3
src/Banquale/Banquale/Views/Category/CategoryView.xaml
Unescape View File

@ -5,8 +5,7 @@
<VerticalStackLayout> <VerticalStackLayout>
<BoxView BackgroundColor="Black" <BoxView HorizontalOptions="FillAndExpand"
HorizontalOptions="FillAndExpand"
HeightRequest="1.3" HeightRequest="1.3"
Margin="20, 0, 20, 0"/> Margin="20, 0, 20, 0"/>

12
src/Banquale/Banquale/Views/ConnectionPage.xaml
Unescape View File

@ -3,14 +3,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Banquale.Views.ConnectionPage" x:Class="Banquale.Views.ConnectionPage"
Title="ConnectionPage" Title="ConnectionPage"
BackgroundColor="White"
Shell.NavBarIsVisible="False"> Shell.NavBarIsVisible="False">
<StackLayout> <StackLayout>
<Frame BackgroundColor="#C8C8C8" CornerRadius="20" Margin="20, 250, 20, 0"> <Frame CornerRadius="20" Margin="20, 250, 20, 0">
<Entry Placeholder="Identifiant" <Entry Placeholder="Identifiant"
PlaceholderColor="#6E6E6E"
TextColor="#212121"
MaxLength="20" MaxLength="20"
MinimumWidthRequest="275" MinimumWidthRequest="275"
HorizontalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand"
@ -18,10 +15,8 @@
FontSize="Large"/> FontSize="Large"/>
</Frame> </Frame>
<Frame BackgroundColor="#C8C8C8" CornerRadius="10" Margin="20, 75, 20, 0"> <Frame CornerRadius="10" Margin="20, 75, 20, 0">
<Entry Placeholder="Mot de passe" <Entry Placeholder="Mot de passe"
PlaceholderColor="#6E6E6E"
TextColor="#212121"
IsPassword="True" IsPassword="True"
MinimumWidthRequest="275" MinimumWidthRequest="275"
MaxLength="20" MaxLength="20"
@ -32,10 +27,7 @@
<Button Text="Se connecter" <Button Text="Se connecter"
BorderWidth="2" BorderWidth="2"
BorderColor="Black"
HorizontalOptions="Fill" HorizontalOptions="Fill"
BackgroundColor="Gray"
TextColor="Black"
MinimumHeightRequest="75" MinimumHeightRequest="75"
Margin="10,75,10,0" Margin="10,75,10,0"
FontSize="Large" FontSize="Large"

2
src/Banquale/Banquale/Views/ConnectionPage.xaml.cs
Unescape View File

@ -9,7 +9,7 @@ public partial class ConnectionPage : ContentPage
public async void Connection_Clicked(Object sender, EventArgs e) public async void Connection_Clicked(Object sender, EventArgs e)
{ {
await Shell.Current.GoToAsync("///balance"); await Navigation.PushModalAsync(new SwitchAccountPage());
} }
} }

39
src/Banquale/Banquale/Views/SwitchAccountPage.xaml
Unescape View File

@ -4,7 +4,6 @@
xmlns:local="clr-namespace:Banquale.Views" xmlns:local="clr-namespace:Banquale.Views"
x:Class="Banquale.Views.SwitchAccountPage" x:Class="Banquale.Views.SwitchAccountPage"
Title="SwitchAccountPage" Title="SwitchAccountPage"
BackgroundColor="White"
Shell.NavBarIsVisible="False"> Shell.NavBarIsVisible="False">
@ -30,43 +29,19 @@
</StackLayout>--> </StackLayout>-->
<Grid RowDefinitions="3*, 2*, *, 2*, *, 2*, 3*"> <Grid RowDefinitions="2*, 2*, *">
<Grid Grid.Row="1"> <local:SwitchAccountView Grid.Row="0"/>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="15*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<local:SwitchAccountView Grid.Column="1"/> <local:SwitchAccountView Grid.Row="1"/>
</Grid>
<Grid Grid.Row="3"> <Button
<Grid.ColumnDefinitions> Text="Déconnexion"
<ColumnDefinition Width="*"/> Grid.Row="2"
<ColumnDefinition Width="15*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<local:SwitchAccountView Grid.Column="1"/>
</Grid>
<Grid Grid.Row="5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="15*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Button Grid.Column="1" Text="Déconnexion"
BorderWidth="2"
BorderColor="Black"
HorizontalOptions="Fill" HorizontalOptions="Fill"
BackgroundColor="Gray"
TextColor="Black"
MinimumHeightRequest="75" MinimumHeightRequest="75"
MinimumWidthRequest="375" MinimumWidthRequest="375"
FontSize="Large"/> Clicked="DisconnectionClicked"/>
</Grid>
</Grid> </Grid>
</ContentPage> </ContentPage>

6
src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs
Unescape View File

@ -6,4 +6,10 @@ public partial class SwitchAccountPage : ContentPage
{ {
InitializeComponent(); InitializeComponent();
} }
async void DisconnectionClicked(System.Object sender, System.EventArgs e)
{
await Shell.Current.GoToAsync("///connection");
}
} }

23
src/Banquale/Banquale/Views/SwitchAccountView.xaml
Unescape View File

@ -2,22 +2,13 @@
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui" <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Banquale.Views.SwitchAccountView"> x:Class="Banquale.Views.SwitchAccountView">
<ContentView.Resources>
<Style TargetType="Button">
<Setter Property="BorderColor" Value="Black" />
<Setter Property="BorderWidth" Value="2" />
<Setter Property="BackgroundColor" Value="Gray" />
<Setter Property="TextColor" Value="Black" />
<Setter Property="FontSize" Value="Large" />
<Setter Property="MinimumHeightRequest" Value="75" />
<Setter Property="HorizontalOptions" Value="Fill" />
<Setter Property="VerticalOptions" Value="Center"/>
<Setter Property="LineBreakMode" Value="WordWrap" />
</Style>
</ContentView.Resources>
<Button Text=" Compte Personnel &#x0a; Mme Tatouille " <VerticalStackLayout>
Clicked="Transfer_Clicked"/>
<!-- &#x0a; sert à faire un retour à la ligne--> <Button Text=" Compte Personnel &#x0a; Mme Tatouille "
Clicked="Transfer_Clicked"/>
<!-- &#x0a; sert à faire un retour à la ligne-->
</VerticalStackLayout>
</ContentView> </ContentView>

2
src/Banquale/Banquale/Views/SwitchAccountView.xaml.cs
Unescape View File

@ -9,7 +9,7 @@ public partial class SwitchAccountView : ContentView
public async void Transfer_Clicked(object sender, EventArgs e) public async void Transfer_Clicked(object sender, EventArgs e)
{ {
await Shell.Current.GoToAsync("///connection"); await Shell.Current.GoToAsync("//balance");
} }
} }

17
src/Banquale/Banquale/Views/TransactionsPage.xaml
Unescape View File

@ -1,16 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui" <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Banquale.Views.TransactionsPage" x:Class="Banquale.Views.TransactionsPage"
Title="TransactionsPage" Title="TransactionsPage">
BackgroundColor="White">
<Grid RowDefinitions="2*, *, 0*, *, 0*, *, *, *, *, *, *"> <Grid RowDefinitions="2*, *, 0*, *, 0*, *, *, *, *, *, *">
<Grid Grid.Row="1" ColumnDefinitions="2*, *, 2*"> <Grid Grid.Row="1" ColumnDefinitions="2*, *, 2*">
<Label Grid.Column="1" <Label Grid.Column="1"
Text="Prix" Text="Prix"
TextColor="Black"
HorizontalOptions="Center" HorizontalOptions="Center"
FontSize="Large"/> FontSize="Large"/>
</Grid> </Grid>
@ -18,23 +16,22 @@
<Grid Grid.Row="3" ColumnDefinitions="*, *, *"> <Grid Grid.Row="3" ColumnDefinitions="*, *, *">
<Label Grid.Column="1" <Label Grid.Column="1"
Text="poiuytreza" Text="poiuytreza"
TextColor="Black"
HorizontalOptions="Center"/> HorizontalOptions="Center"/>
</Grid> </Grid>
<Grid Grid.Row="5" ColumnDefinitions="*, 4*, *"> <Grid Grid.Row="5" ColumnDefinitions="*, 4*, *">
<Button Grid.Column="1" Text="Categorie" TextColor="Black" FontSize="Medium" BackgroundColor="Gray"/> <Button Grid.Column="1" Text="Categorie" FontSize="Medium" />
</Grid> </Grid>
<Grid Grid.Row="7" RowDefinitions="auto, *, *" ColumnDefinitions="*, auto, *"> <Grid Grid.Row="7" RowDefinitions="auto, *, *" ColumnDefinitions="*, auto, *">
<Label Grid.Row="0" Grid.Column="1" TextColor="Black" Text=" Paiment par carte &#x0a;4859 **** **** 9985" VerticalOptions="Center"/> <Label Grid.Row="0" Grid.Column="1" Text=" Paiment par carte &#x0a;4859 **** **** 9985" VerticalOptions="Center"/>
<BoxView Grid.Row="1" Grid.Column="1" HorizontalOptions="FillAndExpand" <BoxView Grid.Row="1" Grid.Column="1" HorizontalOptions="FillAndExpand"
HeightRequest="1.3" Color="Black"/> HeightRequest="1.3"/>
<Label Grid.Row="2" Grid.Column="1" Text="En date du 15/06/2023" TextColor="Black"/> <Label Grid.Row="2" Grid.Column="1" Text="En date du 15/06/2023"/>
</Grid> </Grid>
<Grid Grid.Row="9" ColumnDefinitions="*, 4*, *"> <Grid Grid.Row="9" ColumnDefinitions="*, 4*, *">
<Button Grid.Column="1" Text="Faire opposition" BackgroundColor="Gray" TextColor="Black"/> <Button Grid.Column="1" Text="Faire opposition"/>
</Grid> </Grid>
</Grid> </Grid>

Write Preview
Loading…
Cancel
Save