From f20307598d0a057d76a234a1f21f6f950000152a Mon Sep 17 00:00:00 2001 From: Jade VAN BRABANDT Date: Wed, 5 Apr 2023 19:31:26 +0200 Subject: [PATCH] =?UTF-8?q?J'aurais=20bien=20d=C3=A9taill=C3=A9=20mais=20p?= =?UTF-8?q?as=20le=20temps=20d=C3=A9so?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/Stim/Stim/DetailledPage.xaml | 19 +-- Sources/Stim/Stim/DetailledPage.xaml.cs | 4 + Sources/Stim/Stim/HeaderView.xaml | 23 +++ Sources/Stim/Stim/HeaderView.xaml.cs | 13 ++ Sources/Stim/Stim/MainPage.xaml | 197 ++++-------------------- Sources/Stim/Stim/MainPage.xaml.cs | 5 + Sources/Stim/Stim/Stim.csproj | 9 ++ 7 files changed, 84 insertions(+), 186 deletions(-) create mode 100644 Sources/Stim/Stim/HeaderView.xaml create mode 100644 Sources/Stim/Stim/HeaderView.xaml.cs diff --git a/Sources/Stim/Stim/DetailledPage.xaml b/Sources/Stim/Stim/DetailledPage.xaml index 3318e2b..93e94b7 100644 --- a/Sources/Stim/Stim/DetailledPage.xaml +++ b/Sources/Stim/Stim/DetailledPage.xaml @@ -1,29 +1,14 @@ - - - - - - - - - - - - - - - - - + diff --git a/Sources/Stim/Stim/DetailledPage.xaml.cs b/Sources/Stim/Stim/DetailledPage.xaml.cs index 52b0924..f4385bc 100644 --- a/Sources/Stim/Stim/DetailledPage.xaml.cs +++ b/Sources/Stim/Stim/DetailledPage.xaml.cs @@ -6,4 +6,8 @@ public partial class DetailledPage : ContentPage { InitializeComponent(); } + private async void goToMainPage(object sender, EventArgs e) + { + await Navigation.PushModalAsync(new MainPage()); + } } \ No newline at end of file diff --git a/Sources/Stim/Stim/HeaderView.xaml b/Sources/Stim/Stim/HeaderView.xaml new file mode 100644 index 0000000..7f0c39f --- /dev/null +++ b/Sources/Stim/Stim/HeaderView.xaml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/Sources/Stim/Stim/HeaderView.xaml.cs b/Sources/Stim/Stim/HeaderView.xaml.cs new file mode 100644 index 0000000..6cddc56 --- /dev/null +++ b/Sources/Stim/Stim/HeaderView.xaml.cs @@ -0,0 +1,13 @@ +namespace Stim; + +public partial class HeaderView : ContentView +{ + public HeaderView() + { + InitializeComponent(); + } + private async void goToMainPage(object sender, EventArgs e) + { + await Navigation.PushModalAsync(new MainPage()); + } +} \ No newline at end of file diff --git a/Sources/Stim/Stim/MainPage.xaml b/Sources/Stim/Stim/MainPage.xaml index 097d884..3661e89 100644 --- a/Sources/Stim/Stim/MainPage.xaml +++ b/Sources/Stim/Stim/MainPage.xaml @@ -1,34 +1,33 @@  + - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + @@ -36,8 +35,8 @@ - - + + @@ -45,7 +44,10 @@ - + + + + @@ -81,152 +83,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + diff --git a/Sources/Stim/Stim/MainPage.xaml.cs b/Sources/Stim/Stim/MainPage.xaml.cs index af0550d..3cad7eb 100644 --- a/Sources/Stim/Stim/MainPage.xaml.cs +++ b/Sources/Stim/Stim/MainPage.xaml.cs @@ -11,4 +11,9 @@ public partial class MainPage : ContentPage { await Navigation.PushModalAsync(new DetailledPage()); } + + private async void goToMainPage(object sender, EventArgs e) + { + await Navigation.PushModalAsync(new MainPage()); + } } diff --git a/Sources/Stim/Stim/Stim.csproj b/Sources/Stim/Stim/Stim.csproj index cfb0955..17b184f 100644 --- a/Sources/Stim/Stim/Stim.csproj +++ b/Sources/Stim/Stim/Stim.csproj @@ -48,10 +48,19 @@ + + + HeaderView.xaml + + + MSBuild:Compile + + MSBuild:Compile +