Merge pull request #4221 from anyproto/ios-5428-analytics-research

IOS-5428 Log widgets appearance

Author: ignatovv

Anytype/Sources/Analytics/AnalyticsConstants.swift

@@ -171,6 +171,12 @@ enum AnalyticsWidgetContext: String, Hashable {
     case auto = "Auto"
 }
 
+enum HomeWidgetRoute: String, Hashable, Codable {
+    case home = "Home"
+    case space = "Space"
+    case appLaunch = "AppLaunch"
+}
+
 enum RemoveCompletelyRoute: String {
     case bin = "Bin"
     case settings = "Settings"

Anytype/Sources/Analytics/AnytypeAnalytics/AnytypeAnalytics+Events.swift

@@ -1319,8 +1319,10 @@ extension AnytypeAnalytics {
         logEvent("HistoryBack")
     }
 
-    func logScreenWidget() {
-        logEvent("ScreenWidget")
+    func logScreenWidget(route: HomeWidgetRoute?) {
+        logEvent("ScreenWidget", withEventProperties: [
+            AnalyticsEventsPropertiesKey.route: route?.rawValue
+        ].compactMapValues { $0 })
     }
 
     func logScreenBin() {

Anytype/Sources/PresentationLayer/Flows/HomeWidgetsCoordinator/HomeWidgetsCoordinatorView.swift

@@ -4,29 +4,32 @@ import Services
 
 struct HomeWidgetData: Hashable {
     let spaceId: String
+    let route: HomeWidgetRoute?
 }
 
 struct HomeWidgetsCoordinatorView: View {
     let data: HomeWidgetData
-    
+
     var body: some View {
         SpaceLoadingContainerView(spaceId: data.spaceId, showBackground: true) {
-            HomeWidgetsCoordinatorInternalView(info: $0)
+            HomeWidgetsCoordinatorInternalView(info: $0, route: data.route)
         }
     }
 }
 
 private struct HomeWidgetsCoordinatorInternalView: View {
-    
+
     @State private var model: HomeWidgetsCoordinatorViewModel
     @Environment(\.pageNavigation) private var pageNavigation
-    
-    init(info: AccountInfo) {
+    let route: HomeWidgetRoute?
+
+    init(info: AccountInfo, route: HomeWidgetRoute?) {
         self._model = State(wrappedValue: HomeWidgetsCoordinatorViewModel(info: info))
+        self.route = route
     }
 
     var body: some View {
-        HomeWidgetsView(info: model.spaceInfo, output: model)
+        HomeWidgetsView(info: model.spaceInfo, output: model, route: route)
             .onAppear {
                 model.pageNavigation = pageNavigation
             }

Anytype/Sources/PresentationLayer/Flows/SpaceHub/SpaceHubCoordinatorViewModel.swift

@@ -61,7 +61,7 @@ final class SpaceHubCoordinatorViewModel: SpaceHubModuleOutput {
             self?.showScreenSync(data: data)
         }, pushHome: { [weak self] in
             guard let self, let currentSpaceId else { return }
-            navigationPath.push(HomeWidgetData(spaceId: currentSpaceId))
+            navigationPath.push(HomeWidgetData(spaceId: currentSpaceId, route: .home))
         }, pop: { [weak self] in
             self?.navigationPath.pop()
         }, popToFirstInSpace: { [weak self] in
@@ -163,12 +163,12 @@ final class SpaceHubCoordinatorViewModel: SpaceHubModuleOutput {
 
     func setupInitialScreen() async {
         guard !loginStateService.isFirstLaunchAfterRegistration, appActionsStorage.action.isNil else { return }
-        
+
         switch userDefaults.lastOpenedScreen {
         case .editor(let editorData):
             try? await showScreen(data: .editor(editorData))
         case .widgets(let spaceId):
-            try? await showScreen(data: .widget(HomeWidgetData(spaceId: spaceId)))
+            try? await showScreen(data: .widget(HomeWidgetData(spaceId: spaceId, route: .appLaunch)))
         case .chat(let data):
             try? await showScreen(data: .chat(data))
         case .spaceChat(let data):
@@ -308,7 +308,7 @@ final class SpaceHubCoordinatorViewModel: SpaceHubModuleOutput {
             let chatData = SpaceChatCoordinatorData(spaceId: spaceView.targetSpaceId)
             try await showScreen(data: .spaceChat(chatData))
         } else {
-            let widgetData = HomeWidgetData(spaceId: spaceView.targetSpaceId)
+            let widgetData = HomeWidgetData(spaceId: spaceView.targetSpaceId, route: .space)
             try await showScreen(data: .widget(widgetData))
         }
     }
@@ -357,7 +357,7 @@ final class SpaceHubCoordinatorViewModel: SpaceHubModuleOutput {
         case .spaceChat(let data):
             currentPath.openOnce(data)
         case .widget(let data):
-            let data = HomeWidgetData(spaceId: data.spaceId)
+            let data = HomeWidgetData(spaceId: data.spaceId, route: nil)
             currentPath.openOnce(data)
         }
 
@@ -433,7 +433,7 @@ final class SpaceHubCoordinatorViewModel: SpaceHubModuleOutput {
             if spaceView.initialScreenIsChat {
                 SpaceChatCoordinatorData(spaceId: spaceView.targetSpaceId)
             } else {
-                HomeWidgetData(spaceId: spaceView.targetSpaceId)
+                HomeWidgetData(spaceId: spaceView.targetSpaceId, route: nil)
             }
         }
     }

Anytype/Sources/PresentationLayer/Flows/SpaceHub/Support/SpaceHubPathManager.swift

@@ -20,7 +20,7 @@ final class SpaceHubPathUXTypeHelper: SpaceHubPathUXTypeHelperProtocol {
             case .data:
                 // Expected: SpaceHubNavigationItem, HomeWidgetData
                 let chatItem = SpaceChatCoordinatorData(spaceId: spaceView.targetSpaceId)
-                let homeItem = HomeWidgetData(spaceId: spaceView.targetSpaceId)
+                let homeItem = HomeWidgetData(spaceId: spaceView.targetSpaceId, route: nil)
                 path.remove(chatItem)
                 path.remove(homeItem)
                 path.insert(homeItem, at: 1)

Anytype/Sources/PresentationLayer/Modules/HomeWidgets/Container/HomeWidgetsView.swift

@@ -6,9 +6,10 @@ import AnytypeCore
 struct HomeWidgetsView: View {
     let info: AccountInfo
     let output: (any HomeWidgetsModuleOutput)?
-    
+    let route: HomeWidgetRoute?
+
     var body: some View {
-        HomeWidgetsInternalView(info: info, output: output)
+        HomeWidgetsInternalView(info: info, output: output, route: route)
             .id(info.hashValue)
     }
 }
@@ -17,9 +18,9 @@ private struct HomeWidgetsInternalView: View {
     @State private var model: HomeWidgetsViewModel
     @State var widgetsDndState = DragState()
     @State var typesDndState = DragState()
-    
-    init(info: AccountInfo, output: (any HomeWidgetsModuleOutput)?) {
-        self._model = State(wrappedValue: HomeWidgetsViewModel(info: info, output: output))
+
+    init(info: AccountInfo, output: (any HomeWidgetsModuleOutput)?, route: HomeWidgetRoute?) {
+        self._model = State(wrappedValue: HomeWidgetsViewModel(info: info, output: output, route: route))
     }
 
     var body: some View {

Anytype/Sources/PresentationLayer/Modules/HomeWidgets/Container/HomeWidgetsViewModel.swift

@@ -14,9 +14,10 @@ final class HomeWidgetsViewModel {
     }
 
     // MARK: - DI
-    
+
     let info: AccountInfo
     let widgetObject: any BaseDocumentProtocol
+    let route: HomeWidgetRoute?
 
     @Injected(\.blockWidgetService) @ObservationIgnored
     private var blockWidgetService: any BlockWidgetServiceProtocol
@@ -56,10 +57,12 @@ final class HomeWidgetsViewModel {
 
     init(
         info: AccountInfo,
-        output: (any HomeWidgetsModuleOutput)?
+        output: (any HomeWidgetsModuleOutput)?,
+        route: HomeWidgetRoute?
     ) {
         self.info = info
         self.output = output
+        self.route = route
         self.widgetObject = documentService.document(objectId: info.widgetsId, spaceId: info.accountSpaceId)
         self.pinnedSectionIsExpanded = expandedService.isExpanded(id: Constants.pinnedSectionId, defaultValue: true)
         self.objectTypeSectionIsExpanded = expandedService.isExpanded(id: Constants.objectTypeSectionId, defaultValue: true)
@@ -74,7 +77,7 @@ final class HomeWidgetsViewModel {
     }
 
     func onAppear() {
-        AnytypeAnalytics.instance().logScreenWidget()
+        AnytypeAnalytics.instance().logScreenWidget(route: route)
     }
 
     func widgetsDropUpdate(from: DropDataElement<BlockWidgetInfo>, to: DropDataElement<BlockWidgetInfo>) {