Merge pull request #2908 from anyproto/ios-4049-update-lastuseddate-for-types-and-relations

IOS-4049 Support lastUsedDate sort for types in type picker

Author: ignatovv

Anytype/Sources/Models/Extensions/ObjectType+Extensions.swift

@@ -25,7 +25,8 @@ extension ObjectType {
         recommendedRelations: [],
         recommendedFeaturedRelations: [],
         recommendedHiddenRelations: [],
-        recommendedLayout: nil
+        recommendedLayout: nil,
+        lastUsedDate: .distantPast
     )
 
     var setIsTemplatesAvailable: Bool {

Anytype/Sources/PresentationLayer/Modules/HomeNavigationContainer/Panel/HomeBottomNavigationPanelViewModel.swift

@@ -129,6 +129,8 @@ final class HomeBottomNavigationPanelViewModel: ObservableObject {
 
             AnytypeAnalytics.instance().logCreateObject(objectType: details.analyticsType, spaceId: details.spaceId, route: .navigation)
 
+            try? await objectActionsService.updateBundledDetails(contextID: type.id, details: [ .lastUsedDate(Date.now)])
+            
             output?.onCreateObjectSelected(screenData: details.screenData())
         }
     }
@@ -153,7 +155,11 @@ final class HomeBottomNavigationPanelViewModel: ObservableObject {
                 .filter { Constants.favoriteTypesUniqueKeys.contains($0.uniqueKey) }
                 .reordered(by: Constants.favoriteTypesUniqueKeys.map(\.value), transform: \.uniqueKey.value)
 
-            otherObjectTypes = types.filter { !Constants.favoriteTypesUniqueKeys.contains($0.uniqueKey) }
+            otherObjectTypes = types
+                .filter { !Constants.favoriteTypesUniqueKeys.contains($0.uniqueKey) }
+                .sorted {
+                    $0.lastUsedDate ?? .distantPast > $1.lastUsedDate ?? .distantPast
+                }
         }
     }
 

Anytype/Sources/ServiceLayer/Object/TypeProvider/ObjectTypeProvider.swift

@@ -116,7 +116,8 @@ final class ObjectTypeProvider: ObjectTypeProviderProtocol, Sendable {
             recommendedRelations: [],
             recommendedFeaturedRelations: [],
             recommendedHiddenRelations: [],
-            recommendedLayout: nil
+            recommendedLayout: nil,
+            lastUsedDate: .distantPast
         )
     }
 

Modules/AnytypeCore/AnytypeCore/Extensions/ProtobufExtensions.swift

@@ -25,6 +25,13 @@ public extension Bool {
     }
 }
 
