Moving spotlight into separate service

MikeCodesDotNET · Jul 4, 2016 · f9a435a · f9a435a
1 parent b0e943c
commit f9a435a
Show file tree

Hide file tree

Showing 12 changed files with 242 additions and 276 deletions.
diff --git a/ClientSDKs/BeerDrinkin.Core.Abstractions/BeerDrinkin.Core.Abstractions.csproj b/ClientSDKs/BeerDrinkin.Core.Abstractions/BeerDrinkin.Core.Abstractions.csproj
@@ -42,9 +42,11 @@
     <Compile Include="ViewModels\ICheckInViewModel.cs" />
     <Compile Include="ViewModels\ITrendingBeersViewModel.cs" />
     <Compile Include="ViewModels\IEnableUserLocationViewModel.cs" />
+    <Compile Include="Services\IDeviceSearchProvider.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="ViewModels\" />
+    <Folder Include="Services\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BeerDrinkin.Services.Abstractions\BeerDrinkin.Services.Abstractions.csproj">

diff --git a/ClientSDKs/BeerDrinkin.Core.Abstractions/Services/IDeviceSearchProvider.cs b/ClientSDKs/BeerDrinkin.Core.Abstractions/Services/IDeviceSearchProvider.cs
@@ -0,0 +1,11 @@
+using System;
+using BeerDrinkin.DataObjects;
+
+namespace BeerDrinkin.Core.Abstractions.Services
+{
+    public interface IDeviceSearchProvider
+    {
+        void AddBeerToIndex(Beer beer);
+    }
+}
+
diff --git a/ClientSDKs/BeerDrinkin.Core/BeerDrinkin.Core.csproj b/ClientSDKs/BeerDrinkin.Core/BeerDrinkin.Core.csproj
@@ -55,6 +55,7 @@
     <Compile Include="ViewModels\Discover\UsersViewModel.cs" />
     <Compile Include="ViewModels\CheckInViewModel.cs" />
     <Compile Include="ViewModels\Welcome\EnableUserLocationViewModel.cs" />
+    <Compile Include="ViewModels\BeerDescriptionViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="BreweryDB">

diff --git a/ClientSDKs/BeerDrinkin.Core/ViewModels/BeerDescriptionViewModel.cs b/ClientSDKs/BeerDrinkin.Core/ViewModels/BeerDescriptionViewModel.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Threading.Tasks;
+using BeerDrinkin.Core.Abstractions.Services;
+using BeerDrinkin.DataObjects;
+using BeerDrinkin.Utils;
+
+namespace BeerDrinkin.Core.ViewModels
+{
+    public class BeerDescriptionViewModel
+    {
+
+        public BeerDescriptionViewModel(Beer beer)
+        {
+            Beer = beer;
+            Name = beer.Name;
+            BreweryName = beer?.Brewery?.Name;
+            Description = beer.Description;
+            if (beer.HasImages == true)
+                ImageUrl = beer.Image.LargeUrl;
+
+
+            SearchProvider = ServiceLocator.Instance.Resolve<IDeviceSearchProvider>();
+            SearchProvider.AddBeerToIndex(beer); 
+        }
+
+        public IDeviceSearchProvider SearchProvider { get; private set;}
+        public Beer Beer { get; set;}
+        public string Name { get; set;}
+        public double ABV { get; set;}
+        public string BreweryName { get; set;}
+        public int Average { get; set;}
+        public int ReviewCount { get; set;}
+        public string Description { get; set;}
+        public string ImageUrl { get; set;}
+
+        public string SharingMessage
+        {
+            get
+            {
+                return $"I've just read about {Beer.Name} with Beer Drinkin for iOS";
+            }
+        }
+
+    }
+}
+
diff --git a/ClientSDKs/BeerDrinkin.Core/ViewModels/CheckInViewModel.cs b/ClientSDKs/BeerDrinkin.Core/ViewModels/CheckInViewModel.cs
@@ -48,7 +48,7 @@ public async Task CheckInBeer(Beer beer, int score)
                     CheckIn = checkIn
                 };
 
-                checkIn.Rating = rating;
+                checkIn.RatingId = rating.Id;
 
                 await checkInStore.InsertAsync(checkIn);
                 await ratingStore.InsertAsync(rating);

