ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add serviceHelper and add campaingTemplate in campaing view

Browse Source
This commit is contained in:
Christian Arenas 2017-06-19 18:50:28 +02:00
parent 8a73ee4c59
commit 85c9af690f
4 changed files with 155 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs
View File

@ -1,5 +1,6 @@
using eShopOnContainers.Core.Models.Basket; using eShopOnContainers.Core.Models.Basket;
using eShopOnContainers.Core.Models.Catalog; using eShopOnContainers.Core.Models.Catalog;
using eShopOnContainers.Core.Models.Marketing;
using eShopOnContainers.Core.ViewModels.Base; using eShopOnContainers.Core.ViewModels.Base;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -76,5 +77,38 @@ namespace eShopOnContainers.Core.Helpers
Debug.WriteLine(ex.Message); Debug.WriteLine(ex.Message);
} }
} }
public static void FixCatalogItemPictureUri(IEnumerable<CampaignItem> campaignItems)
{
if (campaignItems == null)
{
return;
}
try
{
if (!ViewModelLocator.UseMockService
&& Settings.UrlBase != GlobalSetting.DefaultEndpoint)
{
foreach (var catalogItem in campaignItems)
{
MatchCollection serverResult = IpRegex.Matches(catalogItem.PictureUri);
MatchCollection localResult = IpRegex.Matches(Settings.UrlBase);
if (serverResult.Count != -1 && localResult.Count != -1)
{
var serviceIp = serverResult[0].Value;
var localIp = localResult[0].Value;
catalogItem.PictureUri = catalogItem.PictureUri.Replace(serviceIp, localIp);
}
}
}
}
catch (Exception ex)
{
Debug.WriteLine(ex.Message);
}
}
} }
} }

13
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs
View File

@ -1,4 +1,5 @@
using System.Threading.Tasks; using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using System.Windows.Input; using System.Windows.Input;
using eShopOnContainers.Core.Helpers; using eShopOnContainers.Core.Helpers;
using eShopOnContainers.Core.Models.Catalog; using eShopOnContainers.Core.Models.Catalog;
@ -14,7 +15,7 @@ namespace eShopOnContainers.Core.ViewModels
public class CampaignViewModel : ViewModelBase public class CampaignViewModel : ViewModelBase
{ {
private ObservableCollection<Campaign> _campaigns; private ObservableCollection<CampaignItem> _campaigns;
private readonly ICampaignService _campaignService; private readonly ICampaignService _campaignService;
public CampaignViewModel(ICampaignService campaignService) public CampaignViewModel(ICampaignService campaignService)
@ -22,7 +23,7 @@ namespace eShopOnContainers.Core.ViewModels
_campaignService = campaignService; _campaignService = campaignService;
} }
public ObservableCollection<Campaign> Campaigns public ObservableCollection<CampaignItem> Campaigns
{ {
get => _campaigns; get => _campaigns;
set set
@ -32,7 +33,7 @@ namespace eShopOnContainers.Core.ViewModels
} }
} }
public ICommand GetCampaignDetailsCommand => new Command<Campaign>(GetCampaignDetails); public ICommand GetCampaignDetailsCommand => new Command<CampaignItem>(async (item) => await GetCampaignDetails(item));
public override async Task InitializeAsync(object navigationData) public override async Task InitializeAsync(object navigationData)
{ {
@ -44,9 +45,9 @@ namespace eShopOnContainers.Core.ViewModels
IsBusy = false; IsBusy = false;
} }
private void GetCampaignDetails(Campaign campaign) private async Task GetCampaignDetails(CampaignItem campaign)
{ {
await NavigationService.NavigateToAsync<CampaignDetailsViewModel>(campaign.Id);
} }
} }
} }

2
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignView.xaml
View File

@ -74,7 +74,7 @@
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate> <DataTemplate>
<ViewCell> <ViewCell>
<templates:ProductTemplate /> <templates:CampaignTemplate />
</ViewCell> </ViewCell>
</DataTemplate> </DataTemplate>
</ListView.ItemTemplate> </ListView.ItemTemplate>

