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

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<CampaignItem> _mockCampaign = new ObservableCollection<CampaignItem>
@@ -39,14 +39,12 @@
         public async Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string token)
         {
             await Task.Delay(500);
-
             return _mockCampaign;
         }
 
         public async Task<CampaignItem> GetCampaignByIdAsync(int campaignId, string token)
         {
             await Task.Delay(500);
-
             return _mockCampaign.SingleOrDefault(c => c.Id == campaignId);
         }
     }

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 eShopOnContainers.Core.Models.Marketing;
+using eShopOnContainers.Core.Services.RequestProvider;
+using eShopOnContainers.Core.Extensions;
+using eShopOnContainers.Core.Helpers;
+
+namespace eShopOnContainers.Core.Services.Marketing
 {
-    using System;
-    using System.Collections.ObjectModel;
-    using System.Threading.Tasks;
-    using Models.Marketing;
-    using RequestProvider;
-    using Extensions;
-    using Helpers;
-
     public class CampaignService : ICampaignService
     {
         private readonly IRequestProvider _requestProvider;

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<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string token);
-
         Task<CampaignItem> GetCampaignByIdAsync(int id, string token);
     }
 }

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

@@ -1,13 +1,13 @@
-namespace eShopOnContainers.Core.ViewModels
+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
 {
-    using System.Threading.Tasks;
-    using Helpers;
-    using Models.Marketing;
-    using Services.Marketing;
-    using Base;
-    using System.Windows.Input;
-    using Xamarin.Forms;
-
     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;
             }
         }
 

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 eShopOnContainers.Core.Models.Marketing;
+using eShopOnContainers.Core.Services.Marketing;
+using eShopOnContainers.Core.ViewModels.Base;
+using eShopOnContainers.Core.Helpers;
+
+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;
-
     public class CampaignViewModel : ViewModelBase
     {
         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)
         {
@@ -41,7 +41,7 @@
             IsBusy = false;
         }
 
-        private async Task GetCampaignDetails(CampaignItem campaign)
+        private async Task GetCampaignDetailsAsync(CampaignItem campaign)
         {
             await NavigationService.NavigateToAsync<CampaignDetailsViewModel>(campaign.Id);
         }

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

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

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

@@ -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()

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

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

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

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

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

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

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/SplashActivity.cs

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

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/MainApplication.cs

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

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs

@@ -2281,76 +2281,76 @@ 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;
+			public const int mr_ic_play_light = 2130837683;
+			
+			// aapt resource value: 0x7f0200b4
+			public const int noimage = 2130837684;
 			
 			// aapt resource value: 0x7f0200ba
 			public const int notification_template_icon_bg = 2130837690;
 			
-			// aapt resource value: 0x7f0200b4
-			public const int product_add = 2130837684;
-			
 			// 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;

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable/splash_drawable.xml

@@ -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>

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/values/styles.xml

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

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj

@@ -221,7 +221,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Activities\MainActivity.cs" />
-    <Compile Include="Activities\SplashActivity.cs" />
     <Compile Include="Effects\EntryLineColorEffect.cs" />
     <Compile Include="Extensions\ViewExtensions.cs" />
     <Compile Include="Helpers\Settings.cs" />
@@ -234,6 +233,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Effects\CircleEffect.cs" />
     <Compile Include="Effects\BaseContainerEffect.cs" />
+    <Compile Include="Activities\SplashActivity.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="..\CommonResources\Fonts\Montserrat-Bold.ttf">
@@ -260,6 +260,12 @@
     <AndroidResource Include="Resources\layout\TabLayout.axml">
       <SubType>Designer</SubType>
     </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>
     <AndroidResource Include="Resources\drawable\icon.png" />
@@ -273,9 +279,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\values\styles.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\splash_drawable.xml" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\fake_product_01.png" />
   </ItemGroup>
@@ -285,15 +288,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\fake_product_02.png" />
   </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>
     <AndroidResource Include="Resources\drawable-hdpi\menu_profile.png" />
   </ItemGroup>
@@ -380,7 +374,7 @@
   </ItemGroup>
   <ItemGroup>
     <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>
     </ProjectReference>
   </ItemGroup>

src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj

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

src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj

@@ -124,6 +124,9 @@
     <ITunesArtwork Include="iTunesArtwork@2x" />
     <None Include="packages.config" />
     <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>
     <BundleResource Include="Resources\Icon-60%403x.png" />
@@ -423,7 +426,7 @@
   </ItemGroup>
   <ItemGroup>
     <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>
     </ProjectReference>
   </ItemGroup>