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

Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev

Browse Source
This commit is contained in:
Ramón Tomás 2017-10-02 14:40:49 +02:00
commit 3ebaf68ab9
25 changed files with 209 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs
View File

@ -1,12 +1,12 @@
namespace eShopOnContainers.Core.Services.Marketing using System;
{ using System.Collections.ObjectModel;
using System; using System.Threading.Tasks;
using System.Collections.ObjectModel; using System.Linq;
using System.Threading.Tasks; using Xamarin.Forms;
using Models.Marketing; using eShopOnContainers.Core.Models.Marketing;
using Xamarin.Forms;
using System.Linq;
namespace eShopOnContainers.Core.Services.Marketing
{
public class CampaignMockService : ICampaignService public class CampaignMockService : ICampaignService
{ {
private readonly ObservableCollection<CampaignItem> _mockCampaign = new ObservableCollection<CampaignItem> private readonly ObservableCollection<CampaignItem> _mockCampaign = new ObservableCollection<CampaignItem>
@ -39,14 +39,12 @@
public async Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string token) public async Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string token)
{ {
await Task.Delay(500); await Task.Delay(500);
return _mockCampaign; return _mockCampaign;
} }
public async Task<CampaignItem> GetCampaignByIdAsync(int campaignId, string token) public async Task<CampaignItem> GetCampaignByIdAsync(int campaignId, string token)
{ {
await Task.Delay(500); await Task.Delay(500);
return _mockCampaign.SingleOrDefault(c => c.Id == campaignId); return _mockCampaign.SingleOrDefault(c => c.Id == campaignId);
} }
} }

18
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs
View File

