Skip to content

Commit

Permalink
[Collections] Change image when accessoryType changes (#2354)
Browse files Browse the repository at this point in the history
Clients were unable to change the image of a cell's accessory type without
reloading the entire cell in the collectionView.

Closes #2353
  • Loading branch information
Robert Moore committed Nov 6, 2017
1 parent b9edf03 commit 5b33ae0
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 1 deletion.
3 changes: 2 additions & 1 deletion components/CollectionCells/src/MDCCollectionViewCell.m
Expand Up @@ -222,7 +222,8 @@ - (void)layoutForegroundSubviews {
- (void)setAccessoryType:(MDCCollectionViewCellAccessoryType)accessoryType {
_accessoryType = accessoryType;

UIImageView *accessoryImageView = nil;
UIImageView *accessoryImageView =
[_accessoryView isKindOfClass:[UIImageView class]] ? (UIImageView *)_accessoryView : nil;
if (!_accessoryView && accessoryType != MDCCollectionViewCellAccessoryNone) {
// Add accessory view.
accessoryImageView = [[MDCAccessoryTypeImageView alloc] initWithFrame:CGRectZero];
Expand Down
42 changes: 42 additions & 0 deletions components/CollectionCells/tests/unit/MDCCollectionViewCellTests.m
@@ -0,0 +1,42 @@
/*
Copyright 2017-present the Material Components for iOS authors. All Rights Reserved.
Licensed under the Apache License Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing software
distributed under the License is distributed on an "AS IS" BASIS
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

#import <XCTest/XCTest.h>
#import "MaterialCollections.h"

@interface MDCCollectionViewCellTests : XCTestCase

@end

@implementation MDCCollectionViewCellTests

- (void)testAccessoryChange {
// Given
MDCCollectionViewCell *cell = [[MDCCollectionViewCell alloc] initWithFrame:CGRectZero];
cell.accessoryType = MDCCollectionViewCellAccessoryCheckmark;
XCTAssertTrue([cell.accessoryView isKindOfClass:[UIImageView class]]);
UIImageView *accessoryImageView = (UIImageView *)cell.accessoryView;
UIImage *originalImage = accessoryImageView.image;

// When
cell.accessoryType = MDCCollectionViewCellAccessoryDetailButton;

// Then
UIImage *newImage = accessoryImageView.image;
XCTAssertNotEqualObjects(originalImage, newImage);
}

@end

0 comments on commit 5b33ae0

Please sign in to comment.