+public extension Date {
+    var protobufValue: Google_Protobuf_Value {
+        // Cast to int to remove decimal part for middleware
+        Google_Protobuf_Value(integerLiteral: Int64(timeIntervalSince1970))
+    }
+}
+
 public extension Array where Element == String {
     var protobufValue: Google_Protobuf_Value {
         Google_Protobuf_Value(

Modules/Services/Sources/Models/Details/BundledDetails.swift

@@ -14,37 +14,40 @@ public enum BundledDetails: Sendable {
     case done(Bool)
     case description(String)
     case recommendedLayout(Int)
+    case lastUsedDate(Date)
 }
 
 extension BundledDetails {
 
     var key: String {
         switch self {
-        case .name: return BundledRelationKey.name.rawValue
-        case .iconEmoji: return BundledRelationKey.iconEmoji.rawValue
-        case .iconObjectId: return BundledRelationKey.iconImage.rawValue
-        case .iconName: return BundledRelationKey.iconName.rawValue
-        case .iconOption: return BundledRelationKey.iconOption.rawValue
-        case .coverId: return BundledRelationKey.coverId.rawValue
-        case .coverType: return BundledRelationKey.coverType.rawValue
-        case .done: return BundledRelationKey.done.rawValue
-        case .description: return BundledRelationKey.description.rawValue
-        case .recommendedLayout: return BundledRelationKey.recommendedLayout.rawValue
+        case .name: BundledRelationKey.name.rawValue
+        case .iconEmoji: BundledRelationKey.iconEmoji.rawValue
+        case .iconObjectId: BundledRelationKey.iconImage.rawValue
+        case .iconName: BundledRelationKey.iconName.rawValue
+        case .iconOption: BundledRelationKey.iconOption.rawValue
+        case .coverId: BundledRelationKey.coverId.rawValue
+        case .coverType: BundledRelationKey.coverType.rawValue
+        case .done: BundledRelationKey.done.rawValue
+        case .description: BundledRelationKey.description.rawValue
+        case .recommendedLayout: BundledRelationKey.recommendedLayout.rawValue
+        case .lastUsedDate: BundledRelationKey.lastUsedDate.rawValue
         }
     }
 
     var value: Google_Protobuf_Value {
         switch self {
-        case .name(let string): return string.protobufValue
-        case .iconEmoji(let string): return string.protobufValue
-        case .iconObjectId(let string): return string.protobufValue
-        case .iconName(let string): return string.protobufValue
-        case .iconOption(let int): return int.protobufValue
-        case .coverId(let string): return string.protobufValue
-        case .coverType(let coverType): return coverType.rawValue.protobufValue
-        case .done(let bool): return bool.protobufValue
-        case .description(let string): return string.protobufValue
-        case .recommendedLayout(let layout): return layout.protobufValue
+        case .name(let string): string.protobufValue
+        case .iconEmoji(let string): string.protobufValue
+        case .iconObjectId(let string): string.protobufValue
+        case .iconName(let string): string.protobufValue
+        case .iconOption(let int): int.protobufValue
+        case .coverId(let string): string.protobufValue
+        case .coverType(let coverType): coverType.rawValue.protobufValue
+        case .done(let bool): bool.protobufValue
+        case .description(let string): string.protobufValue
+        case .recommendedLayout(let layout): layout.protobufValue
+        case .lastUsedDate(let date): date.protobufValue
         }
     }
 

Modules/Services/Sources/Models/ObjectType.swift

@@ -1,5 +1,6 @@
 import ProtobufMessages
 import AnytypeCore
+import Foundation
 
 
 public struct ObjectType: Equatable, Hashable, Codable, Identifiable, Sendable {
@@ -24,6 +25,8 @@ public struct ObjectType: Equatable, Hashable, Codable, Identifiable, Sendable {
     public let recommendedHiddenRelations: [ObjectId]
     public let recommendedLayout: DetailsLayout?
 
+    public let lastUsedDate: Date?
+    
     public init(
         id: String,
         name: String,
@@ -42,7 +45,8 @@ public struct ObjectType: Equatable, Hashable, Codable, Identifiable, Sendable {
         recommendedRelations: [ObjectId],
         recommendedFeaturedRelations: [ObjectId],
         recommendedHiddenRelations: [ObjectId],
-        recommendedLayout: DetailsLayout?
+        recommendedLayout: DetailsLayout?,
+        lastUsedDate: Date?
     ) {
         self.id = id
         self.name = name
@@ -62,6 +66,7 @@ public struct ObjectType: Equatable, Hashable, Codable, Identifiable, Sendable {
         self.recommendedFeaturedRelations = recommendedFeaturedRelations
         self.recommendedHiddenRelations = recommendedHiddenRelations
         self.recommendedLayout = recommendedLayout
+        self.lastUsedDate = lastUsedDate
     }
 }
 
@@ -86,7 +91,8 @@ extension ObjectType: DetailsModel {
             recommendedRelations: details.recommendedRelations,
             recommendedFeaturedRelations: details.recommendedFeaturedRelations,
             recommendedHiddenRelations: details.recommendedHiddenRelations,
-            recommendedLayout: details.recommendedLayoutValue
+            recommendedLayout: details.recommendedLayoutValue,
+            lastUsedDate: details.lastUsedDate
         )
     }
 
@@ -114,7 +120,8 @@ extension ObjectType: DetailsModel {
             BundledRelationKey.defaultTemplateId,
             BundledRelationKey.restrictions,
             BundledRelationKey.resolvedLayout,
-            BundledRelationKey.type
+            BundledRelationKey.type,
+            BundledRelationKey.lastUsedDate
         ]
     }