223
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs generated
View File

@ -2030,328 +2030,331 @@ namespace eShopOnContainers.Droid
public const int banner = 2130837581; public const int banner = 2130837581;
// aapt resource value: 0x7f02004e // aapt resource value: 0x7f02004e
public const int default_product = 2130837582; public const int default_campaign = 2130837582;
// aapt resource value: 0x7f02004f // aapt resource value: 0x7f02004f
public const int design_fab_background = 2130837583; public const int default_product = 2130837583;
// aapt resource value: 0x7f020050 // aapt resource value: 0x7f020050
public const int design_snackbar_background = 2130837584; public const int design_fab_background = 2130837584;
// aapt resource value: 0x7f020051 // aapt resource value: 0x7f020051
public const int fake_campaign_1 = 2130837585; public const int design_snackbar_background = 2130837585;
// aapt resource value: 0x7f020052 // aapt resource value: 0x7f020052
public const int fake_campaign_2 = 2130837586; public const int fake_campaign_01 = 2130837586;
// aapt resource value: 0x7f020053 // aapt resource value: 0x7f020053
public const int fake_product_01 = 2130837587; public const int fake_campaign_02 = 2130837587;
// aapt resource value: 0x7f020054 // aapt resource value: 0x7f020054
public const int fake_product_02 = 2130837588; public const int fake_product_01 = 2130837588;
// aapt resource value: 0x7f020055 // aapt resource value: 0x7f020055
public const int fake_product_03 = 2130837589; public const int fake_product_02 = 2130837589;
// aapt resource value: 0x7f020056 // aapt resource value: 0x7f020056
public const int fake_product_04 = 2130837590; public const int fake_product_03 = 2130837590;
// aapt resource value: 0x7f020057 // aapt resource value: 0x7f020057
public const int fake_product_05 = 2130837591; public const int fake_product_04 = 2130837591;
// aapt resource value: 0x7f020058 // aapt resource value: 0x7f020058
public const int header_logo = 2130837592; public const int fake_product_05 = 2130837592;
// aapt resource value: 0x7f020059 // aapt resource value: 0x7f020059
public const int ic_audiotrack = 2130837593; public const int header_logo = 2130837593;
// aapt resource value: 0x7f02005a // aapt resource value: 0x7f02005a
public const int ic_audiotrack_light = 2130837594; public const int ic_audiotrack = 2130837594;
// aapt resource value: 0x7f02005b // aapt resource value: 0x7f02005b
public const int ic_bluetooth_grey = 2130837595; public const int ic_audiotrack_light = 2130837595;
// aapt resource value: 0x7f02005c // aapt resource value: 0x7f02005c
public const int ic_bluetooth_white = 2130837596; public const int ic_bluetooth_grey = 2130837596;
// aapt resource value: 0x7f02005d // aapt resource value: 0x7f02005d
public const int ic_cast_dark = 2130837597; public const int ic_bluetooth_white = 2130837597;
// aapt resource value: 0x7f02005e // aapt resource value: 0x7f02005e
public const int ic_cast_disabled_light = 2130837598; public const int ic_cast_dark = 2130837598;
// aapt resource value: 0x7f02005f // aapt resource value: 0x7f02005f
public const int ic_cast_grey = 2130837599; public const int ic_cast_disabled_light = 2130837599;
// aapt resource value: 0x7f020060 // aapt resource value: 0x7f020060
public const int ic_cast_light = 2130837600; public const int ic_cast_grey = 2130837600;
// aapt resource value: 0x7f020061 // aapt resource value: 0x7f020061
public const int ic_cast_off_light = 2130837601; public const int ic_cast_light = 2130837601;
// aapt resource value: 0x7f020062 // aapt resource value: 0x7f020062
public const int ic_cast_on_0_light = 2130837602; public const int ic_cast_off_light = 2130837602;
// aapt resource value: 0x7f020063 // aapt resource value: 0x7f020063
public const int ic_cast_on_1_light = 2130837603; public const int ic_cast_on_0_light = 2130837603;
// aapt resource value: 0x7f020064 // aapt resource value: 0x7f020064
public const int ic_cast_on_2_light = 2130837604; public const int ic_cast_on_1_light = 2130837604;
// aapt resource value: 0x7f020065 // aapt resource value: 0x7f020065
public const int ic_cast_on_light = 2130837605; public const int ic_cast_on_2_light = 2130837605;
// aapt resource value: 0x7f020066 // aapt resource value: 0x7f020066
public const int ic_cast_white = 2130837606; public const int ic_cast_on_light = 2130837606;
// aapt resource value: 0x7f020067 // aapt resource value: 0x7f020067
public const int ic_close_dark = 2130837607; public const int ic_cast_white = 2130837607;
// aapt resource value: 0x7f020068 // aapt resource value: 0x7f020068
public const int ic_close_light = 2130837608; public const int ic_close_dark = 2130837608;
// aapt resource value: 0x7f020069 // aapt resource value: 0x7f020069
public const int ic_collapse = 2130837609; public const int ic_close_light = 2130837609;
// aapt resource value: 0x7f02006a // aapt resource value: 0x7f02006a
public const int ic_collapse_00000 = 2130837610; public const int ic_collapse = 2130837610;
// aapt resource value: 0x7f02006b // aapt resource value: 0x7f02006b
public const int ic_collapse_00001 = 2130837611; public const int ic_collapse_00000 = 2130837611;
// aapt resource value: 0x7f02006c // aapt resource value: 0x7f02006c
public const int ic_collapse_00002 = 2130837612; public const int ic_collapse_00001 = 2130837612;
// aapt resource value: 0x7f02006d // aapt resource value: 0x7f02006d
public const int ic_collapse_00003 = 2130837613; public const int ic_collapse_00002 = 2130837613;
// aapt resource value: 0x7f02006e // aapt resource value: 0x7f02006e
public const int ic_collapse_00004 = 2130837614; public const int ic_collapse_00003 = 2130837614;
// aapt resource value: 0x7f02006f // aapt resource value: 0x7f02006f
public const int ic_collapse_00005 = 2130837615; public const int ic_collapse_00004 = 2130837615;
// aapt resource value: 0x7f020070 // aapt resource value: 0x7f020070
public const int ic_collapse_00006 = 2130837616; public const int ic_collapse_00005 = 2130837616;
// aapt resource value: 0x7f020071 // aapt resource value: 0x7f020071
public const int ic_collapse_00007 = 2130837617; public const int ic_collapse_00006 = 2130837617;
// aapt resource value: 0x7f020072 // aapt resource value: 0x7f020072
public const int ic_collapse_00008 = 2130837618; public const int ic_collapse_00007 = 2130837618;
// aapt resource value: 0x7f020073 // aapt resource value: 0x7f020073
public const int ic_collapse_00009 = 2130837619; public const int ic_collapse_00008 = 2130837619;
// aapt resource value: 0x7f020074 // aapt resource value: 0x7f020074
public const int ic_collapse_00010 = 2130837620; public const int ic_collapse_00009 = 2130837620;
// aapt resource value: 0x7f020075 // aapt resource value: 0x7f020075
public const int ic_collapse_00011 = 2130837621; public const int ic_collapse_00010 = 2130837621;
// aapt resource value: 0x7f020076 // aapt resource value: 0x7f020076
public const int ic_collapse_00012 = 2130837622; public const int ic_collapse_00011 = 2130837622;
// aapt resource value: 0x7f020077 // aapt resource value: 0x7f020077
public const int ic_collapse_00013 = 2130837623; public const int ic_collapse_00012 = 2130837623;
// aapt resource value: 0x7f020078 // aapt resource value: 0x7f020078
public const int ic_collapse_00014 = 2130837624; public const int ic_collapse_00013 = 2130837624;
// aapt resource value: 0x7f020079 // aapt resource value: 0x7f020079
public const int ic_collapse_00015 = 2130837625; public const int ic_collapse_00014 = 2130837625;
// aapt resource value: 0x7f02007a // aapt resource value: 0x7f02007a
public const int ic_errorstatus = 2130837626; public const int ic_collapse_00015 = 2130837626;
// aapt resource value: 0x7f02007b // aapt resource value: 0x7f02007b
public const int ic_expand = 2130837627; public const int ic_errorstatus = 2130837627;
// aapt resource value: 0x7f02007c // aapt resource value: 0x7f02007c
public const int ic_expand_00000 = 2130837628; public const int ic_expand = 2130837628;
// aapt resource value: 0x7f02007d // aapt resource value: 0x7f02007d
public const int ic_expand_00001 = 2130837629; public const int ic_expand_00000 = 2130837629;
// aapt resource value: 0x7f02007e // aapt resource value: 0x7f02007e
public const int ic_expand_00002 = 2130837630; public const int ic_expand_00001 = 2130837630;
// aapt resource value: 0x7f02007f // aapt resource value: 0x7f02007f
public const int ic_expand_00003 = 2130837631; public const int ic_expand_00002 = 2130837631;
// aapt resource value: 0x7f020080 // aapt resource value: 0x7f020080
public const int ic_expand_00004 = 2130837632; public const int ic_expand_00003 = 2130837632;
// aapt resource value: 0x7f020081 // aapt resource value: 0x7f020081
public const int ic_expand_00005 = 2130837633; public const int ic_expand_00004 = 2130837633;
// aapt resource value: 0x7f020082 // aapt resource value: 0x7f020082
public const int ic_expand_00006 = 2130837634; public const int ic_expand_00005 = 2130837634;
// aapt resource value: 0x7f020083 // aapt resource value: 0x7f020083
public const int ic_expand_00007 = 2130837635; public const int ic_expand_00006 = 2130837635;
// aapt resource value: 0x7f020084 // aapt resource value: 0x7f020084
public const int ic_expand_00008 = 2130837636; public const int ic_expand_00007 = 2130837636;
// aapt resource value: 0x7f020085 // aapt resource value: 0x7f020085
public const int ic_expand_00009 = 2130837637; public const int ic_expand_00008 = 2130837637;
// aapt resource value: 0x7f020086 // aapt resource value: 0x7f020086
public const int ic_expand_00010 = 2130837638; public const int ic_expand_00009 = 2130837638;
// aapt resource value: 0x7f020087 // aapt resource value: 0x7f020087
public const int ic_expand_00011 = 2130837639; public const int ic_expand_00010 = 2130837639;
// aapt resource value: 0x7f020088 // aapt resource value: 0x7f020088
public const int ic_expand_00012 = 2130837640; public const int ic_expand_00011 = 2130837640;
// aapt resource value: 0x7f020089 // aapt resource value: 0x7f020089
public const int ic_expand_00013 = 2130837641; public const int ic_expand_00012 = 2130837641;
// aapt resource value: 0x7f02008a // aapt resource value: 0x7f02008a
public const int ic_expand_00014 = 2130837642; public const int ic_expand_00013 = 2130837642;
// aapt resource value: 0x7f02008b // aapt resource value: 0x7f02008b
public const int ic_expand_00015 = 2130837643; public const int ic_expand_00014 = 2130837643;
// aapt resource value: 0x7f02008c // aapt resource value: 0x7f02008c
public const int ic_media_pause = 2130837644; public const int ic_expand_00015 = 2130837644;
// aapt resource value: 0x7f02008d // aapt resource value: 0x7f02008d
public const int ic_media_play = 2130837645; public const int ic_media_pause = 2130837645;
// aapt resource value: 0x7f02008e // aapt resource value: 0x7f02008e
public const int ic_media_route_disabled_mono_dark = 2130837646; public const int ic_media_play = 2130837646;
// aapt resource value: 0x7f02008f // aapt resource value: 0x7f02008f
public const int ic_media_route_off_mono_dark = 2130837647; public const int ic_media_route_disabled_mono_dark = 2130837647;
// aapt resource value: 0x7f020090 // aapt resource value: 0x7f020090
public const int ic_media_route_on_0_mono_dark = 2130837648; public const int ic_media_route_off_mono_dark = 2130837648;
// aapt resource value: 0x7f020091 // aapt resource value: 0x7f020091
public const int ic_media_route_on_1_mono_dark = 2130837649; public const int ic_media_route_on_0_mono_dark = 2130837649;
// aapt resource value: 0x7f020092 // aapt resource value: 0x7f020092
public const int ic_media_route_on_2_mono_dark = 2130837650; public const int ic_media_route_on_1_mono_dark = 2130837650;
// aapt resource value: 0x7f020093 // aapt resource value: 0x7f020093
public const int ic_media_route_on_mono_dark = 2130837651; public const int ic_media_route_on_2_mono_dark = 2130837651;
// aapt resource value: 0x7f020094 // aapt resource value: 0x7f020094
public const int ic_pause_dark = 2130837652; public const int ic_media_route_on_mono_dark = 2130837652;
// aapt resource value: 0x7f020095 // aapt resource value: 0x7f020095
public const int ic_pause_light = 2130837653; public const int ic_pause_dark = 2130837653;
// aapt resource value: 0x7f020096 // aapt resource value: 0x7f020096
public const int ic_play_dark = 2130837654; public const int ic_pause_light = 2130837654;
// aapt resource value: 0x7f020097 // aapt resource value: 0x7f020097
public const int ic_play_light = 2130837655; public const int ic_play_dark = 2130837655;
// aapt resource value: 0x7f020098 // aapt resource value: 0x7f020098
public const int ic_speaker_dark = 2130837656; public const int ic_play_light = 2130837656;
// aapt resource value: 0x7f020099 // aapt resource value: 0x7f020099
public const int ic_speaker_group_dark = 2130837657; public const int ic_speaker_dark = 2130837657;
// aapt resource value: 0x7f02009a // aapt resource value: 0x7f02009a
public const int ic_speaker_group_light = 2130837658; public const int ic_speaker_group_dark = 2130837658;
// aapt resource value: 0x7f02009b // aapt resource value: 0x7f02009b
public const int ic_speaker_light = 2130837659; public const int ic_speaker_group_light = 2130837659;
// aapt resource value: 0x7f02009c // aapt resource value: 0x7f02009c
public const int ic_successstatus = 2130837660; public const int ic_speaker_light = 2130837660;
// aapt resource value: 0x7f02009d // aapt resource value: 0x7f02009d
public const int ic_tv_dark = 2130837661; public const int ic_successstatus = 2130837661;
// aapt resource value: 0x7f02009e // aapt resource value: 0x7f02009e
public const int ic_tv_light = 2130837662; public const int ic_tv_dark = 2130837662;
// aapt resource value: 0x7f02009f // aapt resource value: 0x7f02009f
public const int icon = 2130837663; public const int ic_tv_light = 2130837663;
// aapt resource value: 0x7f0200a0 // aapt resource value: 0x7f0200a0
public const int menu_cart = 2130837664; public const int icon = 2130837664;
// aapt resource value: 0x7f0200a1 // aapt resource value: 0x7f0200a1
public const int menu_filter = 2130837665; public const int menu_cart = 2130837665;
// aapt resource value: 0x7f0200a2 // aapt resource value: 0x7f0200a2
public const int menu_profile = 2130837666; public const int menu_filter = 2130837666;
// aapt resource value: 0x7f0200a3 // aapt resource value: 0x7f0200a3
public const int mr_dialog_material_background_dark = 2130837667; public const int menu_profile = 2130837667;
// aapt resource value: 0x7f0200a4 // aapt resource value: 0x7f0200a4
public const int mr_dialog_material_background_light = 2130837668; public const int mr_dialog_material_background_dark = 2130837668;
// aapt resource value: 0x7f0200a5 // aapt resource value: 0x7f0200a5
public const int mr_ic_audiotrack_light = 2130837669; public const int mr_dialog_material_background_light = 2130837669;
// aapt resource value: 0x7f0200a6 // aapt resource value: 0x7f0200a6
public const int mr_ic_cast_dark = 2130837670; public const int mr_ic_audiotrack_light = 2130837670;
// aapt resource value: 0x7f0200a7 // aapt resource value: 0x7f0200a7
public const int mr_ic_cast_light = 2130837671; public const int mr_ic_cast_dark = 2130837671;
// aapt resource value: 0x7f0200a8 // aapt resource value: 0x7f0200a8
public const int mr_ic_close_dark = 2130837672; public const int mr_ic_cast_light = 2130837672;
// aapt resource value: 0x7f0200a9 // aapt resource value: 0x7f0200a9
public const int mr_ic_close_light = 2130837673; public const int mr_ic_close_dark = 2130837673;
// aapt resource value: 0x7f0200aa // aapt resource value: 0x7f0200aa
public const int mr_ic_media_route_connecting_mono_dark = 2130837674; public const int mr_ic_close_light = 2130837674;
// aapt resource value: 0x7f0200ab // aapt resource value: 0x7f0200ab
public const int mr_ic_media_route_connecting_mono_light = 2130837675; public const int mr_ic_media_route_connecting_mono_dark = 2130837675;
// aapt resource value: 0x7f0200ac // aapt resource value: 0x7f0200ac
public const int mr_ic_media_route_mono_dark = 2130837676; public const int mr_ic_media_route_connecting_mono_light = 2130837676;
// aapt resource value: 0x7f0200ad // aapt resource value: 0x7f0200ad
public const int mr_ic_media_route_mono_light = 2130837677; public const int mr_ic_media_route_mono_dark = 2130837677;
// aapt resource value: 0x7f0200ae // aapt resource value: 0x7f0200ae
public const int mr_ic_pause_dark = 2130837678; public const int mr_ic_media_route_mono_light = 2130837678;
// aapt resource value: 0x7f0200af // aapt resource value: 0x7f0200af
public const int mr_ic_pause_light = 2130837679; public const int mr_ic_pause_dark = 2130837679;
// aapt resource value: 0x7f0200b0 // aapt resource value: 0x7f0200b0
public const int mr_ic_play_dark = 2130837680; public const int mr_ic_pause_light = 2130837680;
// aapt resource value: 0x7f0200b1 // aapt resource value: 0x7f0200b1
public const int mr_ic_play_light = 2130837681; public const int mr_ic_play_dark = 2130837681;
// aapt resource value: 0x7f0200b2 // aapt resource value: 0x7f0200b2
public const int noimage = 2130837682; public const int mr_ic_play_light = 2130837682;
// aapt resource value: 0x7f0200b9
public const int notification_template_icon_bg = 2130837689;
// aapt resource value: 0x7f0200b3 // aapt resource value: 0x7f0200b3
public const int product_add = 2130837683; public const int noimage = 2130837683;
// aapt resource value: 0x7f0200ba
public const int notification_template_icon_bg = 2130837690;
// aapt resource value: 0x7f0200b4 // aapt resource value: 0x7f0200b4
public const int roundedbg = 2130837684; public const int product_add = 2130837684;
// aapt resource value: 0x7f0200b5 // aapt resource value: 0x7f0200b5
public const int roundedbgdark = 2130837685; public const int roundedbg = 2130837685;
// aapt resource value: 0x7f0200b6 // aapt resource value: 0x7f0200b6
public const int splash_drawable = 2130837686; public const int roundedbgdark = 2130837686;
// aapt resource value: 0x7f0200b7 // aapt resource value: 0x7f0200b7
public const int switch_off = 2130837687; public const int splash_drawable = 2130837687;
// aapt resource value: 0x7f0200b8 // aapt resource value: 0x7f0200b8
public const int switch_on = 2130837688; public const int switch_off = 2130837688;
// aapt resource value: 0x7f0200b9
public const int switch_on = 2130837689;
static Drawable() static Drawable()
{ {