Fixed SplashScreen implementation on Android. Fixes dotnet-architecture#355

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.

Author: David Britch

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 class CampaignMockService : ICampaignService
         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 @@ public override async Task InitializeAsync(object navigationData)
                 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 ObservableCollection<CampaignItem> Campaigns
             }
         }
 
-        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 @@ public override async Task InitializeAsync(object navigationData)
             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.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 @@ protected override void OnCreate(Bundle bundle)
 
         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,26 +1,23 @@
 using System;
-
 using Android.App;
 using Android.OS;
 using Android.Runtime;
 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)
         {
         }
 
         public override void OnCreate()
         {
             base.OnCreate();
             RegisterActivityLifecycleCallbacks(this);
-            //A great place to initialize Xamarin.Insights and Dependency Services!
         }
 
         public override void OnTerminate()