diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.dll b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.dll
index a18361a..22fab3e 100644
Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.dll and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.dll differ
diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.pdb b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.pdb
index 6eb5b11..ba25e5d 100644
Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.pdb and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.pdb differ
diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.dll b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.dll
index 3cfc8f3..3e2e343 100644
Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.dll and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.dll differ
diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.pdb b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.pdb
index 8ea2d39..b30d3b7 100644
Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.pdb and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.pdb differ
diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.dll b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.dll
index b38d791..f1411ef 100644
Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.dll and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.dll differ
diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.pdb b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.pdb
index 8f8a96e..a1cb426 100644
Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.pdb and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.pdb differ
diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfo.cs b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfo.cs
index 1025e64..0e1cd00 100644
--- a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfo.cs
+++ b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfo.cs
@@ -13,10 +13,10 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.Controller")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+11383fc75a9f1f764ac2f8fef2dd8f2da0c7e2b8")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f15ec9caf02f7612f79e2af762523e526c5e3015")]
[assembly: System.Reflection.AssemblyProductAttribute("AquaCare.Controller")]
[assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.Controller")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
-// Generated by the MSBuild WriteCodeFragment class.
+// Von der MSBuild WriteCodeFragment-Klasse generiert.
diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfoInputs.cache b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfoInputs.cache
index 402457f..3488d3a 100644
--- a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfoInputs.cache
+++ b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfoInputs.cache
@@ -1 +1 @@
-b26810a9701a80bd8d247c92ecf69824a86d42eff82b9218864ad2356c15c28a
+4a1595911e8564a3ee44d1afa12534ecbbd538005c0e2dc8381ae13ac848a00b
diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.AssemblyReference.cache b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.AssemblyReference.cache
index 8eb0979..3738234 100644
Binary files a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.AssemblyReference.cache and b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.AssemblyReference.cache differ
diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.dll b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.dll
index a18361a..22fab3e 100644
Binary files a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.dll and b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.dll differ
diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.pdb b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.pdb
index 6eb5b11..ba25e5d 100644
Binary files a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.pdb and b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.pdb differ
diff --git a/AquaCare.Controller/obj/Debug/net9.0/ref/AquaCare.Controller.dll b/AquaCare.Controller/obj/Debug/net9.0/ref/AquaCare.Controller.dll
index cd27c9c..9466021 100644
Binary files a/AquaCare.Controller/obj/Debug/net9.0/ref/AquaCare.Controller.dll and b/AquaCare.Controller/obj/Debug/net9.0/ref/AquaCare.Controller.dll differ
diff --git a/AquaCare.Controller/obj/Debug/net9.0/refint/AquaCare.Controller.dll b/AquaCare.Controller/obj/Debug/net9.0/refint/AquaCare.Controller.dll
index cd27c9c..9466021 100644
Binary files a/AquaCare.Controller/obj/Debug/net9.0/refint/AquaCare.Controller.dll and b/AquaCare.Controller/obj/Debug/net9.0/refint/AquaCare.Controller.dll differ
diff --git a/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.dll b/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.dll
index 3cfc8f3..3e2e343 100644
Binary files a/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.dll and b/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.dll differ
diff --git a/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.pdb b/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.pdb
index 8ea2d39..b30d3b7 100644
Binary files a/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.pdb and b/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.pdb differ
diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfo.cs b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfo.cs
index 99e88c4..b8c7ed8 100644
--- a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfo.cs
+++ b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfo.cs
@@ -13,10 +13,10 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.Model")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+11383fc75a9f1f764ac2f8fef2dd8f2da0c7e2b8")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f15ec9caf02f7612f79e2af762523e526c5e3015")]
[assembly: System.Reflection.AssemblyProductAttribute("AquaCare.Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
-// Generated by the MSBuild WriteCodeFragment class.
+// Von der MSBuild WriteCodeFragment-Klasse generiert.
diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfoInputs.cache b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfoInputs.cache
index c66b3f4..bf175fe 100644
--- a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfoInputs.cache
+++ b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfoInputs.cache
@@ -1 +1 @@
-1f8bedf408b8f59454ecc9fe6bdd5c389ea72f6f52e0c888b1f255e3586460ec
+608884560f9ff9dcf53b06872b5959ce6fdcecbed088fdb17cc4e5a296ea6109
diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.dll b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.dll
index 3cfc8f3..3e2e343 100644
Binary files a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.dll and b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.dll differ
diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.pdb b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.pdb
index 8ea2d39..b30d3b7 100644
Binary files a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.pdb and b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.pdb differ
diff --git a/AquaCare.Model/obj/Debug/net9.0/ref/AquaCare.Model.dll b/AquaCare.Model/obj/Debug/net9.0/ref/AquaCare.Model.dll
index 69d7a74..95a4d9c 100644
Binary files a/AquaCare.Model/obj/Debug/net9.0/ref/AquaCare.Model.dll and b/AquaCare.Model/obj/Debug/net9.0/ref/AquaCare.Model.dll differ
diff --git a/AquaCare.Model/obj/Debug/net9.0/refint/AquaCare.Model.dll b/AquaCare.Model/obj/Debug/net9.0/refint/AquaCare.Model.dll
index 69d7a74..95a4d9c 100644
Binary files a/AquaCare.Model/obj/Debug/net9.0/refint/AquaCare.Model.dll and b/AquaCare.Model/obj/Debug/net9.0/refint/AquaCare.Model.dll differ
diff --git a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.dll b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.dll
index 3cfc8f3..3e2e343 100644
Binary files a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.dll and b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.dll differ
diff --git a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.pdb b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.pdb
index 8ea2d39..b30d3b7 100644
Binary files a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.pdb and b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.pdb differ
diff --git a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.dll b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.dll
index b38d791..f1411ef 100644
Binary files a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.dll and b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.dll differ
diff --git a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.pdb b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.pdb
index 8f8a96e..a1cb426 100644
Binary files a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.pdb and b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.pdb differ
diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfo.cs b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfo.cs
index 9a90e7b..acbadb0 100644
--- a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfo.cs
+++ b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfo.cs
@@ -13,10 +13,10 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.Persistence")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+11383fc75a9f1f764ac2f8fef2dd8f2da0c7e2b8")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f15ec9caf02f7612f79e2af762523e526c5e3015")]
[assembly: System.Reflection.AssemblyProductAttribute("AquaCare.Persistence")]
[assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.Persistence")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
-// Generated by the MSBuild WriteCodeFragment class.
+// Von der MSBuild WriteCodeFragment-Klasse generiert.
diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfoInputs.cache b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfoInputs.cache
index 4206653..23fef93 100644
--- a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfoInputs.cache
+++ b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfoInputs.cache
@@ -1 +1 @@
-4b1690178df789d1c5fd4816cf36ec319f0ceb403af602830b6577406a3b49da
+2be14979cabc9b5f0134f4360999b97b323362d004003e24c42ef7d64d8cf6ba
diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.AssemblyReference.cache b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.AssemblyReference.cache
index 40e1a40..a91233c 100644
Binary files a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.AssemblyReference.cache and b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.AssemblyReference.cache differ
diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.dll b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.dll
index b38d791..f1411ef 100644
Binary files a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.dll and b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.dll differ
diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.pdb b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.pdb
index 8f8a96e..a1cb426 100644
Binary files a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.pdb and b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.pdb differ
diff --git a/AquaCare.Persistence/obj/Debug/net9.0/ref/AquaCare.Persistence.dll b/AquaCare.Persistence/obj/Debug/net9.0/ref/AquaCare.Persistence.dll
index a66b60b..811262a 100644
Binary files a/AquaCare.Persistence/obj/Debug/net9.0/ref/AquaCare.Persistence.dll and b/AquaCare.Persistence/obj/Debug/net9.0/ref/AquaCare.Persistence.dll differ
diff --git a/AquaCare.Persistence/obj/Debug/net9.0/refint/AquaCare.Persistence.dll b/AquaCare.Persistence/obj/Debug/net9.0/refint/AquaCare.Persistence.dll
index a66b60b..811262a 100644
Binary files a/AquaCare.Persistence/obj/Debug/net9.0/refint/AquaCare.Persistence.dll and b/AquaCare.Persistence/obj/Debug/net9.0/refint/AquaCare.Persistence.dll differ
diff --git a/AquaCare.View/Ressourcen/BilderTutorials/Beispiele/Pfeil.png b/AquaCare.View/Ressourcen/BilderTutorials/Beispiele/Pfeil.png
deleted file mode 100644
index 0757455..0000000
Binary files a/AquaCare.View/Ressourcen/BilderTutorials/Beispiele/Pfeil.png and /dev/null differ
diff --git a/AquaCare.View/Ressourcen/BilderTutorials/Beispiele/1.jpg b/AquaCare.View/Ressourcen/BilderTutorials/Filter reinigen/1.jpg
similarity index 100%
rename from AquaCare.View/Ressourcen/BilderTutorials/Beispiele/1.jpg
rename to AquaCare.View/Ressourcen/BilderTutorials/Filter reinigen/1.jpg
diff --git a/AquaCare.View/Ressourcen/BilderTutorials/Beispiele/2.jpg b/AquaCare.View/Ressourcen/BilderTutorials/Filter reinigen/2.jpg
similarity index 100%
rename from AquaCare.View/Ressourcen/BilderTutorials/Beispiele/2.jpg
rename to AquaCare.View/Ressourcen/BilderTutorials/Filter reinigen/2.jpg
diff --git a/AquaCare.View/Ressourcen/BilderTutorials/Beispiele/3.jpg b/AquaCare.View/Ressourcen/BilderTutorials/Filter reinigen/3.jpg
similarity index 100%
rename from AquaCare.View/Ressourcen/BilderTutorials/Beispiele/3.jpg
rename to AquaCare.View/Ressourcen/BilderTutorials/Filter reinigen/3.jpg
diff --git a/AquaCare.View/Ressourcen/BilderTutorials/Fische füttern/1.jpg b/AquaCare.View/Ressourcen/BilderTutorials/Fische füttern/1.jpg
new file mode 100644
index 0000000..fb8a999
Binary files /dev/null and b/AquaCare.View/Ressourcen/BilderTutorials/Fische füttern/1.jpg differ
diff --git a/AquaCare.View/Ressourcen/BilderTutorials/Fische füttern/2.jpg b/AquaCare.View/Ressourcen/BilderTutorials/Fische füttern/2.jpg
new file mode 100644
index 0000000..be627c6
Binary files /dev/null and b/AquaCare.View/Ressourcen/BilderTutorials/Fische füttern/2.jpg differ
diff --git a/AquaCare.View/Ressourcen/BilderTutorials/Fische füttern/3.jpg b/AquaCare.View/Ressourcen/BilderTutorials/Fische füttern/3.jpg
new file mode 100644
index 0000000..696520b
Binary files /dev/null and b/AquaCare.View/Ressourcen/BilderTutorials/Fische füttern/3.jpg differ
diff --git a/AquaCare.View/Ressourcen/BilderTutorials/Wasser wechseln/1.jpg b/AquaCare.View/Ressourcen/BilderTutorials/Wasser wechseln/1.jpg
new file mode 100644
index 0000000..fb8a999
Binary files /dev/null and b/AquaCare.View/Ressourcen/BilderTutorials/Wasser wechseln/1.jpg differ
diff --git a/AquaCare.View/Ressourcen/BilderTutorials/Wasser wechseln/2.jpg b/AquaCare.View/Ressourcen/BilderTutorials/Wasser wechseln/2.jpg
new file mode 100644
index 0000000..be627c6
Binary files /dev/null and b/AquaCare.View/Ressourcen/BilderTutorials/Wasser wechseln/2.jpg differ
diff --git a/AquaCare.View/Ressourcen/BilderTutorials/Wasser wechseln/3.jpg b/AquaCare.View/Ressourcen/BilderTutorials/Wasser wechseln/3.jpg
new file mode 100644
index 0000000..696520b
Binary files /dev/null and b/AquaCare.View/Ressourcen/BilderTutorials/Wasser wechseln/3.jpg differ
diff --git a/AquaCare.View/TutorialsWindow.axaml b/AquaCare.View/TutorialsWindow.axaml
index 0899687..039b858 100644
--- a/AquaCare.View/TutorialsWindow.axaml
+++ b/AquaCare.View/TutorialsWindow.axaml
@@ -11,9 +11,9 @@
-
-
-
+
+
+
@@ -21,7 +21,7 @@
Orientation="Horizontal"
HorizontalAlignment="Center"
VerticalAlignment="Center"
- Margin="0,5,0,5">
+ Margin="0,5,0,0">
@@ -35,21 +35,37 @@
-
-
+
+
+
+
+
-
+
+ Text=""
+ FontSize="18"
+ HorizontalAlignment="Center"
+ Margin="0,2,0,2"/>
-
-
-
+
+
+
+
+
+
diff --git a/AquaCare.View/TutorialsWindow.axaml.cs b/AquaCare.View/TutorialsWindow.axaml.cs
index c6eabce..f0ed3d2 100644
--- a/AquaCare.View/TutorialsWindow.axaml.cs
+++ b/AquaCare.View/TutorialsWindow.axaml.cs
@@ -2,106 +2,100 @@ using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.Media.Imaging;
using System.Collections.Generic;
+using System;
namespace AquaCare.View
{
public partial class TutorialsWindow : Window
{
private List _images;
+ private TextBlock? _imageIndexTextBlock;
+ private TextBlock? _initialText;
private int _currentImageIndex;
- private TextBlock _imageIndexTextBlock;
public TutorialsWindow()
{
InitializeComponent();
_images = new List();
- _imageIndexTextBlock = this.Find("imageIndexTextBlock");
- InitializeTutorial();
+
+ _imageIndexTextBlock = this.Find("imageIndexTextBlock")
+ ?? throw new InvalidOperationException("imageIndexTextBlock not found");
+ _initialText = this.Find("initialText")
+ ?? throw new InvalidOperationException("initialText not found");
}
- private void InitializeTutorial()
+ private void LoadTutorialImages(string folderName)
{
+ if (_initialText == null || tutorialImage == null) return;
+
_images = new List
{
- "Ressourcen/BilderTutorials/Beispiele/1.jpg",
- "Ressourcen/BilderTutorials/Beispiele/2.jpg",
- "Ressourcen/BilderTutorials/Beispiele/3.jpg"
+ $"Ressourcen/BilderTutorials/{folderName}/1.jpg",
+ $"Ressourcen/BilderTutorials/{folderName}/2.jpg",
+ $"Ressourcen/BilderTutorials/{folderName}/3.jpg"
};
_currentImageIndex = 0;
+ _initialText.IsVisible = false;
+ tutorialImage.IsVisible = true;
UpdateTutorialContent();
}
private void UpdateTutorialContent()
{
- if (_images.Count > 0 && _currentImageIndex >= 0 && _currentImageIndex < _images.Count)
+ try
{
- tutorialImage.Source = new Bitmap(_images[_currentImageIndex]);
- _imageIndexTextBlock.Text = $"Bild {_currentImageIndex + 1} von {_images.Count}";
+ if (_imageIndexTextBlock == null || _initialText == null || tutorialImage == null) return;
+
+ if (_images.Count > 0 && _currentImageIndex >= 0 && _currentImageIndex < _images.Count)
+ {
+ string fullPath = $"avares://AquaCare.View/{_images[_currentImageIndex]}";
+ System.Diagnostics.Debug.WriteLine($"Lade Bild: {fullPath}"); // Debug-Ausgabe
+
+ var uri = new Uri(fullPath);
+ var asset = Avalonia.Platform.AssetLoader.Open(uri);
+ tutorialImage.Source = new Bitmap(asset);
+
+ _imageIndexTextBlock.Text = $"Bild {_currentImageIndex + 1} von {_images.Count}";
+ _initialText.IsVisible = false;
+ tutorialImage.IsVisible = true;
+ }
+ }
+ catch (System.Exception ex)
+ {
+ System.Diagnostics.Debug.WriteLine($"Fehler beim Laden des Bildes: {ex.Message}");
}
}
- private void PreviousImageClick(object? sender, RoutedEventArgs e)
+ private void NavigateImages(bool forward)
{
- if (_currentImageIndex > 0)
+ if (forward)
{
- _currentImageIndex--;
+ _currentImageIndex = _currentImageIndex < _images.Count - 1 ? _currentImageIndex + 1 : 0;
}
else
{
- // Wenn wir beim ersten Bild sind, zum letzten springen
- _currentImageIndex = _images.Count - 1;
+ _currentImageIndex = _currentImageIndex > 0 ? _currentImageIndex - 1 : _images.Count - 1;
}
UpdateTutorialContent();
}
- private void NextImageClick(object? sender, RoutedEventArgs e)
- {
- if (_currentImageIndex < _images.Count - 1)
- {
- _currentImageIndex++;
- }
- else
- {
- // Wenn wir beim letzten Bild sind, zurück zum ersten springen
- _currentImageIndex = 0;
- }
- UpdateTutorialContent();
- }
+ // Event Handler
+ private void FischeFütternClick(object? sender, RoutedEventArgs e)
+ => LoadTutorialImages("Fische füttern");
- private void FischeFütternClick(object? sender, RoutedEventArgs e)
- {
- _images = new List
- {
- "Ressourcen/BilderTutorials/Beispiele/1.jpg",
- "Ressourcen/BilderTutorials/Beispiele/2.jpg",
- "Ressourcen/BilderTutorials/Beispiele/3.jpg"
- };
- _currentImageIndex = 0;
- UpdateTutorialContent();
- }
+ private void WasserWechselnClick(object? sender, RoutedEventArgs e)
+ => LoadTutorialImages("Wasser wechseln");
- private void WasserWechselnClick(object? sender, RoutedEventArgs e)
- {
- _images = new List
- {
- "Ressourcen/BilderTutorials/Beispiele/1.jpg",
- "Ressourcen/BilderTutorials/Beispiele/2.jpg",
- "Ressourcen/BilderTutorials/Beispiele/3.jpg"
- };
- _currentImageIndex = 0;
- UpdateTutorialContent();
- }
+ private void FilterReinigenClick(object? sender, RoutedEventArgs e)
+ => LoadTutorialImages("Filter reinigen");
- private void FilterReinigenClick(object? sender, RoutedEventArgs e)
- {
- _images = new List
- {
- "Ressourcen/BilderTutorials/Beispiele/1.jpg",
- "Ressourcen/BilderTutorials/Beispiele/2.jpg",
- "Ressourcen/BilderTutorials/Beispiele/3.jpg"
- };
- _currentImageIndex = 0;
- UpdateTutorialContent();
- }
+ private void NextImageClick(object? sender, RoutedEventArgs e)
+ => NavigateImages(true);
+
+ private void PreviousImageClick(object? sender, RoutedEventArgs e)
+ => NavigateImages(false);
+
+ private void CloseClick(object? sender, RoutedEventArgs e)
+ => Close();
}
}
diff --git a/AquaCare.View/bin/Debug/net9.0/AquaCare.Controller.dll b/AquaCare.View/bin/Debug/net9.0/AquaCare.Controller.dll
index a18361a..22fab3e 100644
Binary files a/AquaCare.View/bin/Debug/net9.0/AquaCare.Controller.dll and b/AquaCare.View/bin/Debug/net9.0/AquaCare.Controller.dll differ
diff --git a/AquaCare.View/bin/Debug/net9.0/AquaCare.Controller.pdb b/AquaCare.View/bin/Debug/net9.0/AquaCare.Controller.pdb
index 6eb5b11..ba25e5d 100644
Binary files a/AquaCare.View/bin/Debug/net9.0/AquaCare.Controller.pdb and b/AquaCare.View/bin/Debug/net9.0/AquaCare.Controller.pdb differ
diff --git a/AquaCare.View/bin/Debug/net9.0/AquaCare.Model.dll b/AquaCare.View/bin/Debug/net9.0/AquaCare.Model.dll
index 3cfc8f3..3e2e343 100644
Binary files a/AquaCare.View/bin/Debug/net9.0/AquaCare.Model.dll and b/AquaCare.View/bin/Debug/net9.0/AquaCare.Model.dll differ
diff --git a/AquaCare.View/bin/Debug/net9.0/AquaCare.Model.pdb b/AquaCare.View/bin/Debug/net9.0/AquaCare.Model.pdb
index 8ea2d39..b30d3b7 100644
Binary files a/AquaCare.View/bin/Debug/net9.0/AquaCare.Model.pdb and b/AquaCare.View/bin/Debug/net9.0/AquaCare.Model.pdb differ
diff --git a/AquaCare.View/bin/Debug/net9.0/AquaCare.Persistence.dll b/AquaCare.View/bin/Debug/net9.0/AquaCare.Persistence.dll
index b38d791..f1411ef 100644
Binary files a/AquaCare.View/bin/Debug/net9.0/AquaCare.Persistence.dll and b/AquaCare.View/bin/Debug/net9.0/AquaCare.Persistence.dll differ
diff --git a/AquaCare.View/bin/Debug/net9.0/AquaCare.Persistence.pdb b/AquaCare.View/bin/Debug/net9.0/AquaCare.Persistence.pdb
index 8f8a96e..a1cb426 100644
Binary files a/AquaCare.View/bin/Debug/net9.0/AquaCare.Persistence.pdb and b/AquaCare.View/bin/Debug/net9.0/AquaCare.Persistence.pdb differ
diff --git a/AquaCare.View/bin/Debug/net9.0/AquaCare.View.dll b/AquaCare.View/bin/Debug/net9.0/AquaCare.View.dll
index 9560798..122ccb8 100644
Binary files a/AquaCare.View/bin/Debug/net9.0/AquaCare.View.dll and b/AquaCare.View/bin/Debug/net9.0/AquaCare.View.dll differ
diff --git a/AquaCare.View/bin/Debug/net9.0/AquaCare.View.exe b/AquaCare.View/bin/Debug/net9.0/AquaCare.View.exe
index 5586136..74b0041 100644
Binary files a/AquaCare.View/bin/Debug/net9.0/AquaCare.View.exe and b/AquaCare.View/bin/Debug/net9.0/AquaCare.View.exe differ
diff --git a/AquaCare.View/bin/Debug/net9.0/AquaCare.View.pdb b/AquaCare.View/bin/Debug/net9.0/AquaCare.View.pdb
index 03a7f6d..84ea637 100644
Binary files a/AquaCare.View/bin/Debug/net9.0/AquaCare.View.pdb and b/AquaCare.View/bin/Debug/net9.0/AquaCare.View.pdb differ
diff --git a/AquaCare.View/obj/Debug/net9.0/AquaCare.View.AssemblyInfo.cs b/AquaCare.View/obj/Debug/net9.0/AquaCare.View.AssemblyInfo.cs
index b48cb0e..a9c403b 100644
--- a/AquaCare.View/obj/Debug/net9.0/AquaCare.View.AssemblyInfo.cs
+++ b/AquaCare.View/obj/Debug/net9.0/AquaCare.View.AssemblyInfo.cs
@@ -13,10 +13,10 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.View")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+11383fc75a9f1f764ac2f8fef2dd8f2da0c7e2b8")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f15ec9caf02f7612f79e2af762523e526c5e3015")]
[assembly: System.Reflection.AssemblyProductAttribute("AquaCare.View")]
[assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.View")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
-// Generated by the MSBuild WriteCodeFragment class.
+// Von der MSBuild WriteCodeFragment-Klasse generiert.
diff --git a/AquaCare.View/obj/Debug/net9.0/AquaCare.View.AssemblyInfoInputs.cache b/AquaCare.View/obj/Debug/net9.0/AquaCare.View.AssemblyInfoInputs.cache
index 80bdb14..ab8cabd 100644
--- a/AquaCare.View/obj/Debug/net9.0/AquaCare.View.AssemblyInfoInputs.cache
+++ b/AquaCare.View/obj/Debug/net9.0/AquaCare.View.AssemblyInfoInputs.cache
@@ -1 +1 @@
-8a14db02d022de50302e5b23ec47b97276b170631ab2e0c8f66201348cd0502c
+e30ebb268403392e58bc9de1b5c5f1a317f52bde0ea2d8405683bfbaf7f4e4a8
diff --git a/AquaCare.View/obj/Debug/net9.0/AquaCare.View.csproj.AssemblyReference.cache b/AquaCare.View/obj/Debug/net9.0/AquaCare.View.csproj.AssemblyReference.cache
index 31353dc..bb0fa46 100644
Binary files a/AquaCare.View/obj/Debug/net9.0/AquaCare.View.csproj.AssemblyReference.cache and b/AquaCare.View/obj/Debug/net9.0/AquaCare.View.csproj.AssemblyReference.cache differ
diff --git a/AquaCare.View/obj/Debug/net9.0/AquaCare.View.dll b/AquaCare.View/obj/Debug/net9.0/AquaCare.View.dll
index 9560798..122ccb8 100644
Binary files a/AquaCare.View/obj/Debug/net9.0/AquaCare.View.dll and b/AquaCare.View/obj/Debug/net9.0/AquaCare.View.dll differ
diff --git a/AquaCare.View/obj/Debug/net9.0/AquaCare.View.pdb b/AquaCare.View/obj/Debug/net9.0/AquaCare.View.pdb
index 03a7f6d..84ea637 100644
Binary files a/AquaCare.View/obj/Debug/net9.0/AquaCare.View.pdb and b/AquaCare.View/obj/Debug/net9.0/AquaCare.View.pdb differ
diff --git a/AquaCare.View/obj/Debug/net9.0/Avalonia/Resources.Inputs.cache b/AquaCare.View/obj/Debug/net9.0/Avalonia/Resources.Inputs.cache
index 0b1e58f..5df8b5d 100644
--- a/AquaCare.View/obj/Debug/net9.0/Avalonia/Resources.Inputs.cache
+++ b/AquaCare.View/obj/Debug/net9.0/Avalonia/Resources.Inputs.cache
@@ -1 +1 @@
-568de61c09a2d71f5b614d8e24749c223f330b05f9d54bd9ed27f337473a5bde
+711c45fe3adfd872828a1b3d32c232c6b2f78f36b5d6719fd9e24857a1ff86c8
diff --git a/AquaCare.View/obj/Debug/net9.0/Avalonia/resources b/AquaCare.View/obj/Debug/net9.0/Avalonia/resources
index 501b1d2..0495d65 100644
Binary files a/AquaCare.View/obj/Debug/net9.0/Avalonia/resources and b/AquaCare.View/obj/Debug/net9.0/Avalonia/resources differ
diff --git a/AquaCare.View/obj/Debug/net9.0/apphost.exe b/AquaCare.View/obj/Debug/net9.0/apphost.exe
index 5586136..74b0041 100644
Binary files a/AquaCare.View/obj/Debug/net9.0/apphost.exe and b/AquaCare.View/obj/Debug/net9.0/apphost.exe differ
diff --git a/AquaCare.View/obj/Debug/net9.0/ref/AquaCare.View.dll b/AquaCare.View/obj/Debug/net9.0/ref/AquaCare.View.dll
index d497f2d..f7d0b44 100644
Binary files a/AquaCare.View/obj/Debug/net9.0/ref/AquaCare.View.dll and b/AquaCare.View/obj/Debug/net9.0/ref/AquaCare.View.dll differ
diff --git a/AquaCare.View/obj/Debug/net9.0/refint/AquaCare.View.dll b/AquaCare.View/obj/Debug/net9.0/refint/AquaCare.View.dll
index d497f2d..f7d0b44 100644
Binary files a/AquaCare.View/obj/Debug/net9.0/refint/AquaCare.View.dll and b/AquaCare.View/obj/Debug/net9.0/refint/AquaCare.View.dll differ