kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[iOS] limit maximum number of tags

Browse source
This commit is contained in:
Aleksey Belouosv 2019-02-19 14:50:08 +03:00 • committed by Vlad Mihaylenko
parent d3ee951a7f
commit ba67812393
7 changed files with 74 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard
View file

@ -378,7 +378,6 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="ugc_route_tags_desc"/>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
</userDefinedRuntimeAttributes>
@ -501,7 +500,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SIGHTSEEING" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W6H-nE-Qck">
<rect key="frame" x="0.0" y="4.5" width="81" height="15"/>
<rect key="frame" x="0.0" y="5" width="81" height="14"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.38" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@ -512,10 +511,9 @@
</label>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="W6H-nE-Qck" secondAttribute="bottom" constant="4.5" id="LKQ-m7-WEA"/>
<constraint firstAttribute="bottom" secondItem="W6H-nE-Qck" secondAttribute="bottom" constant="5" id="LKQ-m7-WEA"/>
<constraint firstItem="W6H-nE-Qck" firstAttribute="leading" secondItem="hXP-fc-7dB" secondAttribute="leading" id="d7f-3h-5kl"/>
<constraint firstItem="W6H-nE-Qck" firstAttribute="top" secondItem="hXP-fc-7dB" secondAttribute="top" constant="4.5" id="iWV-zZ-MWl"/>
<constraint firstItem="W6H-nE-Qck" firstAttribute="centerY" secondItem="hXP-fc-7dB" secondAttribute="centerY" id="nGi-NO-wpI"/>
<constraint firstItem="W6H-nE-Qck" firstAttribute="top" secondItem="hXP-fc-7dB" secondAttribute="top" constant="5" id="iWV-zZ-MWl"/>
</constraints>
<connections>
<outlet property="title" destination="W6H-nE-Qck" id="B5d-tx-YaA"/>
@ -555,6 +553,7 @@
<simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
<connections>
<outlet property="collectionView" destination="UZU-x1-VBd" id="o5u-kl-mKw"/>
<outlet property="descriptionLabel" destination="tjK-HW-d6t" id="dpY-62-3jn"/>
<outlet property="doneButton" destination="qY7-OC-33A" id="EoL-xY-8JM"/>
<outlet property="loadingTagsView" destination="tUs-JB-h8i" id="Hhx-T9-H1Q"/>
<outlet property="progressView" destination="RMh-DN-eFb" id="TwY-gF-3Rb"/>

39
iphone/Maps/Bookmarks/Categories/Sharing/Tags/SharingTagsViewController.swift
View file

