From e2a0994fd251c211ff954a7ce4ed802879cb61ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konrad=20Pierzy=C5=84ski?=
 <s442333@instalka-Standard-PC-i440FX-PIIX-1996>
Date: Tue, 22 Jan 2019 17:35:51 +0100
Subject: [PATCH] Fixed bug with loading fruits. Added easy configurable colors
 in App.xaml. Some small bugs with resizing windows

---
 Magazyn_Client/Magazyn/App.xaml               | 10 +++----
 Magazyn_Client/Magazyn/MainWindow.xaml        | 29 +++++++++++--------
 Magazyn_Client/Magazyn/MainWindow.xaml.cs     | 19 ++++++------
 Magazyn_Client/Magazyn/Views/FruitView.xaml   |  4 +--
 .../Magazyn/Views/FruitView.xaml.cs           |  2 ++
 .../Magazyn/Windows/AmountWindow.xaml         | 12 +++++++-
 6 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/Magazyn_Client/Magazyn/App.xaml b/Magazyn_Client/Magazyn/App.xaml
index 7e77365..309f94e 100644
--- a/Magazyn_Client/Magazyn/App.xaml
+++ b/Magazyn_Client/Magazyn/App.xaml
@@ -6,11 +6,11 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Teal.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
-            </ResourceDictionary.MergedDictionaries>
+				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
+				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+				<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Blue.xaml" />
+				<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Cyan.xaml" />
+			</ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml b/Magazyn_Client/Magazyn/MainWindow.xaml
index 8166ccd..e7d530a 100644
--- a/Magazyn_Client/Magazyn/MainWindow.xaml
+++ b/Magazyn_Client/Magazyn/MainWindow.xaml
@@ -1,23 +1,28 @@
 <Window x:Class="Magazyn.MainWindow"
-        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-         TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+
+		xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+		TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+		TextElement.FontWeight="Regular"
+		TextElement.FontSize="13"
+		TextOptions.TextFormattingMode="Ideal"
+		TextOptions.TextRenderingMode="Auto"
+		Background="{DynamicResource MaterialDesignPaper}"
+		FontFamily="{DynamicResource MaterialDesignFont}"
+		
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Magazyn"
         mc:Ignorable="d"
-        Title="Magazyn Owoców
-        " Height="400" Width="520">
-    <Grid>
-        <ListBox x:Name="fruitList" Margin="10,35,10,0" Height="239" VerticalAlignment="Top"/>
+        Title="Magazyn Owoców" Height="400" MaxWidth="590" MinWidth="590" Width="590">
+	<Grid>
+		<ListBox x:Name="fruitList" Margin="10,35,10,50"/>
 
-        <Button Name="sum" Content="Wartość magazynu
-                " HorizontalAlignment="Left" Margin="325,0,0,46" VerticalAlignment="Bottom" Width="163" Height="35" Background="Teal" Click="Button_Click_1"/>
-        <ProgressBar Name="loadingContent"  HorizontalAlignment="Left" Height="10" Margin="213,295,0,0" VerticalAlignment="Top" Width="100"/>
-        <Label Content="Lista owoców:" FontWeight="Bold" HorizontalAlignment="Left" Margin="10,4,0,0" VerticalAlignment="Top" Width="100"/>
+		<Button Name="sum" Content="Wartość magazynu" Margin="0,0,10,10" VerticalAlignment="Bottom" Height="35" Click="Button_Click_1" HorizontalAlignment="Right" Width="163"/>
+		<Label Content="Lista owoców:" FontWeight="Bold" HorizontalAlignment="Left" Margin="10,4,0,0" VerticalAlignment="Top" Width="100"/>
 
 
-    </Grid>
+	</Grid>
 </Window>
