From 86af9ec922cec680224711159b54f555186c4939 Mon Sep 17 00:00:00 2001 From: David Britch Date: Fri, 29 Sep 2017 12:35:15 +0100 Subject: [PATCH 1/4] New campaign icons for iOS + Android #353 --- .../Views/MainView.xaml | 6 +- .../Resources/Resource.Designer.cs | 59 +++++++++--------- .../drawable-hdpi/menu_campaigns.png | Bin 0 -> 1380 bytes .../drawable-xhdpi/menu_campaigns.png | Bin 0 -> 1450 bytes .../drawable-xxhdpi/menu_campaigns.png | Bin 0 -> 1674 bytes .../eShopOnContainers.Droid.csproj | 17 +++-- .../Resources/menu_campaigns.png | Bin 0 -> 1380 bytes .../Resources/menu_campaigns@2x.png | Bin 0 -> 1674 bytes .../Resources/menu_campaigns@3x.png | Bin 0 -> 1880 bytes .../eShopOnContainers.iOS.csproj | 5 +- 10 files changed, 45 insertions(+), 42 deletions(-) create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/menu_campaigns.png create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/menu_campaigns.png create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/menu_campaigns.png create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/menu_campaigns.png create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/menu_campaigns@2x.png create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/menu_campaigns@3x.png diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml index 493f86301..4d4504b77 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml @@ -69,9 +69,9 @@ + Android="menu_campaigns" + iOS="menu_campaigns" + WinPhone="Assets\menu_campaigns.png"/> \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs index 2edc879eb..2afd316a8 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs @@ -2281,82 +2281,85 @@ namespace eShopOnContainers.Droid public const int icon = 2130837664; // aapt resource value: 0x7f0200a1 - public const int menu_cart = 2130837665; + public const int menu_campaigns = 2130837665; // aapt resource value: 0x7f0200a2 - public const int menu_filter = 2130837666; + public const int menu_cart = 2130837666; // aapt resource value: 0x7f0200a3 - public const int menu_profile = 2130837667; + public const int menu_filter = 2130837667; // aapt resource value: 0x7f0200a4 - public const int mr_dialog_material_background_dark = 2130837668; + public const int menu_profile = 2130837668; // aapt resource value: 0x7f0200a5 - public const int mr_dialog_material_background_light = 2130837669; + public const int mr_dialog_material_background_dark = 2130837669; // aapt resource value: 0x7f0200a6 - public const int mr_ic_audiotrack_light = 2130837670; + public const int mr_dialog_material_background_light = 2130837670; // aapt resource value: 0x7f0200a7 - public const int mr_ic_cast_dark = 2130837671; + public const int mr_ic_audiotrack_light = 2130837671; // aapt resource value: 0x7f0200a8 - public const int mr_ic_cast_light = 2130837672; + public const int mr_ic_cast_dark = 2130837672; // aapt resource value: 0x7f0200a9 - public const int mr_ic_close_dark = 2130837673; + public const int mr_ic_cast_light = 2130837673; // aapt resource value: 0x7f0200aa - public const int mr_ic_close_light = 2130837674; + public const int mr_ic_close_dark = 2130837674; // aapt resource value: 0x7f0200ab - public const int mr_ic_media_route_connecting_mono_dark = 2130837675; + public const int mr_ic_close_light = 2130837675; // aapt resource value: 0x7f0200ac - public const int mr_ic_media_route_connecting_mono_light = 2130837676; + public const int mr_ic_media_route_connecting_mono_dark = 2130837676; // aapt resource value: 0x7f0200ad - public const int mr_ic_media_route_mono_dark = 2130837677; + public const int mr_ic_media_route_connecting_mono_light = 2130837677; // aapt resource value: 0x7f0200ae - public const int mr_ic_media_route_mono_light = 2130837678; + public const int mr_ic_media_route_mono_dark = 2130837678; // aapt resource value: 0x7f0200af - public const int mr_ic_pause_dark = 2130837679; + public const int mr_ic_media_route_mono_light = 2130837679; // aapt resource value: 0x7f0200b0 - public const int mr_ic_pause_light = 2130837680; + public const int mr_ic_pause_dark = 2130837680; // aapt resource value: 0x7f0200b1 - public const int mr_ic_play_dark = 2130837681; + public const int mr_ic_pause_light = 2130837681; // aapt resource value: 0x7f0200b2 - public const int mr_ic_play_light = 2130837682; + public const int mr_ic_play_dark = 2130837682; // aapt resource value: 0x7f0200b3 - public const int noimage = 2130837683; - - // aapt resource value: 0x7f0200ba - public const int notification_template_icon_bg = 2130837690; + public const int mr_ic_play_light = 2130837683; // aapt resource value: 0x7f0200b4 - public const int product_add = 2130837684; + public const int noimage = 2130837684; + + // aapt resource value: 0x7f0200bb + public const int notification_template_icon_bg = 2130837691; // aapt resource value: 0x7f0200b5 - public const int roundedbg = 2130837685; + public const int product_add = 2130837685; // aapt resource value: 0x7f0200b6 - public const int roundedbgdark = 2130837686; + public const int roundedbg = 2130837686; // aapt resource value: 0x7f0200b7 - public const int splash_drawable = 2130837687; + public const int roundedbgdark = 2130837687; // aapt resource value: 0x7f0200b8 - public const int switch_off = 2130837688; + public const int splash_drawable = 2130837688; // aapt resource value: 0x7f0200b9 - public const int switch_on = 2130837689; + public const int switch_off = 2130837689; + + // aapt resource value: 0x7f0200ba + public const int switch_on = 2130837690; static Drawable() { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/menu_campaigns.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/menu_campaigns.png new file mode 100644 index 0000000000000000000000000000000000000000..6a07d9ae38cfcc22e6baff0644012835edbb1578 GIT binary patch literal 1380 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!3HF~3v%Lt6id3JuOkD)#(wTUiL5|AXMsm# zF;M+=5N34Jm|X!>qm&sEQ4-h?X z&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6GOr}DLN~8i8Da>`9GBGM z%NE$#vZxxVPk(v|Xk_ik@urCaOKF2D7uF*L^ zC%-7TATc==vz|zXdQo+yrZN8k!m;7l34(i&7Iy@{2<9 z^K?x0jF6QQ*MG*!YDLELuCKjUhn*pd3xrQImg=fILqrkNpwG>dqOfNa@NFdjRn2JJ}k`#S=uZfw3>g* nU{kO6<54j@$hLC+wjWG;AI)>~R{q=tD)&5H{an^LB{Ts5idwr4 literal 0 HcmV?d00001 diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/menu_campaigns.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/menu_campaigns.png new file mode 100644 index 0000000000000000000000000000000000000000..1bcb9fc937b33ac0d492a0322b0bcad9ba6e7d44 GIT binary patch literal 1450 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 literal 0 HcmV?d00001 diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj index 41c864d97..d9bdd0ded 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj @@ -260,6 +260,12 @@ Designer + + + + + + @@ -285,15 +291,6 @@ - - - - - - - - - @@ -380,7 +377,7 @@ - {67f9d3a8-f71e-4428-913f-c37ae82cdb24} + {BA96A12C-4EE3-46C4-BB3F-F811B554CD01} eShopOnContainers.Core diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/menu_campaigns.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/menu_campaigns.png new file mode 100644 index 0000000000000000000000000000000000000000..1e21d4fd0f965e6c6a2d8493c288dcbabb53b35d GIT binary patch literal 1380 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!3HF~3v%Lt6id3JuOkD)#(wTUiL5|AXMsm# zF;M+=5N34Jm|X!>qm&sEQ4-h?X z&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6GOr}DLN~8i8Da>`9GBGM z%NE$#vZxxVPk(v|Xk_ik@urCaOKF2D7uF*L^ zC%-7TATc==vz|zXdQo+y&!~l60O%0L@Kr+rnsfi`|MIrh5 zId)*j=7P8i#(HKDoyhV~tv33gT!fUXAXyeH3e2;1TtJ<${BOr)eRcamV3Bac)5S4F zL$vhVUOq-gfde07;}=e_Xzg%Qz8KIkD`>q^)ZRnV8KqoSOIy?zOse2&4bWh@>Zzxs z6#0Meo!ECzd_J8%^X|->xdMs{r>t5ec!?{{FeRbKdS1kWXY(h$Yjm4Z)ybu2Fek@T zbN7{l36A^!Iq);TNOjaZTzx}(N6&@$g?+|(d+sRy=byG|#-Wy0%c6a}znSla-(hoB zmMJ_cRk(e5z4J@v>6ugJ9Bbd>EU)_{(fy3>3CWzuSrfZ87W4}HurwcJX|s6HYW^*Q mO}*ZaN5$|U+sgUdelYEQG|$aj`EwVj-1Btxb6Mw<&;$VMOT2~v literal 0 HcmV?d00001 diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/menu_campaigns@2x.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/menu_campaigns@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2f61741a86868d2c2e5f2acc3d1bf59cd59ae0f0 GIT binary patch literal 1674 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 xN&VJ+#= + + + @@ -423,7 +426,7 @@ - {67f9d3a8-f71e-4428-913f-c37ae82cdb24} + {BA96A12C-4EE3-46C4-BB3F-F811B554CD01} eShopOnContainers.Core From 745cb39d768e20b52aa357ae7625af239444cd26 Mon Sep 17 00:00:00 2001 From: David Britch Date: Fri, 29 Sep 2017 12:50:33 +0100 Subject: [PATCH 2/4] UWP campaign icon. Fixes #353 --- .../Assets/menu_campaigns.png | Bin 0 -> 1674 bytes .../eShopOnContainers.Windows.csproj | 1 + 2 files changed, 1 insertion(+) create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/menu_campaigns.png diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/menu_campaigns.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/menu_campaigns.png new file mode 100644 index 0000000000000000000000000000000000000000..a4761bd04ee87b5e596a3be489047224aecb6c24 GIT binary patch literal 1674 zcmeAS@N?(olHy`uVBq!ia0vp^;y^6Q!3HGPJ}O-eq*&4&eH|GXHuiJ>Nn{1`ISV`@ zi-GE|gD|6$#_S598l}vTh>{3jAFJg2T)o7U{G?R9irfOAY6b?I3M(KpH?<^Dp&~aY zuh^=>Rtc=a3djZt>nkaMm6T-LDnNc-DA*LGq*(>IxIwi8 zdA3R!B_#z``ugSN<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$`C_f=D4I5 zCl_TFlw{`TDS*sPOv*1Uu~kw6Sp)|Vca~(PA#BPkhI$L=L4A;nzM-ChJ~nNs6`44+ zfn;!MOG$?Ns-Uze2kfVmWc}2f)ZEm(l477fL#);T!xpX)#gP?>1rW=?fe7)N4antI zL8-<0Ii;W=2+hkZu`{v(dk9?^5h4&>&iT0oMXANbKy7xWP%X$}=;|X7*4SAZKs6u> zqHFLk$^`l}5#%mAL#TRWF?98j*epO6MA85XdaHoUiqxD4mrP)Qf_-6RY@?4=0$rnX zeolT-a6w{nD#&4AEl5J>s=?MoB3T2|gD!!jF(uimxHKs%HMs;Swt#U4PWw)Y>H0{* zHu_jq+W=F7m2ZAZW?H37Vo9o7D3&Gd z3ds^xOj2x`>c+#^xlEuZth0%2|GM+L&mCD@{QaF=#kV<@#n0yU&%LWL{UTSZlkU>9 zAJn@R-R(Ji>9oMQCc_D94_^Kfs43d9<$%hY1Dq%H9xzOMsB7alk#o1?7bcZiY4bHS z_(g?`M6Ms+6>NK`z9sW|+(G{4JvqW!!b=XB9IcgVjXhKy`k<6$ljZem)e=qm0ivs( z6nWmxEIyk4BUC)Rg0ZtO*)P*y;QV9#n)zQ-wU|5&JuXhqG`dFoo@0)DW0u4 zPxzzX-?IG6YEBAGWiwiTmw7BYKIOJS-F(%fwWdmc{UX0d#V_A(+Y}a`zV`~ZS)fwg zgJ0V|u20}H*~VF=xM5NF#Hlvzi{fQ}wy*fp8fa0}C426EVOY%Z$Nd=-D%cjf1&EI7o z@2Ypbivj4x*E0V5FwM|Jd-P2b1VSmEi+`B)`C)6HY my3F;3?1>VdZ?UR;yV-;vvu7Rn{`e%QcJOrdb6Mw<&;$TJnoz9( literal 0 HcmV?d00001 diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj index 342acf6b2..687999d99 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj @@ -141,6 +141,7 @@ + From 0348d882f3122e6e0a6c1a1ae13e930cb0d666a4 Mon Sep 17 00:00:00 2001 From: David Britch Date: Fri, 29 Sep 2017 16:14:18 +0100 Subject: [PATCH 3/4] Fixed relationship between XAML and their code-behind files in the PCL. Fixes #354 --- .../eShopOnContainers.Core.csproj | 120 +++++++++++++----- 1 file changed, 87 insertions(+), 33 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj index bc0cb1936..9adfff09d 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj @@ -36,7 +36,9 @@ - + + AddBasketButton.xaml + @@ -59,23 +61,57 @@ - - - - - - - - - - - - - - - - - + + BasketItemTemplate.xaml + + + CampaignTemplate.xaml + + + OrderItemTemplate.xaml + + + OrderTemplate.xaml + + + ProductTemplate.xaml + + + BasketView.xaml + + + CampaignDetailsView.xaml + + + CampaignView.xaml + + + CatalogView.xaml + + + CheckoutView.xaml + + + CustomNavigationView.xaml + + + FiltersView.xaml + + + LoginView.xaml + + + MainView.xaml + + + OrderDetailView.xaml + + + ProfileView.xaml + + + SettingsView.xaml + @@ -162,57 +198,75 @@ MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml - MSBuild:UpdateDesignTimeXaml + Designer + MSBuild:UpdateDesignTimeXaml + Designer MSBuild:UpdateDesignTimeXaml + Designer MSBuild:UpdateDesignTimeXaml + Designer MSBuild:UpdateDesignTimeXaml From 2e463f4b250e880376ffa9e1747f570db8f02686 Mon Sep 17 00:00:00 2001 From: David Britch Date: Fri, 29 Sep 2017 17:25:49 +0100 Subject: [PATCH 4/4] Fixed SplashScreen implementation on Android. Fixes #355 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The MainTheme set the splash screen image as the window background. I’ve removed this and ensured that the SplashActivity is the launch activity. Also did some code tidy up on the Campaign page classes. --- .../Services/Marketing/CampaignMockService.cs | 18 +++--- .../Services/Marketing/CampaignService.cs | 18 +++--- .../Services/Marketing/ICampaignService.cs | 11 ++-- .../ViewModels/CampaignDetailsViewModel.cs | 22 +++---- .../ViewModels/CampaignViewModel.cs | 24 +++---- .../Views/CampaignDetailsView.xaml | 2 +- .../Views/CampaignView.xaml.cs | 8 +-- .../Activities/MainActivity.cs | 1 - .../Activities/SplashActivity.cs | 4 +- .../MainApplication.cs | 5 +- .../Resources/Resource.Designer.cs | 11 ++-- .../Resources/drawable/splash_drawable.xml | 11 ---- .../Resources/values/styles.xml | 62 +++++++++---------- .../eShopOnContainers.Droid.csproj | 5 +- 14 files changed, 86 insertions(+), 116 deletions(-) delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable/splash_drawable.xml diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs index 88bd3a5ee..c4536ac51 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs @@ -1,12 +1,12 @@ -namespace eShopOnContainers.Core.Services.Marketing -{ - using System; - using System.Collections.ObjectModel; - using System.Threading.Tasks; - using Models.Marketing; - using Xamarin.Forms; - using System.Linq; +using System; +using System.Collections.ObjectModel; +using System.Threading.Tasks; +using System.Linq; +using Xamarin.Forms; +using eShopOnContainers.Core.Models.Marketing; +namespace eShopOnContainers.Core.Services.Marketing +{ public class CampaignMockService : ICampaignService { private readonly ObservableCollection _mockCampaign = new ObservableCollection @@ -39,14 +39,12 @@ public async Task> GetAllCampaignsAsync(string token) { await Task.Delay(500); - return _mockCampaign; } public async Task GetCampaignByIdAsync(int campaignId, string token) { await Task.Delay(500); - return _mockCampaign.SingleOrDefault(c => c.Id == campaignId); } } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs index 3d3123c1c..8d6cdeb6b 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs @@ -1,13 +1,13 @@ -namespace eShopOnContainers.Core.Services.Marketing -{ - using System; - using System.Collections.ObjectModel; - using System.Threading.Tasks; - using Models.Marketing; - using RequestProvider; - using Extensions; - using Helpers; +using System; +using System.Collections.ObjectModel; +using System.Threading.Tasks; +using eShopOnContainers.Core.Models.Marketing; +using eShopOnContainers.Core.Services.RequestProvider; +using eShopOnContainers.Core.Extensions; +using eShopOnContainers.Core.Helpers; +namespace eShopOnContainers.Core.Services.Marketing +{ public class CampaignService : ICampaignService { private readonly IRequestProvider _requestProvider; diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs index a050153c1..d89ac0616 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs @@ -1,13 +1,12 @@ -namespace eShopOnContainers.Core.Services.Marketing -{ - using System.Collections.ObjectModel; - using System.Threading.Tasks; - using Models.Marketing; +using System.Collections.ObjectModel; +using System.Threading.Tasks; +using eShopOnContainers.Core.Models.Marketing; +namespace eShopOnContainers.Core.Services.Marketing +{ public interface ICampaignService { Task> GetAllCampaignsAsync(string token); - Task GetCampaignByIdAsync(int id, string token); } } \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs index 95e614bc6..4a74187ee 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs @@ -1,13 +1,13 @@ -namespace eShopOnContainers.Core.ViewModels -{ - using System.Threading.Tasks; - using Helpers; - using Models.Marketing; - using Services.Marketing; - using Base; - using System.Windows.Input; - using Xamarin.Forms; +using System.Threading.Tasks; +using System.Windows.Input; +using Xamarin.Forms; +using eShopOnContainers.Core.ViewModels.Base; +using eShopOnContainers.Core.Helpers; +using eShopOnContainers.Core.Models.Marketing; +using eShopOnContainers.Core.Services.Marketing; +namespace eShopOnContainers.Core.ViewModels +{ public class CampaignDetailsViewModel : ViewModelBase { private CampaignItem _campaign; @@ -46,9 +46,9 @@ IsBusy = true; // Get campaign by id - Campaign = await _campaignService.GetCampaignByIdAsync((int) navigationData, Settings.AuthAccessToken); + Campaign = await _campaignService.GetCampaignByIdAsync((int)navigationData, Settings.AuthAccessToken); - IsBusy = false; + IsBusy = false; } } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs index 4127213d4..9351ec414 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs @@ -1,14 +1,14 @@ -namespace eShopOnContainers.Core.ViewModels -{ - using System.Threading.Tasks; - using System.Windows.Input; - using Xamarin.Forms; - using System.Collections.ObjectModel; - using Models.Marketing; - using Services.Marketing; - using Base; - using Helpers; +using System.Threading.Tasks; +using System.Windows.Input; +using Xamarin.Forms; +using System.Collections.ObjectModel; +using eShopOnContainers.Core.Models.Marketing; +using eShopOnContainers.Core.Services.Marketing; +using eShopOnContainers.Core.ViewModels.Base; +using eShopOnContainers.Core.Helpers; +namespace eShopOnContainers.Core.ViewModels +{ public class CampaignViewModel : ViewModelBase { private ObservableCollection _campaigns; @@ -29,7 +29,7 @@ } } - public ICommand GetCampaignDetailsCommand => new Command(async (item) => await GetCampaignDetails(item)); + public ICommand GetCampaignDetailsCommand => new Command(async (item) => await GetCampaignDetailsAsync(item)); public override async Task InitializeAsync(object navigationData) { @@ -41,7 +41,7 @@ IsBusy = false; } - private async Task GetCampaignDetails(CampaignItem campaign) + private async Task GetCampaignDetailsAsync(CampaignItem campaign) { await NavigationService.NavigateToAsync(campaign.Id); } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignDetailsView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignDetailsView.xaml index e5e96bbff..5fcf15ddb 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignDetailsView.xaml +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignDetailsView.xaml @@ -150,7 +150,7 @@ Style="{StaticResource CampaignAvailabilityDescriptionStyle}"/> - - - - - - - - - \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/values/styles.xml b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/values/styles.xml index a57d30cc3..7480839c7 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/values/styles.xml +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/values/styles.xml @@ -1,38 +1,32 @@ - + - - - - - + + - - - - - + true + @style/AppCompatDialogStyle + + + \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj index d9bdd0ded..8ccb42d53 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj @@ -221,7 +221,6 @@ - @@ -234,6 +233,7 @@ + @@ -279,9 +279,6 @@ - - -