diff --git a/ClientSDKs/BeerDrinkin.DataObjects/CheckIn.cs b/ClientSDKs/BeerDrinkin.DataObjects/CheckIn.cs
@@ -9,10 +9,5 @@ public class CheckIn : BaseDataObject
         public double Latitude { get; set; }
         public bool IsBottled { get; set; }
         public string RatingId { get; set; }
-
-
-#if !BACKEND
-        public Rating Rating { get; set; }
-#endif  
     }
 }
diff --git a/MobileApps/iOS/AppDelegate.cs b/MobileApps/iOS/AppDelegate.cs
@@ -13,6 +13,8 @@
 using BeerDrinkin.Services.Abstractions;
 using BeerDrinkin.iOS.Helpers;
 using BeerDrinkin.AzureClient;
+using BeerDrinkin.Core.Abstractions.Services;
+using BeerDrinkin.iOS.Services;
 
 namespace BeerDrinkin.iOS
 {
@@ -27,6 +29,7 @@ public override bool FinishedLaunching (UIApplication application, NSDictionary
         {
             Core.ViewModels.ViewModelBase.Init();
             ServiceLocator.Instance.Add<IAppInsights, AppInsights>();
+            ServiceLocator.Instance.Add<IDeviceSearchProvider, SpotlightService>();
 
 #if DEBUG
             Utils.Helpers.Settings.UserId = string.Empty;

diff --git a/MobileApps/iOS/BeerDrinkin.iOS.csproj b/MobileApps/iOS/BeerDrinkin.iOS.csproj
@@ -550,6 +550,7 @@
     <Compile Include="View Controllers\CheckInViewController.designer.cs">
       <DependentUpon>CheckInViewController.cs</DependentUpon>
     </Compile>
+    <Compile Include="Services\SpotlightService.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="..\packages\Xamarin.Insights.1.10.5\build\Xamarin.iOS10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.10.5\build\Xamarin.iOS10\Xamarin.Insights.targets')" />
@@ -820,5 +821,6 @@
     <Folder Include="View Controllers\Misc\" />
     <Folder Include="View Controllers\UserProfile\" />
     <Folder Include="UITableViewCells\Discover\" />
+    <Folder Include="Services\" />
   </ItemGroup>
 </Project>
diff --git a/MobileApps/iOS/Main.storyboard b/MobileApps/iOS/Main.storyboard
diff --git a/MobileApps/iOS/Services/SpotlightService.cs b/MobileApps/iOS/Services/SpotlightService.cs
@@ -0,0 +1,49 @@
+using System;
+using BeerDrinkin.Core.Abstractions.Services;
+using BeerDrinkin.DataObjects;
+using CoreSpotlight;
+using Foundation;
+
+namespace BeerDrinkin.iOS.Services
+{
+    public class SpotlightService : IDeviceSearchProvider
+    {
+        public SpotlightService()
+        {
+        }
+
+        public void AddBeerToIndex(Beer beer)
+        {
+            var activity = new NSUserActivity("com.micjames.beerdrinkin.beerdetails");
+
+            if (!string.IsNullOrEmpty(beer.Description))
+            {
+                var info = new NSMutableDictionary();
+                info.Add(new NSString("name"), new NSString(beer.Name));
+                info.Add(new NSString("description"), new NSString(beer.Description));
+
+                if (beer.Image.MediumUrl != null)
+                {
+                    info.Add(new NSString("imageUrl"), new NSString(beer.Image.LargeUrl));
+                }
+
+                var attributes = new CSSearchableItemAttributeSet();
+                attributes.DisplayName = beer.Name;
+                attributes.ContentDescription = beer.Description;
+
+                var keywords = new NSString[] { new NSString(beer.Name), new NSString("beerName") };
+                activity.Keywords = new NSSet<NSString>(keywords);
+                activity.ContentAttributeSet = attributes;
+
+                activity.Title = beer.Name;
+                activity.UserInfo = info;
+
+                activity.EligibleForSearch = true;
+                activity.EligibleForPublicIndexing = true;
+                activity.BecomeCurrent();
+            }
+
+        }
+    }
+}
+
diff --git a/MobileApps/iOS/UITableViewCells/BeerDescriptionCell.cs b/MobileApps/iOS/UITableViewCells/BeerDescriptionCell.cs
@@ -61,6 +61,8 @@ public override void AwakeFromNib()
             base.AwakeFromNib();
 
             Helpers.Animator.GrowDivider(divider, this);
+
+            BackgroundColor = UIColor.Red;
         }
     }
 }