Fix #3026: Add support for brave partner cards (#3052)

brave · Nov 19, 2020 · 3716ef1 · 3716ef1
1 parent f819b55
commit 3716ef1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Client/Frontend/Brave Today/Composer/FeedDataSource.swift b/Client/Frontend/Brave Today/Composer/FeedDataSource.swift
@@ -441,6 +441,7 @@ class FeedDataSource {
             })?.enabled ?? item.source.isDefault
         }
         var sponsors = feedsFromEnabledSources.filter { $0.content.contentType == .sponsor }
+        var partners = feedsFromEnabledSources.filter { $0.content.contentType == .partner }
         var deals = feedsFromEnabledSources.filter { $0.content.contentType == .deals }
         var articles = feedsFromEnabledSources.filter { $0.content.contentType == .article }
 
@@ -460,6 +461,7 @@ class FeedDataSource {
             .repeating([
                 .repeating([.headline(paired: false)], times: 2),
                 .repeating([.headline(paired: true)], times: 2),
+                .partner,
                 .fillUsing(
                     CategoryFillStrategy(
                         categories: Set(articles.map(\.source.category)),
@@ -496,6 +498,13 @@ class FeedDataSource {
                     let title = $0.first?.content.offersCategory
                     return [.deals($0, title: title ?? Strings.BraveToday.deals)]
                 }
+            case .partner:
+                let imageExists = { (item: FeedItem) -> Bool in
+                    item.content.imageURL != nil
+                }
+                return fillStrategy.next(from: &partners, where: imageExists).map {
+                    [.headline($0)]
+                }
             case .headline(let paired):
                 if articles.isEmpty { return nil }
                 let imageExists = { (item: FeedItem) -> Bool in
@@ -581,6 +590,8 @@ extension FeedDataSource {
     private enum FeedSequenceElement {
         /// Display a sponsored image with the content type of `product`
         case sponsor
+        /// Display a headline from a list of partnered items
+        case partner
         /// Displays a horizontal list of deals with the content type of `brave_offers`
         case deals
         /// Displays an `article` type item in a headline card. Can also be displayed as two (smaller) paired

diff --git a/Client/Frontend/Brave Today/Composer/FeedItem.swift b/Client/Frontend/Brave Today/Composer/FeedItem.swift
@@ -46,6 +46,7 @@ extension FeedItem {
         static let article = FeedContentType(rawValue: "article")
         static let deals = FeedContentType(rawValue: "product")
         static let sponsor = FeedContentType(rawValue: "brave_offers")
+        static let partner = FeedContentType(rawValue: "brave_partner")
     }
 
     struct Content: Equatable, Decodable {