Present selector as modal #6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,43 +5,60 @@ import Eureka | |
| import Foundation | ||
|
|
||
| public final class LocationCell: PushSelectorCell<CLPlacemark> { | ||
| @IBOutlet public weak var clearButton: UIButton! | ||
|
|
||
| required init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { | ||
| super.init(style: style, reuseIdentifier: reuseIdentifier) | ||
|
|
||
| let clearButton = UIButton(frame: CGRect(x: 0, y: 0, width: 18, height: 18)) | ||
| clearButton.setImage(UIImage(named: "Clear", in: Bundle.current, compatibleWith: nil)?.withRenderingMode(.alwaysTemplate), for: .normal) | ||
| clearButton.tintColor = .lightGray | ||
|
|
||
| self.clearButton = clearButton | ||
|
|
||
| accessoryView = clearButton | ||
| editingAccessoryView = accessoryView | ||
| } | ||
|
|
||
| required init?(coder aDecoder: NSCoder) { | ||
| super.init(coder: aDecoder) | ||
| } | ||
|
|
||
| deinit { | ||
| clearButton?.removeTarget(self, action: nil, for: .allEvents) | ||
| } | ||
|
|
||
| public override func setup() { | ||
| super.setup() | ||
|
|
||
| clearButton.addTarget(self, action: #selector(LocationCell.clear), for: .touchUpInside) | ||
| } | ||
|
|
||
| public override func update() { | ||
| super.update() | ||
|
|
||
| detailTextLabel?.text = nil | ||
|
|
||
| guard let row = self.row as? LocationRow else { return } | ||
|
|
||
| let isEmpty = row.value?.name?.isEmpty ?? true | ||
|
|
||
| textLabel?.text = row.value?.name ?? row.placeholder | ||
| textLabel?.textColor = isEmpty ? UIColor(red: 198 / 255, green: 198 / 255, blue: 204 / 255, alpha: 1) : row.isDisabled ? .gray : .black | ||
|
|
||
| clearButton.isHidden = isEmpty | ||
| clearButton.isEnabled = !row.isDisabled | ||
| } | ||
|
|
||
| @objc | ||
| func clear() { | ||
| row.value = nil | ||
| update() | ||
| } | ||
| } | ||
|
|
||
| public final class LocationRow: Row<LocationCell>, RowType, PresenterRowType { | ||
| public typealias PresenterRow = LocationNavigationController | ||
|
|
||
| public var presentationMode: PresentationMode<PresenterRow>? | ||
| public var onPresentCallback: ((FormViewController, PresenterRow) -> Void)? | ||
|
|
@@ -50,35 +67,34 @@ public final class LocationRow: Row<LocationCell>, RowType, PresenterRowType { | |
|
|
||
| public required init(tag: String?) { | ||
| super.init(tag: tag) | ||
| } | ||
|
|
||
| public override func customDidSelect() { | ||
| super.customDidSelect() | ||
|
|
||
| guard !isDisabled else { return } | ||
|
There was a problem hiding this comment. Maybe we can allow the user to set up a title and use the detailTextView as the value. By doing that the user can opt by leaving empty the title and we will get the same result as now. I would recommend to add the cell clear button as cell accessoryView. We also have to change cell color title when row is disabled in order to indicate that. Take a look at switchCell to see how we do it.
Owner
Author
There was a problem hiding this comment.
Done in f04a8b0
Owner
Author
There was a problem hiding this comment.
Done in ccd09f6
Owner
Author
There was a problem hiding this comment.
@mtnbarreto There are a couple of reasons I would prefer the leave this as is (at least for the moment), where only the
Let me know if these reasonings are acceptable. |
||
|
|
||
| presentationMode = PresentationMode.presentModally(controllerProvider: ControllerProvider.callback { | ||
chamitha marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| let bar = LocationViewController(nibName: "LocationViewController", bundle: Bundle.current) | ||
| return LocationNavigationController(rootViewController: bar) | ||
| }, onDismiss: { viewController in | ||
| viewController.presentingViewController?.dismiss(animated: true) | ||
| }) | ||
|
|
||
| guard let presentationMode = presentationMode, !isDisabled else { return } | ||
|
|
||
| if let controller = presentationMode.makeController() { | ||
| controller.row = self | ||
|
|
||
| onPresentCallback?(cell.formViewController()!, controller) | ||
|
|
||
| controller.topViewController?.title = controller.title | ||
|
|
||
| presentationMode.present(controller, row: self, presentingController: cell.formViewController()!) | ||
| } else { | ||
| presentationMode.present(nil, row: self, presentingController: cell.formViewController()!) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private extension Bundle { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.