-
+
diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml.cs b/Magazyn_Client/Magazyn/MainWindow.xaml.cs
index ff7ee50..aae5b5d 100644
--- a/Magazyn_Client/Magazyn/MainWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/MainWindow.xaml.cs
@@ -16,6 +16,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Magazyn
 {
@@ -28,7 +29,6 @@ namespace Magazyn
 		public MainWindow()
 		{
 			InitializeComponent();
-            loadingContent.IsIndeterminate = true;
             client = new HttpClient();
             RefreshListOfFruits();
         }
@@ -52,16 +52,15 @@ namespace Magazyn
 
 		private void RefreshListOfFruits()
 		{
-            loadingContent.Visibility = Visibility.Visible;
-            loadingContent.IsIndeterminate = true;
-            Task<HttpResponseMessage> response = client.GetAsync("https://sysmag.herokuapp.com/api/get-all");
-			while (response.IsCompleted != true)
-            {
-                loadingContent.IsIndeterminate = false;
-                loadingContent.Visibility = Visibility.Hidden;
-            }
 
-			Fruit[] fruits = JsonConvert.DeserializeObject<Fruit[]>(response.Result.Content.ReadAsStringAsync().Result.ToString());
+            Task<HttpResponseMessage> response = client.GetAsync("https://sysmag.herokuapp.com/api/get-all");
+			while (response.IsCompleted != true) ;
+
+			string responseString = response.Result.Content.ReadAsStringAsync().Result;
+
+			JObject replay = JObject.Parse(responseString);
+
+			Fruit[] fruits = JsonConvert.DeserializeObject<Fruit[]>(replay["content"].ToString());
 
 			UpdateListOfFruits(fruits);
         }
diff --git a/Magazyn_Client/Magazyn/Views/FruitView.xaml b/Magazyn_Client/Magazyn/Views/FruitView.xaml
index 13e29f4..a9401d9 100644
--- a/Magazyn_Client/Magazyn/Views/FruitView.xaml
+++ b/Magazyn_Client/Magazyn/Views/FruitView.xaml
@@ -9,8 +9,8 @@
     mc:Ignorable="d" Height="64" Width="520">
 
 
-    <materialDesign:Card Height="64" Background="Teal">
-        <Grid Height="64">
+	<materialDesign:Card Background="{DynamicResource SecondaryAccentBrush}">
+        <Grid>
             <Image Name="fruitImage" HorizontalAlignment="Left" Margin="10,10,0,7" Width="50"/>
             <TextBlock Name="fruitName" HorizontalAlignment="Left" Margin="80,26,0,0" TextWrapping="Wrap" Text="TextBlock" VerticalAlignment="Top" Width="116"/>
             <Image Name="minusImage" HorizontalAlignment="Left" Height="24" Margin="240,25,0,0" VerticalAlignment="Top" Width="24" Source="/Images/minus.png" MouseDown="subButton_Click" />
diff --git a/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs b/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
index 932872d..47098aa 100644
--- a/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
+++ b/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
@@ -54,6 +54,7 @@ namespace Magazyn.Views
 		{
 			AmountWindow window = new AmountWindow(fruit, -1, fruit.Quantity);
 			window.SaveChangingAmountOfFruits += WindowSaveChangingAmountOfFruits;
+			window.Owner = Application.Current.MainWindow;
 			window.ShowDialog();
 		}
 
@@ -61,6 +62,7 @@ namespace Magazyn.Views
 		{
 			AmountWindow window = new AmountWindow(fruit, 1, fruit.Quantity);
 			window.SaveChangingAmountOfFruits += WindowSaveChangingAmountOfFruits;
+			window.Owner = Application.Current.MainWindow;
 			window.ShowDialog();
 		}
 
diff --git a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
index 3eb241e..dcdd3b1 100644
--- a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
@@ -1,11 +1,21 @@
 <Window x:Class="Magazyn.Windows.AmountWindow"
+		
+		xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+		TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+		TextElement.FontWeight="Regular"
+		TextElement.FontSize="13"
+		TextOptions.TextFormattingMode="Ideal"
+		TextOptions.TextRenderingMode="Auto"
+		Background="{DynamicResource MaterialDesignPaper}"
+		FontFamily="{DynamicResource MaterialDesignFont}"
+		
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Magazyn.Windows"
         mc:Ignorable="d"
-        Title="Magazyn" Height="205" Width="220">
+        Title="Magazyn" WindowStartupLocation="CenterOwner" Height="205" Width="220">
     
         <Grid>
 		<TextBlock x:Name="fruitName" HorizontalAlignment="Left" Margin="10,82,0,0" TextWrapping="Wrap" Text="fruitName" Width="64" Height="16" VerticalAlignment="Top"/>