modification du header

pull/1/head
Vianney JOURDY 2 years ago
parent ed44acf093
commit 1e1b3e37de

@ -4,33 +4,33 @@
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"
xmlns:local="clr-namespace:MangaMap" xmlns:local="clr-namespace:MangaMap"
xmlns:Views="clr-namespace:MangaMap.Views"> xmlns:Views="clr-namespace:MangaMap.Views"
Shell.FlyoutBehavior="Flyout"
Shell.NavBarIsVisible="False">
<TabBar> <ShellContent
<Tab Title="HomePage"> Title="Home"
<ShellContent ContentTemplate="{DataTemplate Views:homePage}"
ContentTemplate="{DataTemplate Views:homePage}" /> Route="MainPage" />
</Tab>
<Tab Title="signUpPage"> <ShellContent
<ShellContent Title="Inscription"
ContentTemplate="{DataTemplate Views:signUpPage}" /> ContentTemplate="{DataTemplate Views:signUpPage}" />
</Tab>
<Tab Title="loginPage"> <ShellContent
<ShellContent Title="Connection"
ContentTemplate="{DataTemplate Views:loginPage}" /> ContentTemplate="{DataTemplate Views:loginPage}" />
</Tab>
<Tab Title="settingsPage"> <ShellContent
<ShellContent Title="Paramètres"
ContentTemplate="{DataTemplate Views:settingsPage}" /> ContentTemplate="{DataTemplate Views:settingsPage}" />
</Tab>
<Tab Title="listPage"> <ShellContent
<ShellContent Title="Liste"
ContentTemplate="{DataTemplate Views:listPage}" /> ContentTemplate="{DataTemplate Views:listPage}" />
</Tab>
<Tab Title="ficheAnime"> <ShellContent
<ShellContent Title="Fiche Exemple"
ContentTemplate="{DataTemplate Views:ficheAnime}" /> ContentTemplate="{DataTemplate Views:ficheAnime}" />
</Tab>
</TabBar>
</Shell> </Shell>

@ -0,0 +1,12 @@
<?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="MangaMap.NewContent1"
Background="{StaticResource Primary}">
<Grid ColumnDefinitions="50, *, 30">
<ImageButton Source="logo.png"
MaximumHeightRequest="30"
MaximumWidthRequest="30"
VerticalOptions="Center"/>
</Grid>
</ContentView>

@ -0,0 +1,9 @@
namespace MangaMap;
public partial class NewContent1 : ContentView
{
public NewContent1()
{
InitializeComponent();
}
}

@ -48,21 +48,28 @@
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" /> <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Remove="Resources\Images\logo.png" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="CustomHeader.xaml.cs">
<DependentUpon>CustomHeader.xaml</DependentUpon>
</Compile>
<Compile Update="Views\signUpPage.xaml.cs"> <Compile Update="Views\signUpPage.xaml.cs">
<DependentUpon>signUpPage.xaml</DependentUpon> <DependentUpon>signUpPage.xaml</DependentUpon>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MauiXaml Update="Resources\Theme\DarkTheme.xaml"> <MauiXaml Update="CustomHeader.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\CustomHeader.xaml"> <MauiXaml Update="Resources\Theme\DarkTheme.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\homePage.xaml"> <MauiXaml Update="Views\homePage.xaml">

