From b79367fbd08b3c1d2b42c22549f775c80fd3bc2e Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sun, 6 Oct 2019 19:40:28 +0300 Subject: [PATCH] Add support for "hidden" smart asset group --- .../LegacyComponents/TGMediaAssetGroup.h | 3 ++- .../LegacyComponents/TGMediaAssetGroup.m | 10 ++++++++++ .../LegacyComponents/TGMediaAssetsModernLibrary.m | 4 ---- .../LegacyComponents/TGMediaGroupCell.m | 7 +++++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetGroup.h b/submodules/LegacyComponents/LegacyComponents/TGMediaAssetGroup.h index 758ff65571..6b1285e4b8 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetGroup.h +++ b/submodules/LegacyComponents/LegacyComponents/TGMediaAssetGroup.h @@ -17,7 +17,8 @@ typedef enum TGMediaAssetGroupSubtypeBursts, TGMediaAssetGroupSubtypeScreenshots, TGMediaAssetGroupSubtypeAnimated, - TGMediaAssetGroupSubtypeRegular + TGMediaAssetGroupSubtypeRegular, + TGMediaAssetGroupSubtypeHidden } TGMediaAssetGroupSubtype; @interface TGMediaAssetGroup : NSObject diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetGroup.m b/submodules/LegacyComponents/LegacyComponents/TGMediaAssetGroup.m index 0524ed7f3a..90e62d345e 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetGroup.m +++ b/submodules/LegacyComponents/LegacyComponents/TGMediaAssetGroup.m @@ -245,6 +245,10 @@ case PHAssetCollectionSubtypeSmartAlbumAnimated: return TGMediaAssetGroupSubtypeAnimated; + + case PHAssetCollectionSubtypeSmartAlbumAllHidden: + return TGMediaAssetGroupSubtypeHidden; + default: return TGMediaAssetGroupSubtypeRegular; } @@ -360,6 +364,12 @@ } } + case PHAssetCollectionSubtypeSmartAlbumAllHidden: + { + return true; + } + break; + default: { return false; diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsModernLibrary.m b/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsModernLibrary.m index 418a112c11..c374a5727b 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsModernLibrary.m +++ b/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsModernLibrary.m @@ -61,10 +61,6 @@ PHFetchOptions *options = [[PHFetchOptions alloc] init]; options.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"startDate" ascending:true]]; - //PHFetchResult *moments = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeMoment subtype:PHAssetCollectionSubtypeAny options:options]; - //TGMediaAssetMomentList *momentList = [[TGMediaAssetMomentList alloc] initWithPHFetchResult:moments]; - //[groups insertObject:momentList atIndex:0]; - return groups; }]; }; diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaGroupCell.m b/submodules/LegacyComponents/LegacyComponents/TGMediaGroupCell.m index 641ed6f722..cdab6b8179 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGMediaGroupCell.m +++ b/submodules/LegacyComponents/LegacyComponents/TGMediaGroupCell.m @@ -276,8 +276,7 @@ const CGFloat TGMediaGroupCellHeight = 86.0f; _countLabel.text = [[NSString alloc] initWithFormat:@"%ld", (long)assetGroup.assetCount]; [self setNeedsLayout]; - [self configureThumbnailsWithAssets:[assetGroup latestAssets]]; - + bool hideThumbnail = false; UIImage *iconImage = nil; switch (assetGroup.subtype) { @@ -313,10 +312,14 @@ const CGFloat TGMediaGroupCellHeight = 86.0f; iconImage = TGComponentsImageNamed(@"MediaGroupSelfPortraits"); break; + case TGMediaAssetGroupSubtypeHidden: + hideThumbnail = true; default: break; } + [self configureThumbnailsWithAssets:hideThumbnail ? @[] : [assetGroup latestAssets]]; + _iconView.image = iconImage; _iconView.hidden = (iconImage == nil); _shadowView.hidden = _iconView.hidden;