@ -1,13 +1,13 @@
namespace eShopOnContainers.Core.Services.Marketing using System;
{ using System.Collections.ObjectModel;
using System; using System.Threading.Tasks;
using System.Collections.ObjectModel; using eShopOnContainers.Core.Models.Marketing;
using System.Threading.Tasks; using eShopOnContainers.Core.Services.RequestProvider;
using Models.Marketing; using eShopOnContainers.Core.Extensions;
using RequestProvider; using eShopOnContainers.Core.Helpers;
using Extensions;
using Helpers;
namespace eShopOnContainers.Core.Services.Marketing
{
public class CampaignService : ICampaignService public class CampaignService : ICampaignService
{ {
private readonly IRequestProvider _requestProvider; private readonly IRequestProvider _requestProvider;

11
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs
View File

@ -1,13 +1,12 @@
namespace eShopOnContainers.Core.Services.Marketing using System.Collections.ObjectModel;
{ using System.Threading.Tasks;
using System.Collections.ObjectModel; using eShopOnContainers.Core.Models.Marketing;
using System.Threading.Tasks;
using Models.Marketing;
namespace eShopOnContainers.Core.Services.Marketing
{
public interface ICampaignService public interface ICampaignService
{ {
Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string token); Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string token);
Task<CampaignItem> GetCampaignByIdAsync(int id, string token); Task<CampaignItem> GetCampaignByIdAsync(int id, string token);
} }
} }

22
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs
View File

@ -1,13 +1,13 @@
namespace eShopOnContainers.Core.ViewModels using System.Threading.Tasks;
{ using System.Windows.Input;
using System.Threading.Tasks; using Xamarin.Forms;
using Helpers; using eShopOnContainers.Core.ViewModels.Base;
using Models.Marketing; using eShopOnContainers.Core.Helpers;
using Services.Marketing; using eShopOnContainers.Core.Models.Marketing;
using Base; using eShopOnContainers.Core.Services.Marketing;
using System.Windows.Input;
using Xamarin.Forms;
namespace eShopOnContainers.Core.ViewModels
{
public class CampaignDetailsViewModel : ViewModelBase public class CampaignDetailsViewModel : ViewModelBase
{ {
private CampaignItem _campaign; private CampaignItem _campaign;
@ -46,9 +46,9 @@
IsBusy = true; IsBusy = true;
// Get campaign by id // Get campaign by id
Campaign = await _campaignService.GetCampaignByIdAsync((int) navigationData, Settings.AuthAccessToken); Campaign = await _campaignService.GetCampaignByIdAsync((int)navigationData, Settings.AuthAccessToken);
IsBusy = false; IsBusy = false;
} }
} }

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

@ -1,14 +1,14 @@
namespace eShopOnContainers.Core.ViewModels using System.Threading.Tasks;
{ using System.Windows.Input;
using System.Threading.Tasks; using Xamarin.Forms;
using System.Windows.Input; using System.Collections.ObjectModel;
using Xamarin.Forms; using eShopOnContainers.Core.Models.Marketing;
using System.Collections.ObjectModel; using eShopOnContainers.Core.Services.Marketing;
using Models.Marketing; using eShopOnContainers.Core.ViewModels.Base;
using Services.Marketing; using eShopOnContainers.Core.Helpers;
using Base;
using Helpers;
namespace eShopOnContainers.Core.ViewModels
{
public class CampaignViewModel : ViewModelBase public class CampaignViewModel : ViewModelBase
{ {
private ObservableCollection<CampaignItem> _campaigns; private ObservableCollection<CampaignItem> _campaigns;
@ -29,7 +29,7 @@
} }
} }
public ICommand GetCampaignDetailsCommand => new Command<CampaignItem>(async (item) => await GetCampaignDetails(item)); public ICommand GetCampaignDetailsCommand => new Command<CampaignItem>(async (item) => await GetCampaignDetailsAsync(item));
public override async Task InitializeAsync(object navigationData) public override async Task InitializeAsync(object navigationData)
{ {
@ -41,7 +41,7 @@
IsBusy = false; IsBusy = false;
} }
private async Task GetCampaignDetails(CampaignItem campaign) private async Task GetCampaignDetailsAsync(CampaignItem campaign)
{ {
await NavigationService.NavigateToAsync<CampaignDetailsViewModel>(campaign.Id); await NavigationService.NavigateToAsync<CampaignDetailsViewModel>(campaign.Id);
} }

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

@ -150,7 +150,7 @@
Style="{StaticResource CampaignAvailabilityDescriptionStyle}"/> Style="{StaticResource CampaignAvailabilityDescriptionStyle}"/>
</Grid> </Grid>
<AbsoluteLayout <AbsoluteLayout
Grid.Column="0" Grid.Column="0"
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="3" Grid.RowSpan="3"

8
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignView.xaml.cs
View File

@ -1,8 +1,8 @@
namespace eShopOnContainers.Core.Views using Xamarin.Forms;
{
using Xamarin.Forms;
public partial class CampaignView: ContentPage namespace eShopOnContainers.Core.Views
{
public partial class CampaignView : ContentPage
{ {
public CampaignView() public CampaignView()

6
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml
View File

@ -69,9 +69,9 @@
<views:CampaignView.Icon> <views:CampaignView.Icon>
<OnPlatform <OnPlatform
x:TypeArguments="FileImageSource" x:TypeArguments="FileImageSource"
Android="menu_filter" Android="menu_campaigns"
iOS="menu_filter" iOS="menu_campaigns"
WinPhone="Assets\menu_filter.png"/> WinPhone="Assets\menu_campaigns.png"/>
</views:CampaignView.Icon> </views:CampaignView.Icon>
</views:CampaignView> </views:CampaignView>
</TabbedPage> </TabbedPage>

120
src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
View File

@ -36,7 +36,9 @@
<Compile Include="Animations\StoryBoard.cs" /> <Compile Include="Animations\StoryBoard.cs" />
<Compile Include="Animations\Base\AnimationBase.cs" /> <Compile Include="Animations\Base\AnimationBase.cs" />
<Compile Include="Animations\Base\EasingType.cs" /> <Compile Include="Animations\Base\EasingType.cs" />
<Compile Include="Controls\AddBasketButton.xaml.cs" /> <Compile Include="Controls\AddBasketButton.xaml.cs">
<DependentUpon>AddBasketButton.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\CustomTabbedPage.cs" /> <Compile Include="Controls\CustomTabbedPage.cs" />
<Compile Include="Controls\ToggleButton.cs" /> <Compile Include="Controls\ToggleButton.cs" />
<Compile Include="Behaviors\EventToCommandBehavior.cs" /> <Compile Include="Behaviors\EventToCommandBehavior.cs" />
@ -59,23 +61,57 @@
<Compile Include="Helpers\RandomNumberGenerator.cs" /> <Compile Include="Helpers\RandomNumberGenerator.cs" />
<Compile Include="Helpers\ServicesHelper.cs" /> <Compile Include="Helpers\ServicesHelper.cs" />
<Compile Include="Helpers\Settings.cs" /> <Compile Include="Helpers\Settings.cs" />
<Compile Include="Views\Templates\BasketItemTemplate.xaml.cs" /> <Compile Include="Views\Templates\BasketItemTemplate.xaml.cs">
<Compile Include="Views\Templates\CampaignTemplate.xaml.cs" /> <DependentUpon>BasketItemTemplate.xaml</DependentUpon>
<Compile Include="Views\Templates\OrderItemTemplate.xaml.cs" /> </Compile>
<Compile Include="Views\Templates\OrderTemplate.xaml.cs" /> <Compile Include="Views\Templates\CampaignTemplate.xaml.cs">
<Compile Include="Views\Templates\ProductTemplate.xaml.cs" /> <DependentUpon>CampaignTemplate.xaml</DependentUpon>
<Compile Include="Views\BasketView.xaml.cs" /> </Compile>
<Compile Include="Views\CampaignDetailsView.xaml.cs" /> <Compile Include="Views\Templates\OrderItemTemplate.xaml.cs">
<Compile Include="Views\CampaignView.xaml.cs" /> <DependentUpon>OrderItemTemplate.xaml</DependentUpon>
<Compile Include="Views\CatalogView.xaml.cs" /> </Compile>
<Compile Include="Views\CheckoutView.xaml.cs" /> <Compile Include="Views\Templates\OrderTemplate.xaml.cs">
<Compile Include="Views\CustomNavigationView.xaml.cs" /> <DependentUpon>OrderTemplate.xaml</DependentUpon>
<Compile Include="Views\FiltersView.xaml.cs" /> </Compile>
<Compile Include="Views\LoginView.xaml.cs" /> <Compile Include="Views\Templates\ProductTemplate.xaml.cs">
<Compile Include="Views\MainView.xaml.cs" /> <DependentUpon>ProductTemplate.xaml</DependentUpon>
<Compile Include="Views\OrderDetailView.xaml.cs" /> </Compile>
<Compile Include="Views\ProfileView.xaml.cs" /> <Compile Include="Views\BasketView.xaml.cs">
<Compile Include="Views\SettingsView.xaml.cs" /> <DependentUpon>BasketView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\CampaignDetailsView.xaml.cs">
<DependentUpon>CampaignDetailsView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\CampaignView.xaml.cs">
<DependentUpon>CampaignView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\CatalogView.xaml.cs">
<DependentUpon>CatalogView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\CheckoutView.xaml.cs">
<DependentUpon>CheckoutView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\CustomNavigationView.xaml.cs">
<DependentUpon>CustomNavigationView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\FiltersView.xaml.cs">
<DependentUpon>FiltersView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\LoginView.xaml.cs">
<DependentUpon>LoginView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\MainView.xaml.cs">
<DependentUpon>MainView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\OrderDetailView.xaml.cs">
<DependentUpon>OrderDetailView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ProfileView.xaml.cs">
<DependentUpon>ProfileView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\SettingsView.xaml.cs">
<DependentUpon>SettingsView.xaml</DependentUpon>
</Compile>
<Compile Include="Extensions\ObservableExtension.cs" /> <Compile Include="Extensions\ObservableExtension.cs" />
<Compile Include="Exceptions\ServiceAuthenticationException.cs" /> <Compile Include="Exceptions\ServiceAuthenticationException.cs" />
<Compile Include="Models\Basket\BasketCheckout.cs" /> <Compile Include="Models\Basket\BasketCheckout.cs" />
@ -162,57 +198,75 @@
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Controls\AddBasketButton.xaml"> <EmbeddedResource Include="Controls\AddBasketButton.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\Templates\BasketItemTemplate.xaml"> <EmbeddedResource Include="Views\Templates\BasketItemTemplate.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\Templates\CampaignTemplate.xaml"> <EmbeddedResource Include="Views\Templates\CampaignTemplate.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\Templates\OrderItemTemplate.xaml"> <EmbeddedResource Include="Views\Templates\OrderItemTemplate.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\Templates\OrderTemplate.xaml"> <EmbeddedResource Include="Views\Templates\OrderTemplate.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\Templates\ProductTemplate.xaml"> <EmbeddedResource Include="Views\Templates\ProductTemplate.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\BasketView.xaml"> <EmbeddedResource Include="Views\BasketView.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\CampaignDetailsView.xaml"> <EmbeddedResource Include="Views\CampaignDetailsView.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\CampaignView.xaml"> <EmbeddedResource Include="Views\CampaignView.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\CatalogView.xaml"> <EmbeddedResource Include="Views\CatalogView.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\SettingsView.xaml"> <EmbeddedResource Include="Views\SettingsView.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\ProfileView.xaml"> <EmbeddedResource Include="Views\ProfileView.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\OrderDetailView.xaml"> <EmbeddedResource Include="Views\OrderDetailView.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\MainView.xaml"> <EmbeddedResource Include="Views\MainView.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\LoginView.xaml"> <EmbeddedResource Include="Views\LoginView.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\FiltersView.xaml"> <EmbeddedResource Include="Views\FiltersView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\CustomNavigationView.xaml"> <EmbeddedResource Include="Views\CustomNavigationView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Views\CheckoutView.xaml"> <EmbeddedResource Include="Views\CheckoutView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>

1
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs
View File

@ -17,7 +17,6 @@ namespace eShopOnContainers.Droid.Activities
Label = "eShopOnContainers", Label = "eShopOnContainers",
Icon = "@drawable/icon", Icon = "@drawable/icon",
Theme = "@style/MainTheme", Theme = "@style/MainTheme",
MainLauncher = true,
ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)] ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
public class MainActivity : FormsAppCompatActivity public class MainActivity : FormsAppCompatActivity
{ {

4
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/SplashActivity.cs
View File

@ -11,6 +11,7 @@ namespace eShopOnContainers.Droid.Activities
Icon = "@drawable/icon", Icon = "@drawable/icon",
Theme = "@style/Theme.Splash", Theme = "@style/Theme.Splash",
NoHistory = true, NoHistory = true,
MainLauncher = true,
ScreenOrientation = ScreenOrientation.Portrait)] ScreenOrientation = ScreenOrientation.Portrait)]
public class SplashActivity : AppCompatActivity public class SplashActivity : AppCompatActivity
{ {
@ -23,8 +24,7 @@ namespace eShopOnContainers.Droid.Activities
private void InvokeMainActivity() private void InvokeMainActivity()
{ {
var mainActivityIntent = new Intent(this, typeof(MainActivity)); StartActivity(new Intent(this, typeof(MainActivity)));
StartActivity(mainActivityIntent);
} }
} }
} }

