From 009411133daf27da6e7ee9259ab878b3eaec1959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Su=C3=A1rez=20Ruiz?= Date: Thu, 24 Nov 2016 13:34:33 +0100 Subject: [PATCH] Added loading image Review mobile apps UI Changes in Basket API integration --- .../eShopOnContainers.Core/App.xaml | 1 + .../Converters/ItemsToHeightConverter.cs | 26 +++ .../Views/BasketView.xaml | 7 +- .../Views/FiltersView.xaml | 2 + .../Views/MainView.xaml | 3 + .../Views/SettingsView.xaml | 13 +- .../Views/Templates/BasketItemTemplate.xaml | 30 ++- .../Views/Templates/OrderItemTemplate.xaml | 13 +- .../Views/Templates/ProductTemplate.xaml | 10 + .../eShopOnContainers.Core.csproj | 1 + .../Resources/Resource.Designer.cs | 215 +++++++++--------- .../Resources/drawable/default_product.png | Bin 0 -> 60880 bytes .../eShopOnContainers.Droid.csproj | 9 +- .../Assets/default_product.png | Bin 0 -> 60880 bytes .../Renderers/CustomTabbedPageRenderer.cs | 33 ++- .../eShopOnContainers.Windows.csproj | 1 + .../Resources/default_product.png | Bin 0 -> 60880 bytes .../eShopOnContainers.iOS.csproj | 3 + 18 files changed, 241 insertions(+), 126 deletions(-) create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Core/Converters/ItemsToHeightConverter.cs create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable/default_product.png create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/default_product.png create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/default_product.png diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml index 74c5c9c79..2c3a9c859 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml @@ -104,6 +104,7 @@ + diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Converters/ItemsToHeightConverter.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Converters/ItemsToHeightConverter.cs new file mode 100644 index 000000000..6a1832fa1 --- /dev/null +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Converters/ItemsToHeightConverter.cs @@ -0,0 +1,26 @@ +using System; +using System.Globalization; +using Xamarin.Forms; + +namespace eShopOnContainers.Core.Converters +{ + public class ItemsToHeightConverter : IValueConverter + { + private const int ItemHeight = 144; + + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if(value is int) + { + return System.Convert.ToInt32(value) * ItemHeight; + } + + return 0; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return null; + } + } +} diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/BasketView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/BasketView.xaml index c95d9d562..8f4117a50 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/BasketView.xaml +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/BasketView.xaml @@ -55,7 +55,7 @@ - @@ -73,7 +73,8 @@ - + + + + @@ -31,6 +32,7 @@ WinPhone="Assets\menu_filter.png"/> + @@ -41,6 +43,7 @@ WinPhone="Assets\menu_profile.png"/> + - - + diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/BasketItemTemplate.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/BasketItemTemplate.xaml index 564977fd5..48ec265a9 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/BasketItemTemplate.xaml +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/BasketItemTemplate.xaml @@ -56,8 +56,6 @@ - +