From 2e463f4b250e880376ffa9e1747f570db8f02686 Mon Sep 17 00:00:00 2001
From: David Britch <davidbritch@Davids-MBP.lan>
Date: Fri, 29 Sep 2017 17:25:49 +0100
Subject: [PATCH] Fixed SplashScreen implementation on Android. Fixes #355
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The MainTheme set the splash screen image as the window background.
I’ve removed this and ensured that the SplashActivity is the launch
activity.

Also did some code tidy up on the Campaign page classes.
---
 .../Services/Marketing/CampaignMockService.cs | 18 +++---
 .../Services/Marketing/CampaignService.cs     | 18 +++---
 .../Services/Marketing/ICampaignService.cs    | 11 ++--
 .../ViewModels/CampaignDetailsViewModel.cs    | 22 +++----
 .../ViewModels/CampaignViewModel.cs           | 24 +++----
 .../Views/CampaignDetailsView.xaml            |  2 +-
 .../Views/CampaignView.xaml.cs                |  8 +--
 .../Activities/MainActivity.cs                |  1 -
 .../Activities/SplashActivity.cs              |  4 +-
 .../MainApplication.cs                        |  5 +-
 .../Resources/Resource.Designer.cs            | 11 ++--
 .../Resources/drawable/splash_drawable.xml    | 11 ----
 .../Resources/values/styles.xml               | 62 +++++++++----------
 .../eShopOnContainers.Droid.csproj            |  5 +-
 14 files changed, 86 insertions(+), 116 deletions(-)
 delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable/splash_drawable.xml

diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs
index 88bd3a5ee..c4536ac51 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs
@@ -1,12 +1,12 @@
-namespace eShopOnContainers.Core.Services.Marketing
-{
-    using System;
-    using System.Collections.ObjectModel;
-    using System.Threading.Tasks;
-    using Models.Marketing;
-    using Xamarin.Forms;
-    using System.Linq;
+using System;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using System.Linq;
+using Xamarin.Forms;
+using eShopOnContainers.Core.Models.Marketing;
 
+namespace eShopOnContainers.Core.Services.Marketing
+{
     public class CampaignMockService : ICampaignService
     {
         private readonly ObservableCollection<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);
         }
     }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs
index 3d3123c1c..8d6cdeb6b 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs
@@ -1,13 +1,13 @@
-namespace eShopOnContainers.Core.Services.Marketing
+using System;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using 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;
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs
index a050153c1..d89ac0616 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs
@@ -1,13 +1,12 @@
-namespace eShopOnContainers.Core.Services.Marketing
-{
-    using System.Collections.ObjectModel;
-    using System.Threading.Tasks;
-    using Models.Marketing;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using eShopOnContainers.Core.Models.Marketing;
 
+namespace eShopOnContainers.Core.Services.Marketing
+{
     public interface ICampaignService
     {
         Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string token);
-
         Task<CampaignItem> GetCampaignByIdAsync(int id, string token);
     }
 }
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs
index 95e614bc6..4a74187ee 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs
@@ -1,13 +1,13 @@
-namespace eShopOnContainers.Core.ViewModels
+using System.Threading.Tasks;
+using 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;
             }
         }
 
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs
index 4127213d4..9351ec414 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs
@@ -1,14 +1,14 @@
-namespace eShopOnContainers.Core.ViewModels
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Xamarin.Forms;
+using System.Collections.ObjectModel;
+using 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);
         }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignDetailsView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignDetailsView.xaml
index e5e96bbff..5fcf15ddb 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignDetailsView.xaml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignDetailsView.xaml
@@ -150,7 +150,7 @@
                 Style="{StaticResource CampaignAvailabilityDescriptionStyle}"/>
         </Grid>
         
-        <AbsoluteLayout
+       <AbsoluteLayout
             Grid.Column="0"
             Grid.Row="0"
             Grid.RowSpan="3"
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignView.xaml.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignView.xaml.cs
index 84bde29ab..e48bf87fb 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignView.xaml.cs
+++ b/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()
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs
index a40193d4c..95c822a18 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs
+++ b/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
     {
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/SplashActivity.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/SplashActivity.cs
index 65f6fc4c5..5aefea315 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/SplashActivity.cs
+++ b/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)));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/MainApplication.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/MainApplication.cs
index b1e6dd104..ee3f128e8 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/MainApplication.cs
+++ b/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()
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
index 2afd316a8..76f9d97de 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
@@ -2340,8 +2340,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 0x7f0200b4
 			public const int noimage = 2130837684;
 			
-			// aapt resource value: 0x7f0200bb
-			public const int notification_template_icon_bg = 2130837691;
+			// aapt resource value: 0x7f0200ba
+			public const int notification_template_icon_bg = 2130837690;
 			
 			// aapt resource value: 0x7f0200b5
 			public const int product_add = 2130837685;
@@ -2353,13 +2353,10 @@ namespace eShopOnContainers.Droid
 			public const int roundedbgdark = 2130837687;
 			
 			// aapt resource value: 0x7f0200b8
-			public const int splash_drawable = 2130837688;
+			public const int switch_off = 2130837688;
 			
 			// aapt resource value: 0x7f0200b9
-			public const int switch_off = 2130837689;
-			
-			// aapt resource value: 0x7f0200ba
-			public const int switch_on = 2130837690;
+			public const int switch_on = 2130837689;
 			
 			static Drawable()
 			{
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable/splash_drawable.xml b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable/splash_drawable.xml
deleted file mode 100644
index fdd34c4ae..000000000
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable/splash_drawable.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/values/styles.xml b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/values/styles.xml
index a57d30cc3..7480839c7 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/values/styles.xml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/values/styles.xml
@@ -1,38 +1,32 @@
-<?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>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
index d9bdd0ded..8ccb42d53 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
@@ -221,7 +221,6 @@
   </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">
@@ -279,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>