IOS-1733 Delete deleteObjectPlaceholder toggle

Chefski · Sep 18, 2023 · 42d57ef · 42d57ef
1 parent 918ccc5
commit 42d57ef
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 117 deletions.
diff --git a/Anytype/Sources/Models/Relations/RelationsBuilder.swift b/Anytype/Sources/Models/Relations/RelationsBuilder.swift
@@ -434,7 +434,7 @@ private extension RelationsBuilder {
 
                 return Relation.Object.Option(
                     id: objectDetail.id,
-                    icon: FeatureFlags.deleteObjectPlaceholder ? objectDetail.objectIconImage: objectDetail.objectIconImageWithPlaceholder,
+                    icon: objectDetail.objectIconImage,
                     title: objectDetail.title,
                     type: objectDetail.objectType.name,
                     isArchived: objectDetail.isArchived,
@@ -477,7 +477,7 @@ private extension RelationsBuilder {
             let objectOptions: [Relation.File.Option] = objectDetails.map { objectDetail in      
                 return Relation.File.Option(
                     id: objectDetail.id,
-                    icon: FeatureFlags.deleteObjectPlaceholder ? objectDetail.objectIconImage : objectDetail.objectIconImageWithPlaceholder,
+                    icon: objectDetail.objectIconImage,
                     title: objectDetail.title,
                     editorScreenData: objectDetail.editorScreenData()
                 )

diff --git a/...Common/SwiftUI/RelationDetailsViews/OptionsList/Rows/Objects/RelationObjectsRowView.swift b/...Common/SwiftUI/RelationDetailsViews/OptionsList/Rows/Objects/RelationObjectsRowView.swift
@@ -8,12 +8,7 @@ struct RelationObjectsRowView: View {
 
     var body: some View {
         HStack(alignment: .center, spacing: 0) {
-            if FeatureFlags.deleteObjectPlaceholder {
-                icon
-            } else {
-                legacyIcon
-                Spacer.fixedWidth(12)
-            }
+            icon
             text
             Spacer()
         }
@@ -23,19 +18,6 @@ struct RelationObjectsRowView: View {
         }
     }
 
-    @ViewBuilder
-    private var legacyIcon: some View {
-        if let icon = object.icon {
-            Group {
-                if object.isDeleted {
-                    Image(asset: .ghost).resizable().frame(width: 28, height: 28)
-                } else {
-                    IconView(icon: icon)
-                }
-            }.frame(width: 48, height: 48)
-        }
-    }
-
     @ViewBuilder
     private var icon: some View {
         if object.isDeleted {

diff --git a/...Common/SwiftUI/Relations/RelationViewProvider/ValueViews/SwiftUI/ObjectRelationView.swift b/...Common/SwiftUI/Relations/RelationViewProvider/ValueViews/SwiftUI/ObjectRelationView.swift
@@ -31,22 +31,12 @@ struct ObjectRelationView: View {
     private func objectView(option: Relation.Object.Option) -> some View {
         HStack(spacing: style.objectRelationStyle.hSpaсingObject) {
 
-            if FeatureFlags.deleteObjectPlaceholder {
-                if let icon = option.icon, shouldShowIcon(icon: icon) {
-                    IconView(icon: icon)
-                        .frame(
-                            width: style.objectRelationStyle.size.width,
-                            height: style.objectRelationStyle.size.height
-                        )
-                }
-            } else {
-                if let icon = option.icon, shouldShowIconLegacy(icon: icon) {
-                    IconView(icon: icon)
-                        .frame(
-                            width: style.objectRelationStyle.size.width,
-                            height: style.objectRelationStyle.size.height
-                        )
-                }
+            if let icon = option.icon, shouldShowIcon(icon: icon) {
+                IconView(icon: icon)
+                    .frame(
+                        width: style.objectRelationStyle.size.width,
+                        height: style.objectRelationStyle.size.height
+                    )
             }
 
             AnytypeText(
@@ -94,19 +84,6 @@ struct ObjectRelationView: View {
             return style.fontColor
         }
     }
-
-    // Delete with FeatureFlags.deleteObjectPlaceholder
-    private func shouldShowIconLegacy(icon: Icon) -> Bool {
-        if case .object(.placeholder) = icon {
-            return false
-        }
-        switch style {
-        case .regular, .set, .filter, .setCollection, .kanbanHeader:
-            return true
-        case .featuredRelationBlock(let settings):
-            return settings.showIcon
-        }
-    }
 
     private func shouldShowIcon(icon: Icon) -> Bool {
         switch style {

diff --git a/.../Relations/RelationViewProvider/ValueViews/UIKit/ObjectView/ObjectRelationViewUIKit.swift b/.../Relations/RelationViewProvider/ValueViews/UIKit/ObjectView/ObjectRelationViewUIKit.swift
@@ -35,24 +35,13 @@ private extension ObjectRelationViewUIKit {
     }
 
     func setupIconViewIfNeeded() {
-
-        if FeatureFlags.deleteObjectPlaceholder {
-            guard let icon = option.icon else {
-                iconView.isHidden = true
-                return
-            }
-
-            iconView.icon = icon
-            iconView.isHidden = false
-        } else {
-            guard let icon = option.icon, shouldShowIcon(icon: icon) else {
-                iconView.isHidden = true
-                return
-            }
-
-            iconView.icon = icon
-            iconView.isHidden = false
+        guard let icon = option.icon else {
+            iconView.isHidden = true
+            return
         }
+
+        iconView.icon = icon
+        iconView.isHidden = false
     }
 
     func setupTitleLabel() {
@@ -89,15 +78,4 @@ private extension ObjectRelationViewUIKit {
             return relationStyle.uiKitFontColor
         }
     }
-
-    // Delete with FeatureFlags.deleteObjectPlaceholder
-    func shouldShowIcon(icon: Icon) -> Bool {
-        switch icon {
-        case .object(.placeholder):
-            return false
-        default:
-            return true
-        }
-    }
-
 }
diff --git a/Anytype/Sources/PresentationLayer/Common/SwiftUI/Search/Model/LinkToObjectSearchData.swift b/Anytype/Sources/PresentationLayer/Common/SwiftUI/Search/Model/LinkToObjectSearchData.swift
@@ -22,7 +22,7 @@ struct LinkToObjectSearchData: SearchDataProtocol {
         self.description = details.description
         self.callout = details.objectType.name
         self.typeId = details.objectType.id
-        self.iconImage = FeatureFlags.deleteObjectPlaceholder ? details.objectIconImage : details.objectIconImageWithPlaceholder
+        self.iconImage = details.objectIconImage
         self.editorScreenData = details.editorScreenData()
     }
 

diff --git a/Anytype/Sources/PresentationLayer/Common/SwiftUI/Search/Model/ObjectSearchData.swift b/Anytype/Sources/PresentationLayer/Common/SwiftUI/Search/Model/ObjectSearchData.swift
@@ -53,6 +53,6 @@ extension ObjectSearchData {
     }
 
     var iconImage: Icon? {
-        FeatureFlags.deleteObjectPlaceholder ? details.objectIconImage : details.objectIconImageWithPlaceholder
+        details.objectIconImage
     }
 }
diff --git a/Anytype/Sources/PresentationLayer/Common/SwiftUI/Search/SearchView/Cell/SearchCell.swift b/Anytype/Sources/PresentationLayer/Common/SwiftUI/Search/SearchView/Cell/SearchCell.swift
@@ -13,9 +13,7 @@ struct SearchCell<SearchData: SearchDataProtocol>: View {
             Spacer()
         }
         .frame(height: 68)
-        .if(FeatureFlags.deleteObjectPlaceholder, transform: {
-            $0.newDivider()
-        })
+        .newDivider()
         .padding(.horizontal, 16)
     }
 
@@ -49,9 +47,6 @@ struct SearchCell<SearchData: SearchDataProtocol>: View {
             }
 
             Spacer()
-            if !FeatureFlags.deleteObjectPlaceholder {
-                AnytypeDivider()
-            }
         }
     }
 

diff --git a/...InternalViewModels/ObjectTypesSearchViewModel/MultiselectObjectTypesSearchViewModel.swift b/...InternalViewModels/ObjectTypesSearchViewModel/MultiselectObjectTypesSearchViewModel.swift
@@ -92,7 +92,7 @@ private extension SearchObjectRowView.Model {
 
     init(details: ObjectDetails) {
         let title = details.title
-        self.icon = FeatureFlags.deleteObjectPlaceholder ? details.objectIconImage : details.objectIconImageWithPlaceholder
+        self.icon = details.objectIconImage
         self.title = title
         self.subtitle = details.description
         self.style = .default

diff --git a/...rch screen/InternalViewModels/ObjectTypesSearchViewModel/ObjectTypesSearchViewModel.swift b/...rch screen/InternalViewModels/ObjectTypesSearchViewModel/ObjectTypesSearchViewModel.swift
@@ -131,7 +131,7 @@ private extension SearchObjectRowView.Model {
 
     init(details: ObjectDetails, isChecked: Bool) {
         let title = details.title
-        self.icon = FeatureFlags.deleteObjectPlaceholder ? details.objectIconImage : details.objectIconImageWithPlaceholder
+        self.icon = details.objectIconImage
         self.title = title
         self.subtitle = details.description
         self.style = .default

diff --git a/...ayer/Search screen/InternalViewModels/ObjectsSearchViewModel/ObjectsSearchViewModel.swift b/...ayer/Search screen/InternalViewModels/ObjectsSearchViewModel/ObjectsSearchViewModel.swift
@@ -118,7 +118,7 @@ private extension SearchObjectRowView.Model {
 
     init(details: ObjectDetails) {
         let title = details.title
-        self.icon = FeatureFlags.deleteObjectPlaceholder ? details.objectIconImage : details.objectIconImageWithPlaceholder
+        self.icon = details.objectIconImage
         self.title = title
         self.subtitle = details.objectType.name
         self.style = .default

diff --git a/...Search screen/InternalViewModels/ObjectsSearchViewModel/RowView/SearchObjectRowView.swift b/...Search screen/InternalViewModels/ObjectsSearchViewModel/RowView/SearchObjectRowView.swift
@@ -23,11 +23,7 @@ struct SearchObjectRowView: View {
             }
         }
         .frame(height: viewModel.style.rowHeight)
-        .if(FeatureFlags.deleteObjectPlaceholder, if: {
-            $0.newDivider()
-        }, else: {
-            $0.divider(leadingPadding: viewModel.style.leadingDividerPadding)
-        })
+        .newDivider()
         .padding(.horizontal, 20)
     }
 
@@ -93,15 +89,6 @@ extension SearchObjectRowView {
                 }
             }
 
-            var leadingDividerPadding: CGFloat {
-                switch self {
-                case .default:
-                    return 60
-                case .compact:
-                    return 0
-                }
-            }
-
             var titleFont: AnytypeFont {
                 switch self {
                 case .default:

diff --git a/...h screen/InternalViewModels/WidgetSourceSearchViewModel/WidgetSourceSearchViewModel.swift b/...h screen/InternalViewModels/WidgetSourceSearchViewModel/WidgetSourceSearchViewModel.swift
@@ -143,7 +143,7 @@ private extension SearchObjectRowView.Model {
 
     init(details: ObjectDetails) {
         let title = details.title
-        self.icon = FeatureFlags.deleteObjectPlaceholder ? details.objectIconImage : details.objectIconImageWithPlaceholder
+        self.icon = details.objectIconImage
         self.title = title
         self.subtitle = details.description
         self.style = .default

diff --git a/...es/PresentationLayer/TextEditor/Set/Views/Popups/Filters/List/RelationFilterBuilder.swift b/...es/PresentationLayer/TextEditor/Set/Views/Popups/Filters/List/RelationFilterBuilder.swift
@@ -135,7 +135,7 @@ private extension RelationFilterBuilder {
             let objectOptions: [Relation.Object.Option] = objectDetails.map { objectDetail in
                 return Relation.Object.Option(
                     id: objectDetail.id,
-                    icon: FeatureFlags.deleteObjectPlaceholder ? objectDetail.objectIconImage : objectDetail.objectIconImageWithPlaceholder,
+                    icon: objectDetail.objectIconImage,
                     title: objectDetail.title,
                     type: objectDetail.objectType.name,
                     isArchived: objectDetail.isArchived,
@@ -348,7 +348,7 @@ private extension RelationFilterBuilder {
             let objectOptions: [Relation.File.Option] = objectDetails.map { objectDetail in
                 return Relation.File.Option(
                     id: objectDetail.id,
-                    icon: FeatureFlags.deleteObjectPlaceholder ? objectDetail.objectIconImage : objectDetail.objectIconImageWithPlaceholder,
+                    icon: objectDetail.objectIconImage,
                     title: objectDetail.title,
                     editorScreenData: objectDetail.editorScreenData()
                 )

diff --git a/Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/FeatureDescription+Flags.swift b/Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/FeatureDescription+Flags.swift
@@ -34,12 +34,6 @@ public extension FeatureDescription {
         defaultValue: true
     )
 
-    static let deleteObjectPlaceholder = FeatureDescription(
-        title: "Delete object placeholder - IOS-960",
-        type: .feature(author: "m@anytype.io", releaseVersion: "0.23.0"),
-        defaultValue: true
-    )
-
     static let showAllFilesInBin = FeatureDescription(
         title: "Show all files in bin - IOS-1408",
         type: .feature(author: "m@anytype.io", releaseVersion: "0.24.0"),

diff --git a/Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/Generated/FeatureFlags+Flags.swift b/Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/Generated/FeatureFlags+Flags.swift
@@ -26,10 +26,6 @@ public extension FeatureFlags {
         value(for: .migrationGuide)
     }
 
-    static var deleteObjectPlaceholder: Bool {
-        value(for: .deleteObjectPlaceholder)
-    }
-
     static var showAllFilesInBin: Bool {
         value(for: .showAllFilesInBin)
     }
@@ -85,7 +81,6 @@ public extension FeatureFlags {
         .fullInlineSetImpl,
         .dndOnCollectionsAndSets,
         .migrationGuide,
-        .deleteObjectPlaceholder,
         .showAllFilesInBin,
         .superNewButtonLoadingState,
         .openBinObject,