Skip to content

Commit 3ebaf68

Browse files
ramon-tomas-cramon-tomas-c
committed
2 parents 274ddc2 + 2e463f4 commit 3ebaf68

25 files changed

Lines changed: 209 additions & 181 deletions

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
namespace eShopOnContainers.Core.Services.Marketing
2-
{
3-
using System;
4-
using System.Collections.ObjectModel;
5-
using System.Threading.Tasks;
6-
using Models.Marketing;
7-
using Xamarin.Forms;
8-
using System.Linq;
1+
using System;
2+
using System.Collections.ObjectModel;
3+
using System.Threading.Tasks;
4+
using System.Linq;
5+
using Xamarin.Forms;
6+
using eShopOnContainers.Core.Models.Marketing;
97

8+
namespace eShopOnContainers.Core.Services.Marketing
9+
{
1010
public class CampaignMockService : ICampaignService
1111
{
1212
private readonly ObservableCollection<CampaignItem> _mockCampaign = new ObservableCollection<CampaignItem>
@@ -39,14 +39,12 @@ public class CampaignMockService : ICampaignService
3939
public async Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string token)
4040
{
4141
await Task.Delay(500);
42-
4342
return _mockCampaign;
4443
}
4544

4645
public async Task<CampaignItem> GetCampaignByIdAsync(int campaignId, string token)
4746
{
4847
await Task.Delay(500);
49-
5048
return _mockCampaign.SingleOrDefault(c => c.Id == campaignId);
5149
}
5250
}

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
namespace eShopOnContainers.Core.Services.Marketing
1+
using System;
2+
using System.Collections.ObjectModel;
3+
using System.Threading.Tasks;
4+
using eShopOnContainers.Core.Models.Marketing;
5+
using eShopOnContainers.Core.Services.RequestProvider;
6+
using eShopOnContainers.Core.Extensions;
7+
using eShopOnContainers.Core.Helpers;
8+
9+
namespace eShopOnContainers.Core.Services.Marketing
210
{
3-
using System;
4-
using System.Collections.ObjectModel;
5-
using System.Threading.Tasks;
6-
using Models.Marketing;
7-
using RequestProvider;
8-
using Extensions;
9-
using Helpers;
10-
1111
public class CampaignService : ICampaignService
1212
{
1313
private readonly IRequestProvider _requestProvider;

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
namespace eShopOnContainers.Core.Services.Marketing
2-
{
3-
using System.Collections.ObjectModel;
4-
using System.Threading.Tasks;
5-
using Models.Marketing;
1+
using System.Collections.ObjectModel;
2+
using System.Threading.Tasks;
3+
using eShopOnContainers.Core.Models.Marketing;
64

5+
namespace eShopOnContainers.Core.Services.Marketing
6+
{
77
public interface ICampaignService
88
{
99
Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string token);
10-
1110
Task<CampaignItem> GetCampaignByIdAsync(int id, string token);
1211
}
1312
}

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
namespace eShopOnContainers.Core.ViewModels
1+
using System.Threading.Tasks;
2+
using System.Windows.Input;
3+
using Xamarin.Forms;
4+
using eShopOnContainers.Core.ViewModels.Base;
5+
using eShopOnContainers.Core.Helpers;
6+
using eShopOnContainers.Core.Models.Marketing;
7+
using eShopOnContainers.Core.Services.Marketing;
8+
9+
namespace eShopOnContainers.Core.ViewModels
210
{
3-
using System.Threading.Tasks;
4-
using Helpers;
5-
using Models.Marketing;
6-
using Services.Marketing;
7-
using Base;
8-
using System.Windows.Input;
9-
using Xamarin.Forms;
10-
1111
public class CampaignDetailsViewModel : ViewModelBase
1212
{
1313
private CampaignItem _campaign;
@@ -46,9 +46,9 @@ public override async Task InitializeAsync(object navigationData)
4646
IsBusy = true;
4747

4848
// Get campaign by id
49-
Campaign = await _campaignService.GetCampaignByIdAsync((int) navigationData, Settings.AuthAccessToken);
49+
Campaign = await _campaignService.GetCampaignByIdAsync((int)navigationData, Settings.AuthAccessToken);
5050

51-
IsBusy = false;
51+
IsBusy = false;
5252
}
5353
}
5454

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
namespace eShopOnContainers.Core.ViewModels
1+
using System.Threading.Tasks;
2+
using System.Windows.Input;
3+
using Xamarin.Forms;
4+
using System.Collections.ObjectModel;
5+
using eShopOnContainers.Core.Models.Marketing;
6+
using eShopOnContainers.Core.Services.Marketing;
7+
using eShopOnContainers.Core.ViewModels.Base;
8+
using eShopOnContainers.Core.Helpers;
9+
10+
namespace eShopOnContainers.Core.ViewModels
211
{
3-
using System.Threading.Tasks;
4-
using System.Windows.Input;
5-
using Xamarin.Forms;
6-
using System.Collections.ObjectModel;
7-
using Models.Marketing;
8-
using Services.Marketing;
9-
using Base;
10-
using Helpers;
11-
1212
public class CampaignViewModel : ViewModelBase
1313
{
1414
private ObservableCollection<CampaignItem> _campaigns;
@@ -29,7 +29,7 @@ public ObservableCollection<CampaignItem> Campaigns
2929
}
3030
}
3131

32-
public ICommand GetCampaignDetailsCommand => new Command<CampaignItem>(async (item) => await GetCampaignDetails(item));
32+
public ICommand GetCampaignDetailsCommand => new Command<CampaignItem>(async (item) => await GetCampaignDetailsAsync(item));
3333

3434
public override async Task InitializeAsync(object navigationData)
3535
{
@@ -41,7 +41,7 @@ public override async Task InitializeAsync(object navigationData)
4141
IsBusy = false;
4242
}
4343

44-
private async Task GetCampaignDetails(CampaignItem campaign)
44+
private async Task GetCampaignDetailsAsync(CampaignItem campaign)
4545
{
4646
await NavigationService.NavigateToAsync<CampaignDetailsViewModel>(campaign.Id);
4747
}

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignDetailsView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
Style="{StaticResource CampaignAvailabilityDescriptionStyle}"/>
151151
</Grid>
152152

153-
<AbsoluteLayout
153+
<AbsoluteLayout
154154
Grid.Column="0"
155155
Grid.Row="0"
156156
Grid.RowSpan="3"

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignView.xaml.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
namespace eShopOnContainers.Core.Views
2-
{
3-
using Xamarin.Forms;
1+
using Xamarin.Forms;
42

5-
public partial class CampaignView: ContentPage
3+
namespace eShopOnContainers.Core.Views
4+
{
5+
public partial class CampaignView : ContentPage
66
{
77

88
public CampaignView()

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969
<views:CampaignView.Icon>
7070
<OnPlatform
7171
x:TypeArguments="FileImageSource"
72-
Android="menu_filter"
73-
iOS="menu_filter"
74-
WinPhone="Assets\menu_filter.png"/>
72+
Android="menu_campaigns"
73+
iOS="menu_campaigns"
74+
WinPhone="Assets\menu_campaigns.png"/>
7575
</views:CampaignView.Icon>
7676
</views:CampaignView>
7777
</TabbedPage>

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj‎

Lines changed: 87 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
<Compile Include="Animations\StoryBoard.cs" />
3737
<Compile Include="Animations\Base\AnimationBase.cs" />
3838
<Compile Include="Animations\Base\EasingType.cs" />
39-
<Compile Include="Controls\AddBasketButton.xaml.cs" />
39+
<Compile Include="Controls\AddBasketButton.xaml.cs">
40+
<DependentUpon>AddBasketButton.xaml</DependentUpon>
41+
</Compile>
4042
<Compile Include="Controls\CustomTabbedPage.cs" />
4143
<Compile Include="Controls\ToggleButton.cs" />
4244
<Compile Include="Behaviors\EventToCommandBehavior.cs" />
@@ -59,23 +61,57 @@
5961
<Compile Include="Helpers\RandomNumberGenerator.cs" />
6062
<Compile Include="Helpers\ServicesHelper.cs" />
6163
<Compile Include="Helpers\Settings.cs" />
62-
<Compile Include="Views\Templates\BasketItemTemplate.xaml.cs" />
63-
<Compile Include="Views\Templates\CampaignTemplate.xaml.cs" />
64-
<Compile Include="Views\Templates\OrderItemTemplate.xaml.cs" />
65-
<Compile Include="Views\Templates\OrderTemplate.xaml.cs" />
66-
<Compile Include="Views\Templates\ProductTemplate.xaml.cs" />
67-
<Compile Include="Views\BasketView.xaml.cs" />
68-
<Compile Include="Views\CampaignDetailsView.xaml.cs" />
69-
<Compile Include="Views\CampaignView.xaml.cs" />
70-
<Compile Include="Views\CatalogView.xaml.cs" />
71-
<Compile Include="Views\CheckoutView.xaml.cs" />
72-
<Compile Include="Views\CustomNavigationView.xaml.cs" />
73-
<Compile Include="Views\FiltersView.xaml.cs" />
74-
<Compile Include="Views\LoginView.xaml.cs" />
75-
<Compile Include="Views\MainView.xaml.cs" />
76-
<Compile Include="Views\OrderDetailView.xaml.cs" />
77-
<Compile Include="Views\ProfileView.xaml.cs" />
78-
<Compile Include="Views\SettingsView.xaml.cs" />
64+
<Compile Include="Views\Templates\BasketItemTemplate.xaml.cs">
65+
<DependentUpon>BasketItemTemplate.xaml</DependentUpon>
66+
</Compile>
67+
<Compile Include="Views\Templates\CampaignTemplate.xaml.cs">
68+
<DependentUpon>CampaignTemplate.xaml</DependentUpon>
69+
</Compile>
70+
<Compile Include="Views\Templates\OrderItemTemplate.xaml.cs">
71+
<DependentUpon>OrderItemTemplate.xaml</DependentUpon>
72+
</Compile>
73+
<Compile Include="Views\Templates\OrderTemplate.xaml.cs">
74+
<DependentUpon>OrderTemplate.xaml</DependentUpon>
75+
</Compile>
76+
<Compile Include="Views\Templates\ProductTemplate.xaml.cs">
77+
<DependentUpon>ProductTemplate.xaml</DependentUpon>
78+
</Compile>
79+
<Compile Include="Views\BasketView.xaml.cs">
80+
<DependentUpon>BasketView.xaml</DependentUpon>
81+
</Compile>
82+
<Compile Include="Views\CampaignDetailsView.xaml.cs">
83+
<DependentUpon>CampaignDetailsView.xaml</DependentUpon>
84+
</Compile>
85+
<Compile Include="Views\CampaignView.xaml.cs">
86+
<DependentUpon>CampaignView.xaml</DependentUpon>
87+
</Compile>
88+
<Compile Include="Views\CatalogView.xaml.cs">
89+
<DependentUpon>CatalogView.xaml</DependentUpon>
90+
</Compile>
91+
<Compile Include="Views\CheckoutView.xaml.cs">
92+
<DependentUpon>CheckoutView.xaml</DependentUpon>
93+
</Compile>
94+
<Compile Include="Views\CustomNavigationView.xaml.cs">
95+
<DependentUpon>CustomNavigationView.xaml</DependentUpon>
96+
</Compile>
97+
<Compile Include="Views\FiltersView.xaml.cs">
98+
<DependentUpon>FiltersView.xaml</DependentUpon>
99+
</Compile>
100+
<Compile Include="Views\LoginView.xaml.cs">
101+
<DependentUpon>LoginView.xaml</DependentUpon>
102+
</Compile>
103+
<Compile Include="Views\MainView.xaml.cs">
104+
<DependentUpon>MainView.xaml</DependentUpon>
105+
</Compile>
106+
<Compile Include="Views\OrderDetailView.xaml.cs">
107+
<DependentUpon>OrderDetailView.xaml</DependentUpon>
108+
</Compile>
109+
<Compile Include="Views\ProfileView.xaml.cs">
110+
<DependentUpon>ProfileView.xaml</DependentUpon>
111+
</Compile>
112+
<Compile Include="Views\SettingsView.xaml.cs">
113+
<DependentUpon>SettingsView.xaml</DependentUpon>
114+
</Compile>
79115
<Compile Include="Extensions\ObservableExtension.cs" />
80116
<Compile Include="Exceptions\ServiceAuthenticationException.cs" />
81117
<Compile Include="Models\Basket\BasketCheckout.cs" />
@@ -162,57 +198,75 @@
162198
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
163199
</EmbeddedResource>
164200
<EmbeddedResource Include="Controls\AddBasketButton.xaml">
165-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
201+
<SubType>Designer</SubType>
202+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
166203
</EmbeddedResource>
167204
<EmbeddedResource Include="Views\Templates\BasketItemTemplate.xaml">
168-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
205+
<SubType>Designer</SubType>
206+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
169207
</EmbeddedResource>
170208
<EmbeddedResource Include="Views\Templates\CampaignTemplate.xaml">
171-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
209+
<SubType>Designer</SubType>
210+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
172211
</EmbeddedResource>
173212
<EmbeddedResource Include="Views\Templates\OrderItemTemplate.xaml">
174-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
213+
<SubType>Designer</SubType>
214+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
175215
</EmbeddedResource>
176216
<EmbeddedResource Include="Views\Templates\OrderTemplate.xaml">
177-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
217+
<SubType>Designer</SubType>
218+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
178219
</EmbeddedResource>
179220
<EmbeddedResource Include="Views\Templates\ProductTemplate.xaml">
180-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
221+
<SubType>Designer</SubType>
222+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
181223
</EmbeddedResource>
182224
<EmbeddedResource Include="Views\BasketView.xaml">
183-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
225+
<SubType>Designer</SubType>
226+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
184227
</EmbeddedResource>
185228
<EmbeddedResource Include="Views\CampaignDetailsView.xaml">
186-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
229+
<SubType>Designer</SubType>
230+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
187231
</EmbeddedResource>
188232
<EmbeddedResource Include="Views\CampaignView.xaml">
189-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
233+
<SubType>Designer</SubType>
234+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
190235
</EmbeddedResource>
191236
<EmbeddedResource Include="Views\CatalogView.xaml">
192-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
237+
<SubType>Designer</SubType>
238+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
193239
</EmbeddedResource>
194240
<EmbeddedResource Include="Views\SettingsView.xaml">
195-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
241+
<SubType>Designer</SubType>
242+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
196243
</EmbeddedResource>
197244
<EmbeddedResource Include="Views\ProfileView.xaml">
198-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
245+
<SubType>Designer</SubType>
246+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
199247
</EmbeddedResource>
200248
<EmbeddedResource Include="Views\OrderDetailView.xaml">
201-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
249+
<SubType>Designer</SubType>
250+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
202251
</EmbeddedResource>
203252
<EmbeddedResource Include="Views\MainView.xaml">
204-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
253+
<SubType>Designer</SubType>
254+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
205255
</EmbeddedResource>
206256
<EmbeddedResource Include="Views\LoginView.xaml">
207-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
257+
<SubType>Designer</SubType>
258+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
208259
</EmbeddedResource>
209260
<EmbeddedResource Include="Views\FiltersView.xaml">
261+
<SubType>Designer</SubType>
210262
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
211263
</EmbeddedResource>
212264
<EmbeddedResource Include="Views\CustomNavigationView.xaml">
265+
<SubType>Designer</SubType>
213266
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
214267
</EmbeddedResource>
215268
<EmbeddedResource Include="Views\CheckoutView.xaml">
269+
<SubType>Designer</SubType>
216270
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
217271
</EmbeddedResource>
218272
</ItemGroup>

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ namespace eShopOnContainers.Droid.Activities
1717
Label = "eShopOnContainers",
1818
Icon = "@drawable/icon",
1919
Theme = "@style/MainTheme",
20-
MainLauncher = true,
2120
ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
2221
public class MainActivity : FormsAppCompatActivity
2322
{

0 commit comments

Comments
 (0)