@ -4,11 +4,15 @@ protocol SharingTagsViewControllerDelegate: AnyObject {
}
final class SharingTagsViewController: MWMViewController {
@IBOutlet private weak var loadingTagsView: UIView!
@IBOutlet private weak var progressView: UIView!
@IBOutlet private weak var collectionView: UICollectionView!
@IBOutlet private weak var doneButton: UIBarButtonItem!
@IBOutlet private weak var descriptionLabel: UILabel! {
didSet {
descriptionLabel.text = ""
}
}
private lazy var progress: MWMCircularProgress = {
return MWMCircularProgress(parentView: progressView)
@ -16,6 +20,7 @@ final class SharingTagsViewController: MWMViewController {
let dataSource = TagsDataSource()
weak var delegate: SharingTagsViewControllerDelegate?
var isSelectionAvailable = true
let kTagCellIdentifier = "TagCellIdentifier"
let kTagHeaderIdentifier = "TagHeaderIdentifier"
@ -24,7 +29,9 @@ final class SharingTagsViewController: MWMViewController {
super.viewDidLoad()
title = L("ugc_route_tags_screen_label")
descriptionLabel.text = String(coreFormat: L("ugc_route_tags_desc"),
arguments:[dataSource.maxNumberOfTagsToSelect])
doneButton.isEnabled = false
navigationItem.rightBarButtonItem = doneButton
navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel,
@ -46,6 +53,8 @@ final class SharingTagsViewController: MWMViewController {
self.loadingTagsView.isHidden = true
if success {
self.descriptionLabel.text = String(coreFormat: L("ugc_route_tags_desc"),
arguments:[self.dataSource.maxNumberOfTagsToSelect])
self.collectionView.reloadData()
} else {
MWMAlertViewController.activeAlert().presentTagsLoadingErrorAlert(okBlock: { [weak self] in
@ -84,7 +93,8 @@ final class SharingTagsViewController: MWMViewController {
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kTagCellIdentifier,for: indexPath) as! TagCollectionViewCell
cell.update(with: dataSource.tag(in: indexPath.section, at: indexPath.item))
cell.update(with: dataSource.tag(in: indexPath.section, at: indexPath.item),
enabled: cell.isSelected || isSelectionAvailable)
//we need to do this because of bug - ios 12 doesnt apply layout to cells until scrolling
if #available(iOS 12.0, *) {
@ -107,6 +117,11 @@ final class SharingTagsViewController: MWMViewController {
func collectionView(_ collectionView: UICollectionView,
didSelectItemAt indexPath: IndexPath) {
doneButton.isEnabled = true
if collectionView.indexPathsForSelectedItems?.count == dataSource.maxNumberOfTagsToSelect {
isSelectionAvailable = false
reloadUnselectedCells()
}
}
func collectionView(_ collectionView: UICollectionView,
@ -116,5 +131,23 @@ final class SharingTagsViewController: MWMViewController {
} else {
doneButton.isEnabled = false
}
isSelectionAvailable = true
reloadUnselectedCells()
}
func reloadUnselectedCells() {
if let selectedItemsIndexes = collectionView.indexPathsForSelectedItems {
let visibleItemsIndexes = collectionView.indexPathsForVisibleItems
let notSelectedItemsIndexes = visibleItemsIndexes.filter { !selectedItemsIndexes.contains($0) }
UIView.performWithoutAnimation {
collectionView.reloadItems(at: notSelectedItemsIndexes)
}
}
}
func collectionView(_ collectionView: UICollectionView,
shouldSelectItemAt indexPath: IndexPath) -> Bool {
return isSelectionAvailable
}
}

19
iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagCollectionViewCell.swift
View file

@ -10,16 +10,25 @@ final class TagCollectionViewCell: UICollectionViewCell {
}
}
override var isSelected: Bool{
override var isSelected: Bool {
didSet {
containerView.backgroundColor = isSelected ? color : .white()
title.textColor = isSelected ? .whitePrimaryText() : color
updateSelectedState()
}
}
func update(with tag: MWMTag) {
func update(with tag: MWMTag, enabled: Bool) {
title.text = tag.name
color = tag.color
if enabled {
color = tag.color
updateSelectedState()
} else {
color = .blackDividers()
}
}
func updateSelectedState() {
containerView.backgroundColor = isSelected ? color : .white()
title.textColor = isSelected ? .whitePrimaryText() : color
}
override func prepareForReuse() {

8
iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagsCollectionViewLayout.swift
View file

@ -1,5 +1,4 @@
final class TagsCollectionViewLayout: UICollectionViewLayout {
private var headersCache: [IndexPath : UICollectionViewLayoutAttributes] = [:]
private var cellsCache: [IndexPath : UICollectionViewLayoutAttributes] = [:]
fileprivate var contentHeight: CGFloat = 0
@ -40,8 +39,7 @@ final class TagsCollectionViewLayout: UICollectionViewLayout {
let indexPath = IndexPath(item: 0, section: section)
if collectionView.supplementaryView(forElementKind: UICollectionElementKindSectionHeader,
at: indexPath) != nil {
if collectionView.numberOfSections > 0 {
let headerSize = headersCache[indexPath]?.size ?? CGSize(width: contentWidth, height: itemHeight)
let frame = CGRect(x: 0, y: yOffset, width: headerSize.width, height: headerSize.height)
let attr = UICollectionViewLayoutAttributes(forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, with: indexPath)
@ -90,6 +88,10 @@ final class TagsCollectionViewLayout: UICollectionViewLayout {
return visibleLayoutAttributes
}
override func layoutAttributesForItem(at indexPath: IndexPath) -> UICollectionViewLayoutAttributes? {
return cellsCache[indexPath]
}
override public func shouldInvalidateLayout(forPreferredLayoutAttributes preferredAttributes: UICollectionViewLayoutAttributes,
withOriginalAttributes originalAttributes: UICollectionViewLayoutAttributes) -> Bool {

13
iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagsDataSource.swift
View file

@ -1,21 +1,28 @@
final class TagsDataSource: NSObject {
private var tagGroups: [MWMTagGroup] = []
private var maxTagsNumber: Int = 0
func loadTags(onComplete: @escaping (Bool) -> Void) {
MWMBookmarksManager.shared().loadTags { tags in
MWMBookmarksManager.shared().loadTags { tags, maxTagsNumber in
if let tags = tags {
self.tagGroups = tags
self.maxTagsNumber = maxTagsNumber
}
onComplete(!self.tagGroups.isEmpty)
}
}
var tagGroupsCount: NSInteger {
var tagGroupsCount: Int {
get {
return tagGroups.count
}
}
var maxNumberOfTagsToSelect: Int {
get {
return maxTagsNumber
}
}
func tagGroup(at index: Int) -> MWMTagGroup {
return tagGroups[index]

5
iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h
View file

@ -6,9 +6,10 @@
@class MWMTagGroup;
@class MWMTag;
typedef void (^LoadTagsCompletionBlock)(NSArray<MWMTagGroup *> * tags);
NS_ASSUME_NONNULL_BEGIN
typedef void (^LoadTagsCompletionBlock)(NSArray<MWMTagGroup *> * _Nullable tags, NSInteger maxTagsNumber);
@interface MWMBookmarksManager : NSObject
+ (MWMBookmarksManager *)sharedManager;

5
iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
View file

@ -626,7 +626,6 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
- (void)loadTags:(LoadTagsCompletionBlock)completionBlock {
auto onTagsCompletion = [completionBlock](bool success, BookmarkCatalog::TagGroups const & tagGroups, uint32_t maxTagsCount)
{
//TODO(@beloal): Implement maxTagsCount usage.
if (success)
{
NSMutableArray * groups = [NSMutableArray new];
@ -636,9 +635,9 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
[groups addObject:tagGroup];
}
completionBlock([groups copy]);
completionBlock([groups copy], maxTagsCount);
} else
completionBlock(nil);
completionBlock(nil, 0);
};
self.bm.GetCatalog().RequestTagGroups([[AppInfo sharedInfo] languageId].UTF8String, std::move(onTagsCompletion));