@ -9,7 +9,7 @@ public static class MauiProgram
var builder = MauiApp.CreateBuilder(); var builder = MauiApp.CreateBuilder();
builder builder
.UseMauiApp<App>() .UseMauiApp<App>()
.ConfigureFonts(fonts => .ConfigureFonts(fonts =>
{ {
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 101 KiB

@ -1,10 +0,0 @@
<?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="MangaMap.Views.CustomHeader"
BackgroundColor="DarkSalmon">
<Grid ColumnDefinitions="30, *, 30">
</Grid>
</ContentView>

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

@ -1,18 +1,23 @@
<?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"
xmlns:local="clr-namespace:MangaMap"
x:Class="MangaMap.Views.homePage"> x:Class="MangaMap.Views.homePage">
<Grid RowDefinitions="40, *">
<local:NewContent1 HeightRequest="40" VerticalOptions="Start" Padding="10, 0"/>
<ScrollView <ScrollView
BackgroundColor="#1E1E1E"> BackgroundColor="#1E1E1E"
Grid.Row="1">
<VerticalStackLayout <VerticalStackLayout
Spacing="70" Spacing="70"
VerticalOptions="Center"> VerticalOptions="Center">
<SearchBar Placeholder="Recherche" <SearchBar Placeholder="Recherche"
BackgroundColor="White"
CancelButtonColor="Orange" CancelButtonColor="Orange"
TextColor="Black" TextColor="Black"
BackgroundColor="White"
HorizontalTextAlignment="Center" HorizontalTextAlignment="Center"
Margin="30" Margin="30"
/> />
@ -69,7 +74,60 @@
Fill="Yellow"/> Fill="Yellow"/>
</HorizontalStackLayout> </HorizontalStackLayout>
</VerticalStackLayout> <HorizontalStackLayout
Spacing="100"
HorizontalOptions="Center">
<Rectangle
WidthRequest="150"
HeightRequest="150"
Fill="Red"
/>
<Rectangle
WidthRequest="150"
HeightRequest="150"
Fill="Orange"/>
<Rectangle
WidthRequest="150"
HeightRequest="150"
Fill="Blue"/>
<Rectangle
WidthRequest="150"
HeightRequest="150"
Fill="Purple"/>
</HorizontalStackLayout>
<HorizontalStackLayout
Spacing="100"
HorizontalOptions="Center">
<Rectangle
WidthRequest="150"
HeightRequest="150"
Fill="Purple"
/>
<Rectangle
WidthRequest="150"
HeightRequest="150"
Fill="Green"/>
<Rectangle
WidthRequest="150"
HeightRequest="150"
Fill="Gray"/>
<Rectangle
WidthRequest="150"
HeightRequest="150"
Fill="Yellow"/>
</HorizontalStackLayout>
</VerticalStackLayout>
</ScrollView> </ScrollView>
</Grid>
</ContentPage> </ContentPage>

@ -18,93 +18,64 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Margin="20" Grid.Row="0"> <Grid Margin="20" Grid.Row="0" ColumnDefinitions="*,300,300">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" <Label Grid.Column="0"
Text="Titre" FontSize="Large" TextColor="White" Text="Titre" FontSize="Large" TextColor="White"
HorizontalOptions="Start" VerticalOptions="Center"/> HorizontalOptions="Start" VerticalOptions="Center"/>
<Label Grid.Column="1" <Label Grid.Column="1"
Text="Score" FontSize="Large" TextColor="White" Text="Score" FontSize="Large" TextColor="White"
HorizontalOptions="Center" VerticalOptions="Center"/> HorizontalOptions="Center" VerticalOptions="Center"/>
<Label Grid.Column="10" <Label Grid.Column="2"
Text="Progression" FontSize="Large" TextColor="White" Text="Progression" FontSize="Large" TextColor="White"
HorizontalOptions="End" VerticalOptions="Center"/> HorizontalOptions="End" VerticalOptions="Center"/>
</Grid> </Grid>
<ScrollView Grid.Row="1" VerticalScrollBarVisibility="Always"> <ScrollView Grid.Row="1" VerticalScrollBarVisibility="Always">
<VerticalStackLayout Spacing="10"> <VerticalStackLayout Spacing="10">
<Grid Margin="20,0,20,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Rectangle Grid.Column="0" Fill="#FFFFFF" WidthRequest="100" HeightRequest="100"/> <Grid Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
<Rectangle Grid.Column="0" Fill="#FFFFFF" WidthRequest="100" HeightRequest="100" HorizontalOptions="Start"/>
<Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/> <Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
<Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/> <Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/>
<Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/> <Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/>
</Grid> </Grid>
<Grid Margin="20,0,20,0"> <Grid Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Rectangle Grid.Column="0" Fill="Blue" WidthRequest="100" HeightRequest="100"/> <Rectangle Grid.Column="0" Fill="Blue" WidthRequest="100" HeightRequest="100" HorizontalOptions="Start"/>
<Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/> <Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
<Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/> <Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/>
<Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/> <Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/>
</Grid> </Grid>
<Grid Margin="20,0,20,0"> <Grid Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Rectangle Grid.Column="0" Fill="Red" WidthRequest="100" HeightRequest="100"/> <Rectangle Grid.Column="0" Fill="Red" WidthRequest="100" HeightRequest="100" HorizontalOptions="Start"/>
<Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/> <Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
<Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/> <Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/>
<Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/> <Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/>
</Grid> </Grid>
<Grid Margin="20,0,20,0"> <Grid Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Rectangle Grid.Column="0" Fill="#FFFFFF" WidthRequest="100" HeightRequest="100"/> <Rectangle Grid.Column="0" Fill="#FFFFFF" WidthRequest="100" HeightRequest="100" HorizontalOptions="Start"/>
<Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/> <Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
<Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/> <Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/>
<Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/> <Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/>
</Grid> </Grid>
<Grid Margin="20,0,20,0"> <Grid Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Rectangle Grid.Column="0" Fill="Blue" WidthRequest="100" HeightRequest="100"/> <Rectangle Grid.Column="0" Fill="Blue" WidthRequest="100" HeightRequest="100" HorizontalOptions="Start"/>
<Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/> <Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
<Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/> <Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/>
<Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/> <Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/>
</Grid> </Grid>
<Grid Margin="20,0,20,0"> <Grid Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Rectangle Grid.Column="0" Fill="Red" WidthRequest="100" HeightRequest="100"/> <Rectangle Grid.Column="0" Fill="Red" WidthRequest="100" HeightRequest="100" HorizontalOptions="Start"/>
<Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/> <Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
<Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/> <Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/>
<Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/> <Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/>

Loading…
Cancel
Save