wordpress-mobile · diegoreymendez · Dec 2, 2020 · Nov 24, 2020 · Nov 24, 2020 · Nov 24, 2020
diff --git a/Podfile b/Podfile
@@ -366,6 +366,18 @@ target 'WordPressHomeWidgetToday' do
     wordpress_ui
 end
 
+## Intents
+## ============
+##
+target 'WordPressIntents' do
+    project 'WordPress/WordPress.xcodeproj'
+
+    shared_with_all_pods
+    shared_with_networking_pods
+
+    wordpress_ui
+end
+
 ## Notification Content Extension
 ## ==============================
 ##

diff --git a/Podfile.lock b/Podfile.lock
@@ -769,6 +769,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: dcb2596ad05a63d662e8c7924357babbf327b421
   ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0
 
-PODFILE CHECKSUM: 03c491ba942789df594bf1665b620af42dff70f2
+PODFILE CHECKSUM: 0539a820471fc9b86c986aafbd49928f8bca86a5
 
 COCOAPODS: 1.9.3
diff --git a/Scripts/fastlane/Fastfile b/Scripts/fastlane/Fastfile
@@ -18,7 +18,8 @@ ALL_BUNDLE_IDENTIFIERS = [
       "org.wordpress.WordPressNotificationServiceExtension",
       "org.wordpress.WordPressNotificationContentExtension",
       "org.wordpress.WordPressAllTimeWidget",
-      "org.wordpress.WordPressThisWeekWidget"
+      "org.wordpress.WordPressThisWeekWidget",
+      "org.wordpress.WordPressIntents",
     ]
 
 # Use this instead of getting values from ENV directly

diff --git a/WordPress/Classes/Stores/StatsInsightsStore.swift b/WordPress/Classes/Stores/StatsInsightsStore.swift
@@ -1013,11 +1013,12 @@ private extension InsightStoreState {
         }
         // refresh stats and update any blog info, if they had changed
         homeWidgetTodayCache[siteID.intValue] = HomeWidgetTodayData(siteID: siteID.intValue,
-                                                           siteName: blog.title ?? oldData.siteName,
-                                                           url: blog.url ?? oldData.url,
-                                                           timeZone: blogService.timeZone(for: blog),
-                                                           date: Date(),
-                                                           stats: stats)
+                                                                    siteName: blog.title ?? oldData.siteName,
+                                                                    iconURL: blog.icon ?? oldData.iconURL,
+                                                                    url: blog.url ?? oldData.url,
+                                                                    timeZone: blogService.timeZone(for: blog),
+                                                                    date: Date(),
+                                                                    stats: stats)
 
         HomeWidgetTodayData.write(items: homeWidgetTodayCache)
         WidgetCenter.shared.reloadTimelines(ofKind: WPHomeWidgetTodayKind)
@@ -1037,11 +1038,12 @@ private extension InsightStoreState {
                 let timeZone = blogService.timeZone(for: blog)
 
                 result[blogID.intValue] = HomeWidgetTodayData(siteID: blogID.intValue,
-                                                                  siteName: title,
-                                                                  url: url,
-                                                                  timeZone: timeZone,
-                                                                  date: Date(),
-                                                                  stats: TodayWidgetStats())
+                                                              siteName: title,
+                                                              iconURL: blog.icon,
+                                                              url: url,
+                                                              timeZone: timeZone,
+                                                              date: Date(),
+                                                              stats: TodayWidgetStats())
             }
         }
     }

diff --git a/WordPress/Classes/Utility/SFHFKeychainUtils.m b/WordPress/Classes/Utility/SFHFKeychainUtils.m
@@ -529,4 +529,4 @@ + (BOOL)deleteItemForUsername:(NSString *)username
 }
 
 
-@end
+@end
diff --git a/WordPress/Classes/ViewRelated/Stats/Today Widgets/Data/TodayWidgetStats.swift b/WordPress/Classes/ViewRelated/Stats/Today Widgets/Data/TodayWidgetStats.swift
@@ -1,3 +1,4 @@
+import CocoaLumberjack
 import Foundation
 
 /// This struct contains data for the Insights Today stats to be displayed in the corresponding widget.

