diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml.cs
index 21aa4e68c6c03cfa66c3f7fa344449fe3d0113c8..d9ec69936ecb4337e9f53ddf45ac5c9e7b95ab95 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml.cs
@@ -144,7 +144,7 @@ namespace InnoLabProjektDektopApp
stackPanel.Children.Add(checkBox);
ItemsPanel.Children.Add(stackPanel);
- MessageBox.Show($"URL '{enteredUrl}' has been added to the '{_category}' category.", "Success", MessageBoxButton.OK, MessageBoxImage.Information);
+ //MessageBox.Show($"URL '{enteredUrl}' has been added to the '{_category}' category.", "Success", MessageBoxButton.OK, MessageBoxImage.Information);
// Clear the input field
UrlInputBox.Clear();
@@ -269,7 +269,6 @@ namespace InnoLabProjektDektopApp
{
string updatedJson = JsonSerializer.Serialize(_data, new JsonSerializerOptions { WriteIndented = true });
File.WriteAllText(_jsonFilePath, updatedJson);
- MessageBox.Show("Data saved successfully!");
}
catch (Exception ex)
{
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
index 324956f44a78fd8ead06b809875ebdea36ff15f5..fb73501611d39f0b9c7242c3a3127e699f120498 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
@@ -116,7 +116,7 @@ namespace InnoLabProjektDektopApp
// save json
File.WriteAllText(filePath, JsonSerializer.Serialize(settings, new JsonSerializerOptions { WriteIndented = true }));
- MessageBox.Show($"Settings saved for {projectName}.", "Success.", MessageBoxButton.OK, MessageBoxImage.Information);
+ //MessageBox.Show($"Settings saved for {projectName}.", "Success.", MessageBoxButton.OK, MessageBoxImage.Information);
// show massageBox
/*if (File.Exists(filePath))
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
index 56de8cfd7428d57ea02b0a84807947ea4d378ec7..8b03eb4933f4a862926cae0df12f4ecd811f39c8 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
@@ -322,7 +322,7 @@ Margin="10,80,0,0">
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_7">
- <TextBlock Text="Contract" Style="{StaticResource ButtonTextStyle}" />
+ <TextBlock Text="Contact" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_8">
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs
index b1d4d7c24a18bafc16613ddac7d0e4b8a6aa051a..2a311b7a994c3a4c5893e74a5dacbc96fc4e3831 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs
@@ -465,6 +465,7 @@ namespace InnoLabProjektDektopApp
bool insultingWords = InsultingWordsCheckBox.IsChecked ?? false;
// Anzeige der Werte in einer MessageBox
+ /*
MessageBox.Show($"Focus Period: {focusPeriod} minutes\n" +
$"Break Period: {breakPeriod} minutes\n" +
$"Cycles: {cycles}\n" +
@@ -477,6 +478,8 @@ namespace InnoLabProjektDektopApp
MessageBoxButton.OK,
MessageBoxImage.Information);
+ */
+
tmpSession = new Session(focusPeriod, breakPeriod, cycles, distractionMode, mascotVisible, wordsOfAffirmation, insultingWords);
this.NavigationService.Navigate(tmpSession);
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml
index a984ab044a565893bc1dd89a6de6a7c77dec2465..c0481270ab22701b0c19b69d414d1f46e3f24e19 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml
@@ -41,7 +41,7 @@
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_7">
- <TextBlock Text="Contract" Style="{StaticResource ButtonTextStyle}" />
+ <TextBlock Text="Contact" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_8">
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs
index 0ac7392006252988f9da572d54824d51bc664444..57cf31c7650987bea97497a4de4d66a3b480e447 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs
@@ -309,7 +309,7 @@ namespace InnoLabProjektDektopApp
reason2.IsChecked == true ? "Mir ist etwas sehr Wichtiges dazwischengekommen, was ich nicht verschieben konnte." :
"Kein Grund ausgewählt";
- MessageBox.Show($"Abbruchgrund: {selectedReason}", "Sitzung beendet", MessageBoxButton.OK, MessageBoxImage.Information);
+ // MessageBox.Show($"Abbruchgrund: {selectedReason}", "Sitzung beendet", MessageBoxButton.OK, MessageBoxImage.Information);
reasonWindow.Close();
processMonitor.FinishSession();
};
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/Abonnement.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/Abonnement.xaml.cs
index a743fdc4055855ed90f1f01d7ff43f9998875bfe..43ebda7cb1648aa054f299681e94786e0d6d0d42 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/Abonnement.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/Abonnement.xaml.cs
@@ -28,7 +28,7 @@ namespace InnoLabProjektDektopApp.Screens.Regulaer
private void Button_Click(object sender, MouseButtonEventArgs e)
{
// Beispiel: Öffne eine neue Seite / neues Fenster
- MessageBox.Show("Premium Button clicked!");
+ MessageBox.Show("Follow us on social media to be one of the first to know once the premium features are available!");
}
}
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml.cs
index 0783f9a3af1142d6c3a95923de973b5ffd54ce02..40187c2cc541286ef400c4d6b767063ec3524002 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml.cs
@@ -97,7 +97,7 @@ namespace InnoLabProjektDektopApp.Screens.Regulaer
{
Width = bar_width,
Height = bar_height,
- Fill = Brushes.Green
+ Fill = Brushes.Orange
};
Canvas.SetLeft(cycleSegment, 0);
@@ -133,7 +133,7 @@ namespace InnoLabProjektDektopApp.Screens.Regulaer
{
Width = bar_width * (segmentDuration / cycleDuration),
Height = bar_height,
- Fill = Brushes.Red
+ Fill = Brushes.DeepPink
};
Canvas.SetLeft(segment, bar_width * (processStartTime - cycleStartTime).TotalSeconds / cycleDuration.TotalSeconds);
@@ -224,8 +224,8 @@ namespace InnoLabProjektDektopApp.Screens.Regulaer
// Create legend items
var legendItems = new List<(string Text, Brush Color)>
{
- ("Productive Work", Brushes.Green),
- ("Distraction", Brushes.Red),
+ ("Productive Work", Brushes.Orange),
+ ("Distraction", Brushes.DeepPink),
("Break", Brushes.Blue),
("Pause", Brushes.LightBlue)
};
@@ -283,7 +283,7 @@ namespace InnoLabProjektDektopApp.Screens.Regulaer
Name = $"Distractions:",
Values = distractedTime.TotalSeconds > 1 ? [distractedTime.TotalMinutes] : new List<double>(),
MaxRadialColumnWidth = 35,
- Fill = new SolidColorPaint(SKColors.Red),
+ Fill = new SolidColorPaint(SKColors.DeepPink),
ToolTipLabelFormatter = value => $"{distractedTimeFormatted} minutes"
},
new PieSeries<double> {
@@ -304,7 +304,7 @@ namespace InnoLabProjektDektopApp.Screens.Regulaer
Name = $"Productive:",
Values = productiveTime.TotalSeconds > 1 ? [productiveTime.TotalMinutes] : new List<double>(),
MaxRadialColumnWidth = 35,
- Fill = new SolidColorPaint(SKColors.Green),
+ Fill = new SolidColorPaint(SKColors.Orange),
ToolTipLabelFormatter = value => $"{productiveTimeFormatted} minutes"
}
];
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Styles/Styles.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Styles/Styles.xaml
index 528abcce719081bd2a1a6cfc48044e6f89ad6531..11c7c84519fdb421e8daa00a92e8b2e421bf7cd5 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Styles/Styles.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Styles/Styles.xaml
@@ -7,6 +7,8 @@
<!-- Ersetze durch den exakten Farbwert -->
<Color x:Key="HIGHLIGHT_SECONDARY_COLOR">#1B2736</Color>
<!-- Ersetze durch den exakten Farbwert -->
+ <Color x:Key="HIGHLIGHT_TERTIARY_COLOR">#004960</Color>
+ <Color x:Key="HIGHLIGHT_QUATERNARY_COLOR">#F4C01E</Color>
<Color x:Key="BACKGROUND_PRIMARY_COLOR">#272727</Color>
<!-- Ersetze durch den exakten Farbwert -->
<Color x:Key="BACKGROUND_SECONDARY_COLOR">#333436</Color>
@@ -19,6 +21,8 @@
<!-- Optional: Farben als Brushes bereitstellen -->
<SolidColorBrush x:Key="HIGHLIGHT_PRIMARY_BRUSH" Color="{StaticResource HIGHLIGHT_PRIMARY_COLOR}" />
<SolidColorBrush x:Key="HIGHLIGHT_SECONDARY_BRUSH" Color="{StaticResource HIGHLIGHT_SECONDARY_COLOR}" />
+ <SolidColorBrush x:Key="HIGHLIGHT_TERTIARY_BRUSH" Color="{StaticResource HIGHLIGHT_TERTIARY_COLOR}" />
+ <SolidColorBrush x:Key="HIGHLIGHT_QUATERNARY_BRUSH" Color="{StaticResource HIGHLIGHT_QUATERNARY_COLOR}" />
<SolidColorBrush x:Key="BACKGROUND_PRIMARY_BRUSH" Color="{StaticResource BACKGROUND_PRIMARY_COLOR}" />
<SolidColorBrush x:Key="BACKGROUND_SECONDARY_BRUSH" Color="{StaticResource BACKGROUND_SECONDARY_COLOR}" />
<SolidColorBrush x:Key="TEXT_PRIMARY_BRUSH" Color="{StaticResource TEXT_PRIMARY_COLOR}" />