Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223965
Change subject: dismiss search keyboard on scroll
......................................................................
dismiss search keyboard on scroll
and cause search bar to resign first responder when an item is selected
in the list
Bug: T105397
Change-Id: I4f518bea03300e08a355e3bf8d1cdd71d6e19286
---
M Wikipedia/UI-V5/WMFArticleListCollectionViewController.h
M Wikipedia/UI-V5/WMFArticleListCollectionViewController.m
M Wikipedia/UI-V5/WMFSearchViewController.m
M Wikipedia/UI-V5/iPhone_Root.storyboard
4 files changed, 21 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/65/223965/1
diff --git a/Wikipedia/UI-V5/WMFArticleListCollectionViewController.h
b/Wikipedia/UI-V5/WMFArticleListCollectionViewController.h
index 441c292..260fbd3 100644
--- a/Wikipedia/UI-V5/WMFArticleListCollectionViewController.h
+++ b/Wikipedia/UI-V5/WMFArticleListCollectionViewController.h
@@ -9,11 +9,18 @@
WMFArticleListModeBottomStacked
};
+@protocol WMFArticleListViewControllerDelegate <NSObject>
+
+- (void)didSelectItem;
+
+@end
+
@interface WMFArticleListCollectionViewController : UICollectionViewController
@property (nonatomic, strong) MWKDataStore* dataStore;
@property (nonatomic, strong) MWKSavedPageList* savedPages;
@property (nonatomic, strong, nullable) id<WMFArticleListDataSource>
dataSource;
+@property (nonatomic, weak) IBOutlet id<WMFArticleListViewControllerDelegate>
delegate;
@property (nonatomic, assign, readonly) WMFArticleListMode mode;
diff --git a/Wikipedia/UI-V5/WMFArticleListCollectionViewController.m
b/Wikipedia/UI-V5/WMFArticleListCollectionViewController.m
index ed45ec3..5389d09 100644
--- a/Wikipedia/UI-V5/WMFArticleListCollectionViewController.m
+++ b/Wikipedia/UI-V5/WMFArticleListCollectionViewController.m
@@ -252,6 +252,8 @@
vc.transitioningDelegate = self.cardTransition;
vc.modalPresentationStyle =
UIModalPresentationCustom;
+ [self.delegate didSelectItem];
+
[self presentViewController:vc animated:YES completion:NULL];
}
diff --git a/Wikipedia/UI-V5/WMFSearchViewController.m
b/Wikipedia/UI-V5/WMFSearchViewController.m
index ae4b8ad..285d6fa 100644
--- a/Wikipedia/UI-V5/WMFSearchViewController.m
+++ b/Wikipedia/UI-V5/WMFSearchViewController.m
@@ -14,7 +14,7 @@
static NSUInteger const kWMFMinResultsBeforeAutoFullTextSearch = 12;
@interface WMFSearchViewController ()
-
+<WMFArticleListViewControllerDelegate>
@property (nonatomic, strong) WMFArticleListCollectionViewController*
resultsListController;
@property (strong, nonatomic) IBOutlet UISearchBar* searchBar;
@property (strong, nonatomic) IBOutlet UIButton* searchSuggestionButton;
@@ -77,6 +77,8 @@
- (void)viewDidLoad {
[super viewDidLoad];
+ self.resultsListController.delegate = self;
+ self.resultsListController.collectionView.keyboardDismissMode =
UIScrollViewKeyboardDismissModeOnDrag;
[self updateUIWithResults:nil];
}
@@ -186,4 +188,10 @@
[self searchForSearchTerm:self.searchBar.text];
}
+#pragma mark - WMFArticleListViewControllerDelegate
+
+- (void)didSelectItem {
+ [self.searchBar resignFirstResponder];
+}
+
@end
diff --git a/Wikipedia/UI-V5/iPhone_Root.storyboard
b/Wikipedia/UI-V5/iPhone_Root.storyboard
index a7ce4ca..e8d306e 100644
--- a/Wikipedia/UI-V5/iPhone_Root.storyboard
+++ b/Wikipedia/UI-V5/iPhone_Root.storyboard
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version="3.0" toolsVersion="7706" systemVersion="15A204h"
targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"
useTraitCollections="YES" initialViewController="O8j-Xm-zXE">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version="3.0" toolsVersion="7706" systemVersion="14E46"
targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"
useTraitCollections="YES" initialViewController="O8j-Xm-zXE">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version="7703"/>
@@ -179,7 +179,7 @@
<objects>
<collectionViewController
storyboardIdentifier="WMFArticleListCollectionViewController"
useStoryboardIdentifierAsRestorationIdentifier="YES" id="qVm-oc-aaW"
customClass="WMFArticleListCollectionViewController"
sceneMemberID="viewController">
<collectionView key="view" clipsSubviews="YES"
multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES"
dataMode="prototypes" id="cbI-aA-luO">
- <rect key="frame" x="0.0" y="0.0" width="600"
height="536"/>
+ <rect key="frame" x="0.0" y="0.0" width="600"
height="496"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<animations/>
<collectionViewLayout key="collectionViewLayout"
id="OM6-RR-VUO" customClass="TGLStackedLayout"/>
@@ -229,6 +229,6 @@
<image name="logo-onboarding" width="210" height="192"/>
</resources>
<inferredMetricsTieBreakers>
- <segue reference="cBL-3f-yBc"/>
+ <segue reference="2dT-rC-ziD"/>
</inferredMetricsTieBreakers>
</document>
--
To view, visit https://gerrit.wikimedia.org/r/223965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f518bea03300e08a355e3bf8d1cdd71d6e19286
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: 5.0
Gerrit-Owner: Bgerstle <bgers...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