diff --git a/WordPress/Classes/ViewRelated/Stats/Today Widgets/iOS 14 Widgets/HomeWidgetCache.swift b/WordPress/Classes/ViewRelated/Stats/Today Widgets/iOS 14 Widgets/HomeWidgetCache.swift
@@ -1,3 +1,5 @@
+import Foundation
+
 /// Cache manager that stores `HomeWidgetData` values in a plist file, contained in the specified security application group and with the specified file name.
 /// The corresponding dictionary is always in the form `[Int: T]`, where the `Int` key is the SiteID, and the `T` value is any `HomeWidgetData` instance.
 struct HomeWidgetCache<T: HomeWidgetData> {

diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
diff --git a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPressIntents.xcscheme b/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPressIntents.xcscheme
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1220"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F1F163BD25658B4D003DC13B"
+               BuildableName = "WordPressIntents.appex"
+               BlueprintName = "WordPressIntents"
+               ReferencedContainer = "container:WordPress.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+               BuildableName = "WordPress.app"
+               BlueprintName = "WordPress"
+               ReferencedContainer = "container:WordPress.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+            BuildableName = "WordPress.app"
+            BlueprintName = "WordPress"
+            ReferencedContainer = "container:WordPress.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+            BuildableName = "WordPress.app"
+            BlueprintName = "WordPress"
+            ReferencedContainer = "container:WordPress.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/WordPress/WordPressHomeWidgetToday/Model/HomeWidgetTodayData.swift b/WordPress/WordPressHomeWidgetToday/Model/HomeWidgetTodayData.swift
@@ -5,6 +5,7 @@ struct HomeWidgetTodayData: HomeWidgetData {
 
     let siteID: Int
     let siteName: String
+    let iconURL: String?
     let url: String
     let timeZone: TimeZone
     let date: Date

diff --git a/WordPress/WordPressHomeWidgetToday/Remote service/HomeWidgetTodayRemoteService.swift b/WordPress/WordPressHomeWidgetToday/Remote service/HomeWidgetTodayRemoteService.swift
@@ -56,6 +56,7 @@ class HomeWidgetTodayRemoteService {
 
                 let newWidgetData = HomeWidgetTodayData(siteID: widgetData.siteID,
                                                         siteName: widgetData.siteName,
+                                                        iconURL: widgetData.iconURL,
                                                         url: widgetData.url,
                                                         timeZone: widgetData.timeZone,
                                                         date: Date(),

diff --git a/...Press/WordPressHomeWidgetToday/Supporting Files/WordPressHomeWidgetToday.intentdefinition b/...Press/WordPressHomeWidgetToday/Supporting Files/WordPressHomeWidgetToday.intentdefinition
diff --git a/WordPress/WordPressHomeWidgetToday/Views/TodayWidgetView.swift b/WordPress/WordPressHomeWidgetToday/Views/TodayWidgetView.swift
@@ -38,14 +38,14 @@ extension TodayWidgetView {
         static let visitorsTitle: LocalizedStringKey = "Visitors"
         static let likesTitle: LocalizedStringKey = "Likes"
         static let commentsTitle: LocalizedStringKey = "Comments"
-
     }
 }
 
 struct TodayWidgetView_Previews: PreviewProvider {
     // TODO - TODAYWIDGET: this has been added here for preview purposes only. 
     static let staticContent = HomeWidgetTodayData(siteID: 0,
                                                    siteName: "Places you should visit",
+                                                   iconURL: nil,
                                                    url: "",
                                                    timeZone: TimeZone.current,
                                                    date: Date(),
Original file line number	Diff line number	Diff line change
Expand Up		@@ -529,4 +529,4 @@ + (BOOL)deleteItemForUsername:(NSString *)username
		}


		@end
		@end