From 89d9ee0e8ac8d2868b6d9b2fa5d2c5b6a0752982 Mon Sep 17 00:00:00 2001
From: muellerp <Philipp1.Mueller@Student.Reutlingen-University.de>
Date: Sun, 9 Mar 2025 16:17:15 +0100
Subject: [PATCH] fix startscreen scaling, maybe fix mascot animation stuck
---
.../InnoLabProjektDektopApp.csproj | 216 ++++++++++++++----
.../Screens/FirstLaunch/01Startscreen.xaml | 2 +-
.../Screens/Regulaer/02Session.xaml.cs | 2 +-
.../Screens/Regulaer/Mascott.xaml.cs | 6 +-
.../Screens/Regulaer/SessionStatistics.xaml | 9 +-
.../Regulaer/SessionStatistics.xaml.cs | 8 +-
6 files changed, 179 insertions(+), 64 deletions(-)
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/InnoLabProjektDektopApp.csproj b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/InnoLabProjektDektopApp.csproj
index 365dc8d..304cd49 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/InnoLabProjektDektopApp.csproj
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/InnoLabProjektDektopApp.csproj
@@ -191,7 +191,13 @@
<None Remove="Assets\MascottAnimation\Down\4\frame46.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame47.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame48.png" />
+ <None Remove="Assets\MascottAnimation\Down\4\frame49.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame5.png" />
+ <None Remove="Assets\MascottAnimation\Down\4\frame50.png" />
+ <None Remove="Assets\MascottAnimation\Down\4\frame51.png" />
+ <None Remove="Assets\MascottAnimation\Down\4\frame52.png" />
+ <None Remove="Assets\MascottAnimation\Down\4\frame53.png" />
+ <None Remove="Assets\MascottAnimation\Down\4\frame54.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame6.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame7.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame8.png" />
@@ -814,54 +820,168 @@
<Resource Include="Assets\MascottAnimation\Down\3\frame7.png" />
<Resource Include="Assets\MascottAnimation\Down\3\frame8.png" />
<Resource Include="Assets\MascottAnimation\Down\3\frame9.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame1.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame10.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame11.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame12.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame13.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame14.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame15.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame16.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame17.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame18.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame19.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame2.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame20.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame21.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame22.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame23.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame24.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame25.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame26.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame27.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame28.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame29.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame3.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame30.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame31.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame32.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame33.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame34.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame35.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame36.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame37.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame38.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame39.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame4.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame40.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame41.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame42.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame43.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame44.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame45.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame46.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame47.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame48.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame5.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame6.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame7.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame8.png" />
- <Resource Include="Assets\MascottAnimation\Down\4\frame9.png" />
+ <Resource Include="Assets\MascottAnimation\Down\4\frame1.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame10.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame11.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame12.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame13.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame14.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame15.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame16.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame17.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame18.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame19.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame2.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame20.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame21.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame22.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame23.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame24.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame25.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame26.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame27.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame28.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame29.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame3.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame30.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame31.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame32.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame33.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame34.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame35.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame36.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame37.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame38.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame39.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame4.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame40.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame41.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame42.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame43.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame44.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame45.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame46.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame47.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame48.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame49.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame5.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame50.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame51.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame52.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame53.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame54.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame6.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame7.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame8.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\MascottAnimation\Down\4\frame9.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
<Resource Include="Assets\MascottAnimation\Down\5\frame1.png" />
<Resource Include="Assets\MascottAnimation\Down\5\frame10.png" />
<Resource Include="Assets\MascottAnimation\Down\5\frame11.png" />
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml
index 7576ec8..6f9598c 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml
@@ -50,7 +50,7 @@
<Image Width="313" Height="297"
Source="pack://application:,,,/Assets/HappyMascot.jpg"
- HorizontalAlignment="Center"/>
+ HorizontalAlignment="Right" Margin="0,6,81,10" />
</Grid>
</Grid>
</ScrollViewer>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs
index d6c47eb..0ac7392 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs
@@ -109,7 +109,7 @@ namespace InnoLabProjektDektopApp
timer.Stop();
string jsonpath = ((ProcessMonitor)sender).lastSessionInfoFilePath;
NavigationService.Navigate(new SessionStatistics(jsonpath));
- MessageBox.Show("All sessions completed!", "Info", MessageBoxButton.OK, MessageBoxImage.Information);
+ // MessageBox.Show("All sessions completed!", "Info", MessageBoxButton.OK, MessageBoxImage.Information);
}
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/Mascott.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/Mascott.xaml.cs
index 87b013d..6834862 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/Mascott.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/Mascott.xaml.cs
@@ -121,11 +121,9 @@ namespace InnoLabProjektDektopApp.Screens.Regulaer
{
frameTimer.Stop();
//ellipse1.Fill = Brushes.Red;
+ Debug.WriteLine(new Uri($"pack://application:,,,/Assets/MascottAnimation/{animationDirection}/{distractionStage}/frame{frameCounter}.png"));
+
}
- /* else
- {
- ellipse1.Fill = Brushes.Lime;
- }*/
frameCounter++;
}
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml
index d904c0f..d6da400 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml
@@ -32,14 +32,11 @@
<TextBlock Text="Your session overview" FontSize="32" FontWeight="Bold"
HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,-25"/>
</Canvas>
-
- <Grid Grid.Row="1" Grid.Column="1" Margin="100" HorizontalAlignment="Right"
- VerticalAlignment="Top" Width="350" Height="350">
-
+
+ <Grid Grid.Row="1" Grid.Column="1" VerticalAlignment="Top" Width="350" Height="350">
<Image Source="{Binding CenterImageSource}" Width="200" Height="200"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
- <lvc:PieChart Series="{Binding Series}" Width="350" Height="350"/>
-
+ <lvc:PieChart Series="{Binding Series}" Width="300" Height="350"/>
</Grid>
<Border Grid.Row="1" Grid.Column="0" Margin="135,0,0,40" Style="{StaticResource RoundedButtonBorder}"
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml.cs
index 75ddeb4..97a29ec 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml.cs
@@ -282,28 +282,28 @@ namespace InnoLabProjektDektopApp.Screens.Regulaer
new PieSeries<double> {
Name = $"Distractions:",
Values = distractedTime.TotalSeconds > 1 ? [distractedTime.TotalMinutes] : new List<double>(),
- MaxRadialColumnWidth = 50,
+ MaxRadialColumnWidth = 35,
Fill = new SolidColorPaint(SKColors.Red),
ToolTipLabelFormatter = value => $"{distractedTimeFormatted} minutes"
},
new PieSeries<double> {
Name = $"Breaks:",
Values = breakTime.TotalSeconds > 1 ? [breakTime.TotalMinutes] : new List<double>(),
- MaxRadialColumnWidth = 50,
+ MaxRadialColumnWidth = 35,
Fill = new SolidColorPaint(SKColors.Blue),
ToolTipLabelFormatter = value => $"{breakTimeFormatted} minutes"
},
new PieSeries<double> {
Name = $"Manually paused:",
Values = pausedTime.TotalSeconds > 1 ? [pausedTime.TotalMinutes] : new List<double>(),
- MaxRadialColumnWidth = 50,
+ MaxRadialColumnWidth = 35,
Fill = new SolidColorPaint(SKColors.LightBlue),
ToolTipLabelFormatter = value => $"{pausedTimeFormatted} minutes"
},
new PieSeries<double> {
Name = $"Productive:",
Values = productiveTime.TotalSeconds > 1 ? [productiveTime.TotalMinutes] : new List<double>(),
- MaxRadialColumnWidth = 50,
+ MaxRadialColumnWidth = 35,
Fill = new SolidColorPaint(SKColors.Green),
ToolTipLabelFormatter = value => $"{productiveTimeFormatted} minutes"
}
--
GitLab