Skip to content

Commit

Permalink
IOS-1733 Delete compactListWidget toggle
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgolovko
mgolovko committed Sep 18, 2023
1 parent 9602ff7 commit df4f346
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 136 deletions.
8 changes: 0 additions & 8 deletions Anytype.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,6 @@
2AC906CC29B61A9700209E39 /* RecentWidgetInternalViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC906CB29B61A9700209E39 /* RecentWidgetInternalViewModel.swift */; };
2AC906CE29B61B1F00209E39 /* RecentTreeWidgetModuleAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC906CD29B61B1F00209E39 /* RecentTreeWidgetModuleAssembly.swift */; };
2AC906D029B61DAC00209E39 /* SetsWidgetInternalViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC906CF29B61DAC00209E39 /* SetsWidgetInternalViewModel.swift */; };
2AC906D229B61E0800209E39 /* SetsTreeWidgetModuleAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC906D129B61E0800209E39 /* SetsTreeWidgetModuleAssembly.swift */; };
2AC906D829B6233700209E39 /* ListWidgetViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC906D729B6233700209E39 /* ListWidgetViewModel.swift */; };
2AC906DC29B6276A00209E39 /* ListWidgetModuleAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC906DB29B6276A00209E39 /* ListWidgetModuleAssembly.swift */; };
2AC906DF29B6289A00209E39 /* RecentListWidgetModuleAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC906DD29B6289A00209E39 /* RecentListWidgetModuleAssembly.swift */; };
Expand Down Expand Up @@ -683,7 +682,6 @@
2AFB54692869989D004F7458 /* ObjectType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFB54682869989D004F7458 /* ObjectType+Extensions.swift */; };
2AFCEB3729C89A7B00841E13 /* CollectionsWidgetInternalViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFCEB3629C89A7B00841E13 /* CollectionsWidgetInternalViewModel.swift */; };
2AFCEB3929C8A25900841E13 /* CollectionsSubscriptionService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFCEB3829C8A25900841E13 /* CollectionsSubscriptionService.swift */; };
2AFCEB3B29C8A61800841E13 /* CollectionsTreeWidgetModuleAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFCEB3A29C8A61800841E13 /* CollectionsTreeWidgetModuleAssembly.swift */; };
2AFCEB3D29C8A67700841E13 /* CollectionsListWidgetModuleAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFCEB3C29C8A67700841E13 /* CollectionsListWidgetModuleAssembly.swift */; };
2AFCEB3F29C8A76900841E13 /* WidgetObjectListCollectionsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFCEB3E29C8A76900841E13 /* WidgetObjectListCollectionsViewModel.swift */; };
2AFCEB4329CC808D00841E13 /* HomeWidgetsRecentStateManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFCEB4229CC808D00841E13 /* HomeWidgetsRecentStateManager.swift */; };
Expand Down Expand Up @@ -2128,7 +2126,6 @@
2AC906CB29B61A9700209E39 /* RecentWidgetInternalViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentWidgetInternalViewModel.swift; sourceTree = "<group>"; };
2AC906CD29B61B1F00209E39 /* RecentTreeWidgetModuleAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentTreeWidgetModuleAssembly.swift; sourceTree = "<group>"; };
2AC906CF29B61DAC00209E39 /* SetsWidgetInternalViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetsWidgetInternalViewModel.swift; sourceTree = "<group>"; };
2AC906D129B61E0800209E39 /* SetsTreeWidgetModuleAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetsTreeWidgetModuleAssembly.swift; sourceTree = "<group>"; };
2AC906D729B6233700209E39 /* ListWidgetViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetViewModel.swift; sourceTree = "<group>"; };
2AC906DB29B6276A00209E39 /* ListWidgetModuleAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetModuleAssembly.swift; sourceTree = "<group>"; };
2AC906DD29B6289A00209E39 /* RecentListWidgetModuleAssembly.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecentListWidgetModuleAssembly.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2241,7 +2238,6 @@
2AFB54682869989D004F7458 /* ObjectType+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ObjectType+Extensions.swift"; sourceTree = "<group>"; };
2AFCEB3629C89A7B00841E13 /* CollectionsWidgetInternalViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionsWidgetInternalViewModel.swift; sourceTree = "<group>"; };
2AFCEB3829C8A25900841E13 /* CollectionsSubscriptionService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionsSubscriptionService.swift; sourceTree = "<group>"; };
2AFCEB3A29C8A61800841E13 /* CollectionsTreeWidgetModuleAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionsTreeWidgetModuleAssembly.swift; sourceTree = "<group>"; };
2AFCEB3C29C8A67700841E13 /* CollectionsListWidgetModuleAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionsListWidgetModuleAssembly.swift; sourceTree = "<group>"; };
2AFCEB3E29C8A76900841E13 /* WidgetObjectListCollectionsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetObjectListCollectionsViewModel.swift; sourceTree = "<group>"; };
2AFCEB4229CC808D00841E13 /* HomeWidgetsRecentStateManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeWidgetsRecentStateManager.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -5602,8 +5598,6 @@
2AF4C3DF295D837C00FD7153 /* ObjectTreeWidgetModuleAssembly.swift */,
2AC906C929B609FB00209E39 /* FavoriteTreeWidgetModuleAssembly.swift */,
2AC906CD29B61B1F00209E39 /* RecentTreeWidgetModuleAssembly.swift */,
2AC906D129B61E0800209E39 /* SetsTreeWidgetModuleAssembly.swift */,
2AFCEB3A29C8A61800841E13 /* CollectionsTreeWidgetModuleAssembly.swift */,
);
path = Specific;
sourceTree = "<group>";
Expand Down Expand Up @@ -10224,7 +10218,6 @@
1211AF6627F338EC00BACB88 /* AnytypeImageDownloader.swift in Sources */,
3D1CEC2827F38A38000D36BA /* AccountStatus.swift in Sources */,
2AA8108A29A66854007DD64B /* View+DragAndDrop.swift in Sources */,
2AC906D229B61E0800209E39 /* SetsTreeWidgetModuleAssembly.swift in Sources */,
2AF4260129AF3A6000753B17 /* SettingsAppearanceViewModel.swift in Sources */,
2EDC2AFD2A125C6A0065E009 /* JoinFlowStep.swift in Sources */,
12B691D227F4CB5D00A0C336 /* ImageGuideline.swift in Sources */,
Expand Down Expand Up @@ -10661,7 +10654,6 @@
EAFDEFBF26381E22001B07E4 /* UITextView+Convenience.swift in Sources */,
12887F26274B94A600228330 /* DetailsServiceProtocol.swift in Sources */,
C9F44C7F27E351400078E709 /* TextBlockLeadingViewBuilder.swift in Sources */,
2AFCEB3B29C8A61800841E13 /* CollectionsTreeWidgetModuleAssembly.swift in Sources */,
2A28D050297FCFE400E55E15 /* WidgetContainerView.swift in Sources */,
53FF7CB526FCCDE800A5A592 /* ObjectActionRow.swift in Sources */,
2A1F946E2978208F00E25782 /* ListWidgetView.swift in Sources */,
Expand Down
19 changes: 0 additions & 19 deletions Anytype/Sources/PresentationLayer/Assemblies/WidgetsSubmoduleDI.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ protocol WidgetsSubmoduleDIProtocol {
func favoriteTreeWidgetModuleAssembly() -> HomeWidgetCommonAssemblyProtocol
func recentEditTreeWidgetModuleAssembly() -> HomeWidgetCommonAssemblyProtocol
func recentOpenTreeWidgetModuleAssembly() -> HomeWidgetCommonAssemblyProtocol
// Delete with compactListWidget toggle
func setsTreeWidgetModuleAssembly() -> HomeWidgetCommonAssemblyProtocol
func collectionsTreeWidgetModuleAssembly() -> HomeWidgetCommonAssemblyProtocol
// MARK: - List
func listWidgetModuleAssembly() -> ListWidgetModuleAssemblyProtocol
func setListWidgetModuleAssembly() -> HomeWidgetCommonAssemblyProtocol
Expand Down Expand Up @@ -70,14 +67,6 @@ final class WidgetsSubmoduleDI: WidgetsSubmoduleDIProtocol {
widgetAssembly: recentOpenTreeWidgetModuleAssembly(),
output: widgetOutput
),
setsTreeWidgetProviderAssembly: HomeWidgetCommonProviderAssembly(
widgetAssembly: setsTreeWidgetModuleAssembly(),
output: widgetOutput
),
collectionsTreeWidgetProviderAssembly: HomeWidgetCommonProviderAssembly(
widgetAssembly: collectionsTreeWidgetModuleAssembly(),
output: widgetOutput
),
setListWidgetProviderAssembly: HomeWidgetCommonProviderAssembly(
widgetAssembly: setListWidgetModuleAssembly(),
output: widgetOutput
Expand Down Expand Up @@ -160,14 +149,6 @@ final class WidgetsSubmoduleDI: WidgetsSubmoduleDIProtocol {
return RecentTreeWidgetModuleAssembly(type: .recentOpen, serviceLocator: serviceLocator, widgetsSubmoduleDI: self)
}

func setsTreeWidgetModuleAssembly() -> HomeWidgetCommonAssemblyProtocol {
return SetsTreeWidgetModuleAssembly(serviceLocator: serviceLocator, widgetsSubmoduleDI: self)
}

func collectionsTreeWidgetModuleAssembly() -> HomeWidgetCommonAssemblyProtocol {
return CollectionsTreeWidgetModuleAssembly(serviceLocator: serviceLocator, widgetsSubmoduleDI: self)
}

// MARK: - List

func listWidgetModuleAssembly() -> ListWidgetModuleAssemblyProtocol {
Expand Down
19 changes: 2 additions & 17 deletions Anytype/Sources/PresentationLayer/Modules/HomeWidgets/Container/HomeWidgetsRegistry.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ final class HomeWidgetsRegistry: HomeWidgetsRegistryProtocol {
private let favoriteTreeWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol
private let recentEditTreeWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol
private let recentOpenTreeWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol
// Delete with compactListWidget toggle
private let setsTreeWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol
private let collectionsTreeWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol
// MARK: - List
private let setListWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol
private let favoriteListWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol
Expand All @@ -54,8 +51,6 @@ final class HomeWidgetsRegistry: HomeWidgetsRegistryProtocol {
favoriteTreeWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol,
recentEditTreeWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol,
recentOpenTreeWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol,
setsTreeWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol,
collectionsTreeWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol,
setListWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol,
favoriteListWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol,
recentEditListWidgetProviderAssembly: HomeWidgetProviderAssemblyProtocol,
Expand All @@ -76,8 +71,6 @@ final class HomeWidgetsRegistry: HomeWidgetsRegistryProtocol {
self.favoriteTreeWidgetProviderAssembly = favoriteTreeWidgetProviderAssembly
self.recentEditTreeWidgetProviderAssembly = recentEditTreeWidgetProviderAssembly
self.recentOpenTreeWidgetProviderAssembly = recentOpenTreeWidgetProviderAssembly
self.setsTreeWidgetProviderAssembly = setsTreeWidgetProviderAssembly
self.collectionsTreeWidgetProviderAssembly = collectionsTreeWidgetProviderAssembly
self.setListWidgetProviderAssembly = setListWidgetProviderAssembly
self.favoriteListWidgetProviderAssembly = favoriteListWidgetProviderAssembly
self.recentEditListWidgetProviderAssembly = recentEditListWidgetProviderAssembly
Expand Down Expand Up @@ -201,21 +194,13 @@ final class HomeWidgetsRegistry: HomeWidgetsRegistryProtocol {
return nil
}
case (.sets, .tree):
if FeatureFlags.compactListWidget {
return setsCompactListWidgetProviderAssembly
} else {
return setsTreeWidgetProviderAssembly
}
return setsCompactListWidgetProviderAssembly
case (.sets, .list):
return setsListWidgetProviderAssembly
case (.sets, .compactList):
return setsCompactListWidgetProviderAssembly
case (.collections, .tree):
if FeatureFlags.compactListWidget {
return collectionsCompactListWidgetProviderAssembly
} else {
return collectionsTreeWidgetProviderAssembly
}
return collectionsCompactListWidgetProviderAssembly
case (.collections, .list):
return collectionsListWidgetProviderAssembly
case (.collections, .compactList):
Expand Down
38 changes: 0 additions & 38 deletions ...Layer/Modules/HomeWidgets/Widgets/Tree/Specific/CollectionsTreeWidgetModuleAssembly.swift
View file

This file was deleted.

38 changes: 0 additions & 38 deletions ...ntationLayer/Modules/HomeWidgets/Widgets/Tree/Specific/SetsTreeWidgetModuleAssembly.swift
View file

This file was deleted.

6 changes: 0 additions & 6 deletions Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/FeatureDescription+Flags.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@ public extension FeatureDescription {
defaultValue: true
)

static let compactListWidget = FeatureDescription(
title: "Compact List widget",
type: .feature(author: "m@anytype.io", releaseVersion: "0.23.0"),
defaultValue: true
)

static let getMoreSpace = FeatureDescription(
title: "Get more space - IOS-1307",
type: .feature(author: "m@anytype.io", releaseVersion: "0.23.0"),
Expand Down
5 changes: 0 additions & 5 deletions Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/Generated/FeatureFlags+Flags.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ public extension FeatureFlags {
value(for: .migrationGuide)
}

static var compactListWidget: Bool {
value(for: .compactListWidget)
}

static var getMoreSpace: Bool {
value(for: .getMoreSpace)
}
Expand Down Expand Up @@ -93,7 +89,6 @@ public extension FeatureFlags {
.fullInlineSetImpl,
.dndOnCollectionsAndSets,
.migrationGuide,
.compactListWidget,
.getMoreSpace,
.deleteObjectPlaceholder,
.showAllFilesInBin,
Expand Down
6 changes: 1 addition & 5 deletions Modules/Services/Sources/Models/Block/BlockConverters/BlockWidgetConverter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ public extension Anytype_Model_Block.Content.Widget.Layout {
case .list:
return .list
case .compactList:
if FeatureFlags.compactListWidget {
return .compactList
} else {
return .list
}
return .compactList
case .UNRECOGNIZED:
anytypeAssertionFailure("UNRECOGNIZED layout type", info: ["type": "\(rawValue)"])
throw WidgetLayoutError.valueUnrecognized
Expand Down

0 comments on commit df4f346

Please sign in to comment.