vianney.jourdy
/
MapManga
0
8
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

résolution des conflicts

Browse Source
dictionnaire
Vianney JOURDY 2 years ago
parent 4bafc35d28 9c4c2b0c17
commit 2e70e240e6
5 changed files with 89 additions and 77 deletions
Show Stats Download Patch File Download Diff File

45
MangaMap/AppShell.xaml
Unescape View File

@ -5,32 +5,39 @@
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.FlyoutBehavior="Disabled"
Shell.NavBarIsVisible="False"> Shell.NavBarIsVisible="False">
<ShellContent <TabBar>
Title="Home" <ShellContent
ContentTemplate="{DataTemplate Views:homePage}" Title="Home"
ContentTemplate="{DataTemplate Views:homePage}"
Route="MainPage" /> Route="MainPage" />
<ShellContent <ShellContent
Title="Inscription" Title="Inscription"
ContentTemplate="{DataTemplate Views:signUpPage}" /> ContentTemplate="{DataTemplate Views:signUpPage}" />
<ShellContent <ShellContent
Title="Connection" Title="Connection"
ContentTemplate="{DataTemplate Views:loginPage}" /> ContentTemplate="{DataTemplate Views:loginPage}" />
<ShellContent <ShellContent
Title="Paramètres" Title="Paramètres"
ContentTemplate="{DataTemplate Views:settingsPage}" /> ContentTemplate="{DataTemplate Views:settingsPage}" />
<ShellContent <ShellContent
Title="Liste" Title="Liste"
ContentTemplate="{DataTemplate Views:listPage}" /> ContentTemplate="{DataTemplate Views:listPage}" />
<ShellContent </TabBar>
Title="Fiche Exemple"
ContentTemplate="{DataTemplate Views:ficheAnime}" /> <FlyoutItem>
<ShellContent
Title="Fiche Exemple"
ContentTemplate="{DataTemplate Views:ficheAnime}" />
</FlyoutItem>
</Shell> </Shell>

23
MangaMap/MangaMap.csproj
Unescape View File

@ -48,6 +48,21 @@
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" /> <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<AndroidResource Remove="Component\**" />
<AndroidResource Remove="NewFolder\**" />
<Compile Remove="Component\**" />
<Compile Remove="NewFolder\**" />
<EmbeddedResource Remove="Component\**" />
<EmbeddedResource Remove="NewFolder\**" />
<MauiCss Remove="Component\**" />
<MauiCss Remove="NewFolder\**" />
<MauiXaml Remove="Component\**" />
<MauiXaml Remove="NewFolder\**" />
<None Remove="Component\**" />
<None Remove="NewFolder\**" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Remove="Resources\Images\logo.png" /> <None Remove="Resources\Images\logo.png" />
<None Remove="Resources\Images\test.jpg" /> <None Remove="Resources\Images\test.jpg" />
@ -73,6 +88,9 @@
<MauiXaml Update="Resources\Theme\DarkTheme.xaml"> <MauiXaml Update="Resources\Theme\DarkTheme.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\Composants\StyleBouton.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\homePage.xaml"> <MauiXaml Update="Views\homePage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
@ -90,9 +108,4 @@
</MauiXaml> </MauiXaml>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Component\" />
<Folder Include="NewFolder\" />
</ItemGroup>
</Project> </Project>

12
MangaMap/Views/Composants/StyleBouton.xaml
Unescape View File

@ -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.Views.Composants.StyleBouton">
<ImageButton
Style="{StaticResource ImageAnime}"
BackgroundColor="Red"
Source="test2.png"
Clicked="ButtonIsPressed"/>
</ContentView>

14
MangaMap/Views/Composants/StyleBouton.xaml.cs
Unescape View File

@ -0,0 +1,14 @@
namespace MangaMap.Views.Composants;
public partial class StyleBouton : ContentView
{
public StyleBouton()
{
InitializeComponent();
}
private async void ButtonIsPressed(object sender, EventArgs e)
{
await Shell.Current.Navigation.PushAsync(new ficheAnime());
}
}

72
MangaMap/Views/homePage.xaml
Unescape View File

@ -3,7 +3,9 @@
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:modeles="clr-namespace:MangaMap.Model" xmlns:modeles="clr-namespace:MangaMap.Model"
x:Class="MangaMap.Views.homePage"> x:Class="MangaMap.Views.homePage"
xmlns:views="clr-namespace:MangaMap.Views.Composants">
<ContentPage.BindingContext> <ContentPage.BindingContext>
<modeles:Manager/> <modeles:Manager/>
@ -46,11 +48,7 @@
HorizontalOptions="Center"> HorizontalOptions="Center">
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}"
BackgroundColor="Red"
Source="test2.png"
/>
<ImageButton <ImageButton
Style="{StaticResource ImageAnime}" Style="{StaticResource ImageAnime}"
@ -58,13 +56,9 @@
Source="test.jpg" Source="test.jpg"
/> />
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}"
BackgroundColor="Blue"/>
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}"
BackgroundColor="Purple"/>
</HorizontalStackLayout> </HorizontalStackLayout>
@ -72,22 +66,13 @@
Spacing="100" Spacing="100"
HorizontalOptions="Center"> HorizontalOptions="Center">
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}"
BackgroundColor="Purple"
/>
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}"
BackgroundColor="Green"/>
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}"
BackgroundColor="Gray"/>
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}"
BackgroundColor="Yellow"/>
</HorizontalStackLayout> </HorizontalStackLayout>
@ -95,22 +80,12 @@
Spacing="100" Spacing="100"
HorizontalOptions="Center"> HorizontalOptions="Center">
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}"
BackgroundColor="Red"
/>
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}" <views:StyleBouton/>
BackgroundColor="Orange"/>
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}"
BackgroundColor="Blue"/>
<ImageButton
Style="{StaticResource ImageAnime}"
BackgroundColor="Purple"/>
</HorizontalStackLayout> </HorizontalStackLayout>
@ -119,27 +94,18 @@
Spacing="100" Spacing="100"
HorizontalOptions="Center"> HorizontalOptions="Center">
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}"
BackgroundColor="Purple"
/>
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}"
BackgroundColor="Red"
/>
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}"
BackgroundColor="Gray"/>
<ImageButton <views:StyleBouton/>
Style="{StaticResource ImageAnime}"
BackgroundColor="Yellow"/>
</HorizontalStackLayout> </HorizontalStackLayout>
<ListView x:Name="a1" ItemsSource="{Binding Utilisateurs}"> <ListView x:Name="a1" ItemsSource="{Binding Utilisateurs}">
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate> <DataTemplate>
<ViewCell> <ViewCell>

Write Preview
Loading…
Cancel
Save