changed how the keyboard resizes the collection view

Author: evilpenguin

ARMRef/ARMRef/Source/CollectionView/ACollectionView.m

@@ -30,16 +30,39 @@ @implementation ACollectionView
 #pragma mark - ACollectionView
 
 - (instancetype) init {
-    if (self = [super initWithFrame:CGRectZero collectionViewLayout:UICollectionViewFlowLayout.new]) {
+    if (self = [super initWithFrame:CGRectZero collectionViewLayout:ACollectionView._layout]) {
         self.backgroundColor                            = [UIColor colorFromHex:0x333e48];
         self.contentInset                               = UIEdgeInsetsMake(10.0f, 0.0f, 10.0f, 0.0f);
         self.alwaysBounceVertical                       = YES;
         self.translatesAutoresizingMaskIntoConstraints  = NO;
 
         [self registerClass:ACollectionViewCell.class forCellWithReuseIdentifier:ACollectionViewCell.identifier];
+        
+        [NSNotificationCenter.defaultCenter addObserver:self
+                                               selector:@selector(_keyboardWillChangeFrameNotification:)
+                                                   name:UIKeyboardWillChangeFrameNotification
+                                                 object:nil];
     }
 
     return self;
 }
 
+#pragma mark - Private
+
++ (UICollectionViewFlowLayout *) _layout {
+    UICollectionViewFlowLayout *layout = UICollectionViewFlowLayout.new;
+    layout.sectionInset = UIEdgeInsetsMake(0.0f, 10.0f, 0.0f, 10.0f);
+    layout.scrollDirection = UICollectionViewScrollDirectionVertical;
+    layout.sectionInsetReference = UICollectionViewFlowLayoutSectionInsetFromContentInset;
+    
+    return layout;
+}
+
+- (void) _keyboardWillChangeFrameNotification:(NSNotification *)notification {
+    CGRect endKeyboardFrame = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+    
+    CGFloat bottomInset = (endKeyboardFrame.origin.y > self.bounds.size.height ? 10.0f : endKeyboardFrame.size.height + 10.0f);
+    self.contentInset = UIEdgeInsetsMake(10.0f, 0.0f, bottomInset, 0.0f);
+}
+
 @end

ARMRef/ARMRef/Source/CollectionView/ACollectionViewCell.m

@@ -54,11 +54,11 @@ - (void) layoutSubviews {
     [super layoutSubviews];
 
     // Top label
-    CGSize topSize = [self.topLabel sizeThatFits:CGSizeMake(self.bounds.size.width - 10.0f, CGFLOAT_MAX)];
+    CGSize topSize = [self.topLabel sizeThatFits:CGSizeMake(self.contentView.bounds.size.width - 20.0f, CGFLOAT_MAX)];
     self.topLabel.frame = CGRectMake(10.0f, 9.0f, topSize.width, topSize.height);
 
     // Bottom label
-    CGSize bottomSize = [self.bottomLabel sizeThatFits:CGSizeMake(self.bounds.size.width - 10.0f, CGFLOAT_MAX)];
+    CGSize bottomSize = [self.bottomLabel sizeThatFits:CGSizeMake(self.contentView.bounds.size.width - 20.0f, CGFLOAT_MAX)];
     self.bottomLabel.frame = CGRectMake(10.0f, CGRectGetMaxY(self.topLabel.frame), bottomSize.width, bottomSize.height);
 }
 
@@ -83,12 +83,12 @@ + (NSString *) identifier {
 - (CGFloat) maxSizeForInstruction:(AInstruction *)instruction withWidth:(CGFloat)width {
     self.topLabel.text = instruction.mnemonic;
     self.bottomLabel.text = instruction.shortDesc;
+    
+    CGFloat padding = 18.0f;
+    CGSize topSize = [self.topLabel sizeThatFits:CGSizeMake(width, CGFLOAT_MAX)];
+    CGSize bottomSize = [self.bottomLabel sizeThatFits:CGSizeMake(width, CGFLOAT_MAX)];
 
-    CGFloat finalWidth = width - 10.0f;
-    CGSize topSize = [self.topLabel sizeThatFits:CGSizeMake(finalWidth, CGFLOAT_MAX)];
-    CGSize bottomSize = [self.bottomLabel sizeThatFits:CGSizeMake(finalWidth, CGFLOAT_MAX)];
-
-    return topSize.height + bottomSize.height + 18.0f;
+    return topSize.height + bottomSize.height + padding;
 }
 
 #pragma mark - Setters

ARMRef/ARMRef/Source/CollectionView/ACollectionViewDataHandle.m

@@ -67,17 +67,17 @@ - (CGSize) collectionView:(UICollectionView *)collectionView layout:(UICollectio
     ACollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:ACollectionViewCell.identifier forIndexPath:indexPath];
     cell.instruction = self.instructions[indexPath.row];
 
-    CGFloat maxSize = [cell maxSizeForInstruction:self.instructions[indexPath.row] withWidth:collectionView.bounds.size.width];
+    CGFloat maxSize = [cell maxSizeForInstruction:self.instructions[indexPath.row] withWidth:collectionView.bounds.size.width - 20.0f];
 
-    return CGSizeMake(collectionView.bounds.size.width, maxSize);
+    return CGSizeMake(collectionView.bounds.size.width - 20.0f, maxSize);
 }
 
 - (UIEdgeInsets) collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section {
-    return UIEdgeInsetsZero;
+    return UIEdgeInsetsMake(0.0f, 10.0f, 0.0f, 10.0f);
 }
 
 - (CGFloat) collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section {
-    return 4.0f;
+    return 10.0f;
 }
 
 - (CGFloat) collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section {

ARMRef/ARMRef/Source/Main/AMainViewController.m

@@ -35,7 +35,6 @@ @interface AMainViewController () <UISearchBarDelegate, ACollectionViewDelegates
 @property (nonatomic, strong) UILabel *noDataLabel;
 @property (nonatomic, strong) ACollectionView *collectionView;
 @property (nonatomic, strong) ACollectionViewDataHandle *collectionViewDataHandle;
-@property (nonatomic, assign) CGRect keyboardFrame;
 
 @end
 
@@ -52,12 +51,6 @@ - (instancetype) initWithLoader:(AInstructionLoader *)loader {
                                                selector:@selector(_loaderNotification:)
                                                    name:AInstructionLoaderFinishedNotificaton
                                                  object:nil];
-        
-        [NSNotificationCenter.defaultCenter addObserver:self
-                                               selector:@selector(_keyboardWillChangeFrameNotification:)
-                                                   name:UIKeyboardWillChangeFrameNotification
-                                                 object:nil];
-        
     }
 
     return self;
@@ -92,12 +85,10 @@ - (void) viewWillLayoutSubviews {
     self.noDataLabel.frame = self.view.bounds;
 
     // Collection view
-    CGFloat padding = (!leftRightInset ? 8.0f : 0.0f);
-    CGRect collectionViewFrame = CGRectMake(self.view.safeAreaInsets.left + padding,
+    CGRect collectionViewFrame = CGRectMake(self.view.safeAreaInsets.left,
                                             CGRectGetMaxY(self.searchBar.frame) + 5.0f,
-                                            self.view.bounds.size.width - (leftRightInset + (padding * 2.0f)),
+                                            self.view.bounds.size.width - leftRightInset,
                                             self.view.bounds.size.height - (CGRectGetMaxY(self.searchBar.frame) + 5.0f));
-    if (self.searchBar.isFirstResponder) collectionViewFrame.size.height -= self.keyboardFrame.size.height;
 
     self.collectionView.frame = collectionViewFrame;
     [self.collectionView.collectionViewLayout invalidateLayout];
@@ -137,12 +128,6 @@ - (void) _showNoDataStyle:(BOOL)show {
     self.collectionView.alpha = (show ? 0.0f : 1.0f);
 }
 
-- (void) _keyboardWillChangeFrameNotification:(NSNotification *)notification {
-    self.keyboardFrame = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
-    
-    [self.view setNeedsLayout];
-}
-
 #pragma mark - Lazy
 
 - (UISearchBar *) searchBar {