5
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/MainApplication.cs
View File

@ -1,5 +1,4 @@
using System; using System;
using Android.App; using Android.App;
using Android.OS; using Android.OS;
using Android.Runtime; using Android.Runtime;
@ -7,12 +6,11 @@ using Plugin.CurrentActivity;
namespace eShopOnContainers.Droid namespace eShopOnContainers.Droid
{ {
//You can specify additional application information in this attribute
[Application] [Application]
public class MainApplication : Application, Application.IActivityLifecycleCallbacks public class MainApplication : Application, Application.IActivityLifecycleCallbacks
{ {
public MainApplication(IntPtr handle, JniHandleOwnership transer) public MainApplication(IntPtr handle, JniHandleOwnership transer)
:base(handle, transer) : base(handle, transer)
{ {
} }
@ -20,7 +18,6 @@ namespace eShopOnContainers.Droid
{ {
base.OnCreate(); base.OnCreate();
RegisterActivityLifecycleCallbacks(this); RegisterActivityLifecycleCallbacks(this);
//A great place to initialize Xamarin.Insights and Dependency Services!
} }
public override void OnTerminate() public override void OnTerminate()

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

@ -2281,76 +2281,76 @@ namespace eShopOnContainers.Droid
public const int icon = 2130837664; public const int icon = 2130837664;
// aapt resource value: 0x7f0200a1 // aapt resource value: 0x7f0200a1
public const int menu_cart = 2130837665; public const int menu_campaigns = 2130837665;
// aapt resource value: 0x7f0200a2 // aapt resource value: 0x7f0200a2
public const int menu_filter = 2130837666; public const int menu_cart = 2130837666;
// aapt resource value: 0x7f0200a3 // aapt resource value: 0x7f0200a3
public const int menu_profile = 2130837667; public const int menu_filter = 2130837667;
// aapt resource value: 0x7f0200a4 // aapt resource value: 0x7f0200a4
public const int mr_dialog_material_background_dark = 2130837668; public const int menu_profile = 2130837668;
// aapt resource value: 0x7f0200a5 // 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 // 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 // aapt resource value: 0x7f0200a7
public const int mr_ic_cast_dark = 2130837671; public const int mr_ic_audiotrack_light = 2130837671;
// aapt resource value: 0x7f0200a8 // aapt resource value: 0x7f0200a8
public const int mr_ic_cast_light = 2130837672; public const int mr_ic_cast_dark = 2130837672;
// aapt resource value: 0x7f0200a9 // aapt resource value: 0x7f0200a9
public const int mr_ic_close_dark = 2130837673; public const int mr_ic_cast_light = 2130837673;
// aapt resource value: 0x7f0200aa // aapt resource value: 0x7f0200aa
public const int mr_ic_close_light = 2130837674; public const int mr_ic_close_dark = 2130837674;
// aapt resource value: 0x7f0200ab // 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 // 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 // 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 // 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 // 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 // aapt resource value: 0x7f0200b0
public const int mr_ic_pause_light = 2130837680; public const int mr_ic_pause_dark = 2130837680;
// aapt resource value: 0x7f0200b1 // aapt resource value: 0x7f0200b1
public const int mr_ic_play_dark = 2130837681; public const int mr_ic_pause_light = 2130837681;
// aapt resource value: 0x7f0200b2 // aapt resource value: 0x7f0200b2
public const int mr_ic_play_light = 2130837682; public const int mr_ic_play_dark = 2130837682;
// aapt resource value: 0x7f0200b3 // aapt resource value: 0x7f0200b3
public const int noimage = 2130837683; public const int mr_ic_play_light = 2130837683;
// aapt resource value: 0x7f0200b4
public const int noimage = 2130837684;
// aapt resource value: 0x7f0200ba // aapt resource value: 0x7f0200ba
public const int notification_template_icon_bg = 2130837690; public const int notification_template_icon_bg = 2130837690;
// aapt resource value: 0x7f0200b4
public const int product_add = 2130837684;
// aapt resource value: 0x7f0200b5 // aapt resource value: 0x7f0200b5
public const int roundedbg = 2130837685; public const int product_add = 2130837685;
// aapt resource value: 0x7f0200b6 // aapt resource value: 0x7f0200b6
public const int roundedbgdark = 2130837686; public const int roundedbg = 2130837686;
// aapt resource value: 0x7f0200b7 // aapt resource value: 0x7f0200b7
public const int splash_drawable = 2130837687; public const int roundedbgdark = 2130837687;
// aapt resource value: 0x7f0200b8 // aapt resource value: 0x7f0200b8
public const int switch_off = 2130837688; public const int switch_off = 2130837688;

BIN
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/menu_campaigns.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/menu_campaigns.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/menu_campaigns.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

11
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable/splash_drawable.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<bitmap
android:gravity="fill"/>
</item>
<item>
<bitmap
android:gravity="center"/>
</item>
</layer-list>

62
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/values/styles.xml
View File

@ -1,38 +1,32 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="MainTheme" parent="MainTheme.Base">
<style name="MainTheme" parent="MainTheme.Base"> </style>
</style> <!-- Base theme applied no matter what API -->
<style name="MainTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Base theme applied no matter what API --> <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
<style name="MainTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar"> <item name="windowNoTitle">true</item>
<!--If you are using revision 22.1 please use just windowNoTitle. Without android:--> <!--We will be using the toolbar so no need to show ActionBar-->
<item name="windowNoTitle">true</item> <item name="windowActionBar">false</item>
<!--We will be using the toolbar so no need to show ActionBar--> <!-- Set theme colors from http://www.google.com/design/spec/style/color.html#color-color-palette -->
<item name="windowActionBar">false</item> <!-- colorPrimary is used for the default action bar background -->
<!-- Set theme colors from http://www.google.com/design/spec/style/color.html#color-color-palette --> <item name="colorPrimary">#00a69c</item>
<!-- colorPrimary is used for the default action bar background --> <!-- colorPrimaryDark is used for the status bar -->
<item name="colorPrimary">#00a69c</item> <item name="colorPrimaryDark">#00857D</item>
<!-- colorPrimaryDark is used for the status bar --> <!-- colorAccent is used as the default value for colorControlActivated
<item name="colorPrimaryDark">#00857D</item>
<!-- colorAccent is used as the default value for colorControlActivated
which is used to tint widgets --> which is used to tint widgets -->
<item name="colorAccent">#00857D</item> <item name="colorAccent">#00857D</item>
<!-- You can also set colorControlNormal, colorControlActivated <!-- You can also set colorControlNormal, colorControlActivated
colorControlHighlight and colorSwitchThumbNormal. --> colorControlHighlight and colorSwitchThumbNormal. -->
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
<item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item> <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
<item name="android:windowBackground">@drawable/background</item> </style>
</style> <style name="Theme.Splash" parent="Theme.AppCompat.Light.NoActionBar">
<item name="windowNoTitle">true</item>
<style name="Theme.Splash" parent="Theme.AppCompat.Light.NoActionBar"> <item name="android:windowFullscreen">true</item>
<item name="windowNoTitle">true</item> <item name="android:windowBackground">@drawable/background</item>
<item name="android:background">@drawable/splash_drawable</item> </style>
<item name="colorPrimaryDark">#00857D</item> <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
</style> <item name="colorAccent">#00857D</item>
</style>
<style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
<item name="colorAccent">#00857D</item>
</style>
</resources> </resources>

22
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
View File

@ -221,7 +221,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Activities\MainActivity.cs" /> <Compile Include="Activities\MainActivity.cs" />
<Compile Include="Activities\SplashActivity.cs" />
<Compile Include="Effects\EntryLineColorEffect.cs" /> <Compile Include="Effects\EntryLineColorEffect.cs" />
<Compile Include="Extensions\ViewExtensions.cs" /> <Compile Include="Extensions\ViewExtensions.cs" />
<Compile Include="Helpers\Settings.cs" /> <Compile Include="Helpers\Settings.cs" />
@ -234,6 +233,7 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Effects\CircleEffect.cs" /> <Compile Include="Effects\CircleEffect.cs" />
<Compile Include="Effects\BaseContainerEffect.cs" /> <Compile Include="Effects\BaseContainerEffect.cs" />
<Compile Include="Activities\SplashActivity.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidAsset Include="..\CommonResources\Fonts\Montserrat-Bold.ttf"> <AndroidAsset Include="..\CommonResources\Fonts\Montserrat-Bold.ttf">
@ -260,6 +260,12 @@
<AndroidResource Include="Resources\layout\TabLayout.axml"> <AndroidResource Include="Resources\layout\TabLayout.axml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</AndroidResource> </AndroidResource>
<AndroidResource Include="Resources\drawable-hdpi\menu_campaigns.png" />
<AndroidResource Include="Resources\drawable-xhdpi\menu_campaigns.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\menu_campaigns.png" />
<AndroidResource Include="Resources\drawable-hdpi\menu_filter.png" />
<AndroidResource Include="Resources\drawable-xhdpi\menu_filter.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\menu_filter.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\drawable\icon.png" /> <AndroidResource Include="Resources\drawable\icon.png" />
@ -273,9 +279,6 @@
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\values\styles.xml" /> <AndroidResource Include="Resources\values\styles.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\splash_drawable.xml" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\drawable\fake_product_01.png" /> <AndroidResource Include="Resources\drawable\fake_product_01.png" />
</ItemGroup> </ItemGroup>
@ -285,15 +288,6 @@
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\drawable\fake_product_02.png" /> <AndroidResource Include="Resources\drawable\fake_product_02.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\menu_filter.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\menu_filter.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\menu_filter.png" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\menu_profile.png" /> <AndroidResource Include="Resources\drawable-hdpi\menu_profile.png" />
</ItemGroup> </ItemGroup>
@ -380,7 +374,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj"> <ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj">
<Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project> <Project>{BA96A12C-4EE3-46C4-BB3F-F811B554CD01}</Project>
<Name>eShopOnContainers.Core</Name> <Name>eShopOnContainers.Core</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>

BIN
src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/menu_campaigns.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

1
src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj
View File

@ -141,6 +141,7 @@
<Content Include="Assets\fake_product_03.png" /> <Content Include="Assets\fake_product_03.png" />
<Content Include="Assets\fake_product_04.png" /> <Content Include="Assets\fake_product_04.png" />
<Content Include="Assets\fake_product_05.png" /> <Content Include="Assets\fake_product_05.png" />
<Content Include="Assets\menu_campaigns.png" />
<Content Include="Assets\menu_cart.png" /> <Content Include="Assets\menu_cart.png" />
<Content Include="Assets\menu_filter.png" /> <Content Include="Assets\menu_filter.png" />
<Content Include="Assets\menu_profile.png" /> <Content Include="Assets\menu_profile.png" />

BIN
src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/menu_campaigns.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/menu_campaigns@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/menu_campaigns@3x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

5
src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj
View File

@ -124,6 +124,9 @@
<ITunesArtwork Include="iTunesArtwork@2x" /> <ITunesArtwork Include="iTunesArtwork@2x" />
<None Include="packages.config" /> <None Include="packages.config" />
<Compile Include="Effects\CircleEffect.cs" /> <Compile Include="Effects\CircleEffect.cs" />
<BundleResource Include="Resources\menu_campaigns.png" />
<BundleResource Include="Resources\menu_campaigns%402x.png" />
<BundleResource Include="Resources\menu_campaigns%403x.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<BundleResource Include="Resources\Icon-60%403x.png" /> <BundleResource Include="Resources\Icon-60%403x.png" />
@ -423,7 +426,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj"> <ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj">
<Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project> <Project>{BA96A12C-4EE3-46C4-BB3F-F811B554CD01}</Project>
<Name>eShopOnContainers.Core</Name> <Name>eShopOnContainers.Core</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>