forked from organicmaps/organicmaps-tmp
[iOS] [refactoring] More Reviews screen refactoring
This commit is contained in:
Aleksey Belouosv
Alexander Boriskov
parent
8f2deb56fb
commit
db09944606
13 changed files with 473 additions and 423 deletions
|
|
@ -8,13 +8,13 @@ extension UIView {
|
|||
subviews.forEach { $0.clearTreeBackground() }
|
||||
}
|
||||
|
||||
func alignToSuperview() {
|
||||
func alignToSuperview(_ insets: UIEdgeInsets = .zero) {
|
||||
translatesAutoresizingMaskIntoConstraints = false
|
||||
NSLayoutConstraint.activate([
|
||||
topAnchor.constraint(equalTo: superview!.topAnchor),
|
||||
leftAnchor.constraint(equalTo: superview!.leftAnchor),
|
||||
bottomAnchor.constraint(equalTo: superview!.bottomAnchor),
|
||||
rightAnchor.constraint(equalTo: superview!.rightAnchor)
|
||||
topAnchor.constraint(equalTo: superview!.topAnchor, constant: insets.top),
|
||||
leftAnchor.constraint(equalTo: superview!.leftAnchor, constant: insets.left),
|
||||
bottomAnchor.constraint(equalTo: superview!.bottomAnchor, constant: insets.bottom),
|
||||
rightAnchor.constraint(equalTo: superview!.rightAnchor, constant: insets.right)
|
||||
])
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -335,7 +335,6 @@
|
|||
470A89FD21342A9D00D72FBF /* TutorialBlurView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470A89FC21342A9D00D72FBF /* TutorialBlurView.swift */; };
|
||||
470A89FF2134517600D72FBF /* BookmarksTutorialBlur.xib in Resources */ = {isa = PBXBuildFile; fileRef = 470A89FE2134517600D72FBF /* BookmarksTutorialBlur.xib */; };
|
||||
470A8A012136097000D72FBF /* SubwayTutorialBlur.xib in Resources */ = {isa = PBXBuildFile; fileRef = 470A8A002136073000D72FBF /* SubwayTutorialBlur.xib */; };
|
||||
470F0B7A23882955006AEC94 /* PlacePageReviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470F0B7923882955006AEC94 /* PlacePageReviewViewController.swift */; };
|
||||
470F0B7D238842EA006AEC94 /* ExpandableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470F0B7C238842EA006AEC94 /* ExpandableLabel.swift */; };
|
||||
470F0B7F2388431E006AEC94 /* StarRatingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470F0B7E2388431E006AEC94 /* StarRatingView.swift */; };
|
||||
470F5A5B2181DE7500754295 /* PaidRouteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470F5A592181DE7400754295 /* PaidRouteViewController.swift */; };
|
||||
|
|
@ -359,7 +358,6 @@
|
|||
472848FB238573EE00176158 /* RatingSummaryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472848FA238573EE00176158 /* RatingSummaryViewController.swift */; };
|
||||
472848FD2386A17500176158 /* AddReviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472848FC2386A17300176158 /* AddReviewViewController.swift */; };
|
||||
472848FF2386BE6E00176158 /* PlacePageReviewsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472848FE2386BE6E00176158 /* PlacePageReviewsViewController.swift */; };
|
||||
472849012388098300176158 /* MyReviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472849002388098300176158 /* MyReviewViewController.swift */; };
|
||||
47289E5A2212DFFF002ABFC0 /* EditOnWebAlertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47289E582212DFFF002ABFC0 /* EditOnWebAlertViewController.swift */; };
|
||||
47289E5B2212DFFF002ABFC0 /* EditOnWebAlertViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47289E592212DFFF002ABFC0 /* EditOnWebAlertViewController.xib */; };
|
||||
4728F69322CF89A400E00028 /* GradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4728F69222CF89A400E00028 /* GradientView.swift */; };
|
||||
|
|
@ -393,6 +391,9 @@
|
|||
4788738F20EE30B300F6826B /* LayersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4788738D20EE30B300F6826B /* LayersViewController.swift */; };
|
||||
4788739020EE30B300F6826B /* LayersViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4788738E20EE30B300F6826B /* LayersViewController.xib */; };
|
||||
4788739220EE326500F6826B /* VerticallyAlignedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4788739120EE326400F6826B /* VerticallyAlignedButton.swift */; };
|
||||
478F6FA423C447E500054A53 /* ReviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 478F6FA323C447E500054A53 /* ReviewView.swift */; };
|
||||
478F6FA623C4521F00054A53 /* MoreReviewsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 478F6FA523C4521F00054A53 /* MoreReviewsViewController.swift */; };
|
||||
478F6FA823C5067C00054A53 /* MyReviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 478F6FA723C5067C00054A53 /* MyReviewView.swift */; };
|
||||
479388F92395A4D3006ECACC /* ActionBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 479388F82395A4D3006ECACC /* ActionBarViewController.swift */; };
|
||||
479D305722C627CB00D18278 /* MWMMegafonBannerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 479D305522C627CB00D18278 /* MWMMegafonBannerViewController.xib */; };
|
||||
479D305B22C62F4000D18278 /* MWMBookmarksBannerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 479D305922C62F4000D18278 /* MWMBookmarksBannerViewController.xib */; };
|
||||
|
|
@ -1420,7 +1421,6 @@
|
|||
470A89FC21342A9D00D72FBF /* TutorialBlurView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialBlurView.swift; sourceTree = "<group>"; };
|
||||
470A89FE2134517600D72FBF /* BookmarksTutorialBlur.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarksTutorialBlur.xib; sourceTree = "<group>"; };
|
||||
470A8A002136073000D72FBF /* SubwayTutorialBlur.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SubwayTutorialBlur.xib; sourceTree = "<group>"; };
|
||||
470F0B7923882955006AEC94 /* PlacePageReviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageReviewViewController.swift; sourceTree = "<group>"; };
|
||||
470F0B7C238842EA006AEC94 /* ExpandableLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpandableLabel.swift; sourceTree = "<group>"; };
|
||||
470F0B7E2388431E006AEC94 /* StarRatingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarRatingView.swift; sourceTree = "<group>"; };
|
||||
470F5A592181DE7400754295 /* PaidRouteViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaidRouteViewController.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -1445,7 +1445,6 @@
|
|||
472848FA238573EE00176158 /* RatingSummaryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RatingSummaryViewController.swift; sourceTree = "<group>"; };
|
||||
472848FC2386A17300176158 /* AddReviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddReviewViewController.swift; sourceTree = "<group>"; };
|
||||
472848FE2386BE6E00176158 /* PlacePageReviewsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageReviewsViewController.swift; sourceTree = "<group>"; };
|
||||
472849002388098300176158 /* MyReviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyReviewViewController.swift; sourceTree = "<group>"; };
|
||||
47289E582212DFFF002ABFC0 /* EditOnWebAlertViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditOnWebAlertViewController.swift; sourceTree = "<group>"; };
|
||||
47289E592212DFFF002ABFC0 /* EditOnWebAlertViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EditOnWebAlertViewController.xib; sourceTree = "<group>"; };
|
||||
4728F69222CF89A400E00028 /* GradientView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = GradientView.swift; path = CustomViews/GradientView.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -1485,6 +1484,9 @@
|
|||
4788738D20EE30B300F6826B /* LayersViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayersViewController.swift; sourceTree = "<group>"; };
|
||||
4788738E20EE30B300F6826B /* LayersViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LayersViewController.xib; sourceTree = "<group>"; };
|
||||
4788739120EE326400F6826B /* VerticallyAlignedButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VerticallyAlignedButton.swift; sourceTree = "<group>"; };
|
||||
478F6FA323C447E500054A53 /* ReviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewView.swift; sourceTree = "<group>"; };
|
||||
478F6FA523C4521F00054A53 /* MoreReviewsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreReviewsViewController.swift; sourceTree = "<group>"; };
|
||||
478F6FA723C5067C00054A53 /* MyReviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyReviewView.swift; sourceTree = "<group>"; };
|
||||
479388F82395A4D3006ECACC /* ActionBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionBarViewController.swift; sourceTree = "<group>"; };
|
||||
4797A4DB226F4B2900D3A984 /* DeepLinkHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeepLinkHandler.swift; sourceTree = "<group>"; };
|
||||
479D305522C627CB00D18278 /* MWMMegafonBannerViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MWMMegafonBannerViewController.xib; sourceTree = "<group>"; };
|
||||
|
|
@ -3392,6 +3394,8 @@
|
|||
children = (
|
||||
470F0B7C238842EA006AEC94 /* ExpandableLabel.swift */,
|
||||
470F0B7E2388431E006AEC94 /* StarRatingView.swift */,
|
||||
478F6FA323C447E500054A53 /* ReviewView.swift */,
|
||||
478F6FA723C5067C00054A53 /* MyReviewView.swift */,
|
||||
);
|
||||
path = Views;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -4470,8 +4474,7 @@
|
|||
472848FA238573EE00176158 /* RatingSummaryViewController.swift */,
|
||||
472848FC2386A17300176158 /* AddReviewViewController.swift */,
|
||||
472848FE2386BE6E00176158 /* PlacePageReviewsViewController.swift */,
|
||||
472849002388098300176158 /* MyReviewViewController.swift */,
|
||||
470F0B7923882955006AEC94 /* PlacePageReviewViewController.swift */,
|
||||
478F6FA523C4521F00054A53 /* MoreReviewsViewController.swift */,
|
||||
47F701F5238C8A8300D18E95 /* PlacePageButtonsViewController.swift */,
|
||||
47A0416C238DBB6200D84E95 /* HotelPhotosViewController.swift */,
|
||||
47A0416E238DD0FD00D84E95 /* HotelDescriptionViewController.swift */,
|
||||
|
|
@ -5481,6 +5484,7 @@
|
|||
349D1ADE1E2E325C004A2006 /* MWMBottomMenuViewController.mm in Sources */,
|
||||
BB87BF8A22FAF1CA008A8A72 /* TracksSection.mm in Sources */,
|
||||
6741A9EC1BF340DE002C974C /* MWMCircularProgress.m in Sources */,
|
||||
478F6FA423C447E500054A53 /* ReviewView.swift in Sources */,
|
||||
99CB34C3236AEAEA001D28AD /* WhatsNewController.swift in Sources */,
|
||||
470A89FD21342A9D00D72FBF /* TutorialBlurView.swift in Sources */,
|
||||
342CC5F21C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm in Sources */,
|
||||
|
|
@ -5578,7 +5582,6 @@
|
|||
34FE5A6F1F18F30F00BCA729 /* TrafficButtonArea.swift in Sources */,
|
||||
F6E2FF691E097BA00083EBEC /* MWMUnitsController.mm in Sources */,
|
||||
6741AA031BF340DE002C974C /* MWMActivityViewController.mm in Sources */,
|
||||
472849012388098300176158 /* MyReviewViewController.swift in Sources */,
|
||||
CDCA27382237F1BD00167D87 /* BookmarkInfo.swift in Sources */,
|
||||
993F5509237C622700545511 /* DeepLinkHandlerStrategy.swift in Sources */,
|
||||
34AB668C1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */,
|
||||
|
|
@ -5590,6 +5593,7 @@
|
|||
472E3F472146BCD30020E412 /* SubscriptionManager.swift in Sources */,
|
||||
F6E2FE131E097BA00083EBEC /* MWMOpeningHoursTimeSelectorTableViewCell.mm in Sources */,
|
||||
344532311F6FE5880059FBCC /* UGCSummaryRatingStarsCell.swift in Sources */,
|
||||
478F6FA623C4521F00054A53 /* MoreReviewsViewController.swift in Sources */,
|
||||
F626D52F1C3E83F800C17D15 /* MWMTableViewCell.m in Sources */,
|
||||
34AB66591FC5AA330078E451 /* TransportTransitFlowLayout.swift in Sources */,
|
||||
99CB34962369C281001D28AD /* FirstLaunchBuilder.swift in Sources */,
|
||||
|
|
@ -5645,6 +5649,7 @@
|
|||
B32FE74020D2844600EF7446 /* DownloadedBookmarksViewController.swift in Sources */,
|
||||
4707E4B62375B2900017DF6E /* PlacePagePreviewViewController.swift in Sources */,
|
||||
340416541E7C09C200E2B6D6 /* PhotoScalingView.swift in Sources */,
|
||||
478F6FA823C5067C00054A53 /* MyReviewView.swift in Sources */,
|
||||
4767CDA820AB401000BD8166 /* LinkTextView.swift in Sources */,
|
||||
47289E5A2212DFFF002ABFC0 /* EditOnWebAlertViewController.swift in Sources */,
|
||||
34763EE71F2F392300F4D2D3 /* MWMTextToSpeech.mm in Sources */,
|
||||
|
|
@ -5790,7 +5795,6 @@
|
|||
F5BD29FF26AD58255766C51A /* DiscoverySpinnerCell.swift in Sources */,
|
||||
47E3C72B2111E62A008B3B27 /* FadeOutAnimatedTransitioning.swift in Sources */,
|
||||
F5BD255A0838E70EC012748E /* DiscoverySearchCell.swift in Sources */,
|
||||
470F0B7A23882955006AEC94 /* PlacePageReviewViewController.swift in Sources */,
|
||||
47C7F9732191E15A00C2760C /* InAppBilling.swift in Sources */,
|
||||
F5BD2CA4DBEFACBC48195F39 /* DiscoveryCollectionHolderCell.swift in Sources */,
|
||||
);
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ class HotelDescriptionViewController: UIViewController {
|
|||
|
||||
var hotelDescription: String? {
|
||||
didSet {
|
||||
descriptionExpandableLabel.textLabel.text = hotelDescription
|
||||
descriptionExpandableLabel.text = hotelDescription
|
||||
}
|
||||
}
|
||||
weak var delegate: HotelDescriptionViewControllerDelegate?
|
||||
|
|
@ -16,13 +16,12 @@ class HotelDescriptionViewController: UIViewController {
|
|||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
|
||||
descriptionExpandableLabel.textLabel.numberOfLines = 3
|
||||
descriptionExpandableLabel.textLabel.text = hotelDescription
|
||||
descriptionExpandableLabel.textLabel.font = UIFont.regular16()
|
||||
descriptionExpandableLabel.textLabel.textColor = UIColor.blackPrimaryText()
|
||||
descriptionExpandableLabel.expandButton.setTitleColor(UIColor.linkBlue(), for: .normal)
|
||||
descriptionExpandableLabel.expandButton.titleLabel?.font = UIFont.regular16()
|
||||
descriptionExpandableLabel.expandButton.setTitle(L("booking_show_more"), for: .normal)
|
||||
descriptionExpandableLabel.numberOfLines = 3
|
||||
descriptionExpandableLabel.text = hotelDescription
|
||||
descriptionExpandableLabel.font = UIFont.regular16()
|
||||
descriptionExpandableLabel.textColor = UIColor.blackPrimaryText()
|
||||
descriptionExpandableLabel.expandColor = UIColor.linkBlue()
|
||||
descriptionExpandableLabel.expandText = L("booking_show_more")
|
||||
}
|
||||
|
||||
@IBAction func onMoreButton(_ sender: UIButton) {
|
||||
|
|
|
|||
97
iphone/Maps/UI/PlacePage/MoreReviewsViewController.swift
Normal file
97
iphone/Maps/UI/PlacePage/MoreReviewsViewController.swift
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
final class MyReviewCell: MWMTableViewCell {
|
||||
@IBOutlet var myReviewView: MyReviewView!
|
||||
|
||||
override func awakeFromNib() {
|
||||
super.awakeFromNib()
|
||||
myReviewView.defaultConfig()
|
||||
}
|
||||
|
||||
func config(_ myReview: UgcMyReview,
|
||||
formatter: DateFormatter,
|
||||
expanded: Bool,
|
||||
onExpand: @escaping ExpandableLabel.OnExpandClosure) {
|
||||
myReviewView.defaultConfig()
|
||||
myReviewView.reviewView.authorLabel.text = L("placepage_reviews_your_comment")
|
||||
myReviewView.reviewView.dateLabel.text = formatter.string(from: myReview.date)
|
||||
myReviewView.reviewView.reviewLabel.text = myReview.text
|
||||
myReviewView.reviewView.reviewLabel.numberOfLines = expanded ? 0 : 2
|
||||
myReviewView.reviewView.reviewLabel.onExpandClosure = onExpand
|
||||
|
||||
for i in 0..<3 {
|
||||
if myReview.starRatings.count > i {
|
||||
let starRating = myReview.starRatings[i]
|
||||
myReviewView.ratingViews[i].nameLabel.text = L(starRating.title)
|
||||
myReviewView.ratingViews[i].starRatingView.rating = Int(round(starRating.value))
|
||||
} else {
|
||||
myReviewView.ratingViews[i].isHidden = true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
final class UserReviewCell: MWMTableViewCell {
|
||||
@IBOutlet var reviewView: ReviewView!
|
||||
|
||||
override func awakeFromNib() {
|
||||
super.awakeFromNib()
|
||||
reviewView.defaultConfig()
|
||||
}
|
||||
|
||||
func config(_ review: UgcReview, formatter: DateFormatter, expanded: Bool, onExpand: @escaping ExpandableLabel.OnExpandClosure) {
|
||||
reviewView.authorLabel.text = review.author
|
||||
reviewView.dateLabel.text = formatter.string(from: review.date)
|
||||
reviewView.reviewLabel.text = review.text
|
||||
reviewView.reviewLabel.numberOfLines = expanded ? 0 : 2
|
||||
reviewView.reviewLabel.onExpandClosure = onExpand
|
||||
}
|
||||
}
|
||||
|
||||
final class MoreReviewsViewController: MWMTableViewController {
|
||||
private var expanded: [Bool] = []
|
||||
|
||||
var ugcData: UgcData? {
|
||||
didSet {
|
||||
expanded = Array<Bool>(repeating: false, count: tableView.numberOfRows(inSection: 0))
|
||||
}
|
||||
}
|
||||
|
||||
private lazy var dateFormatter: DateFormatter = {
|
||||
let formatter = DateFormatter()
|
||||
formatter.dateStyle = .long
|
||||
formatter.timeStyle = .none
|
||||
return formatter
|
||||
} ()
|
||||
|
||||
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
|
||||
let reviewsCount = ugcData?.reviews.count ?? 0
|
||||
return reviewsCount + (ugcData?.myReview != nil ? 1 : 0);
|
||||
}
|
||||
|
||||
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
|
||||
if let myReview = ugcData?.myReview, indexPath.item == 0 {
|
||||
let cell = tableView.dequeueReusableCell(withIdentifier: "MyReviewCell", for: indexPath) as! MyReviewCell
|
||||
cell.config(myReview, formatter: dateFormatter, expanded: expanded[indexPath.row]) { [unowned self] expandClosure in
|
||||
tableView.performBatchUpdates({
|
||||
self.expanded[indexPath.row] = true
|
||||
expandClosure()
|
||||
})
|
||||
}
|
||||
return cell
|
||||
}
|
||||
|
||||
let cell = tableView.dequeueReusableCell(withIdentifier: "UserReviewCell", for: indexPath) as! UserReviewCell
|
||||
var index = indexPath.item - (ugcData?.myReview != nil ? 1 : 0)
|
||||
if index >= ugcData!.reviews.count {
|
||||
index = index % ugcData!.reviews.count
|
||||
}
|
||||
guard let review = ugcData?.reviews[index] else { fatalError() }
|
||||
cell.config(review, formatter: dateFormatter, expanded: expanded[indexPath.row]) { [unowned self] expandClosure in
|
||||
tableView.performBatchUpdates({
|
||||
self.expanded[indexPath.row] = true
|
||||
expandClosure()
|
||||
})
|
||||
}
|
||||
|
||||
return cell
|
||||
}
|
||||
}
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
class MyReviewViewController: UIViewController {
|
||||
@IBOutlet var dateLabel: UILabel!
|
||||
@IBOutlet var expandableLabel: ExpandableLabel! {
|
||||
didSet {
|
||||
expandableLabel.textLabel.font = UIFont.regular14()
|
||||
expandableLabel.textLabel.textColor = UIColor.blackPrimaryText()
|
||||
expandableLabel.expandButton.setTitleColor(UIColor.linkBlue(), for: .normal)
|
||||
expandableLabel.expandButton.titleLabel?.font = UIFont.regular14()
|
||||
expandableLabel.expandButton.setTitle(L("placepage_more_button"), for: .normal)
|
||||
}
|
||||
}
|
||||
|
||||
@IBOutlet var ratingViews: [UIView]!
|
||||
@IBOutlet var ratingLabels: [UILabel]!
|
||||
@IBOutlet var starViews: [StarRatingView]! {
|
||||
didSet {
|
||||
starViews.forEach {
|
||||
$0.activeColor = UIColor.yellow
|
||||
$0.inactiveColor = UIColor.blackDividers()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var myReview: UgcMyReview!
|
||||
lazy var dateFormatter: DateFormatter = {
|
||||
let formatter = DateFormatter()
|
||||
formatter.dateStyle = .long
|
||||
formatter.timeStyle = .none
|
||||
return formatter
|
||||
} ()
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
|
||||
dateLabel.text = dateFormatter.string(from: myReview.date)
|
||||
expandableLabel.textLabel.text = myReview.text
|
||||
|
||||
for i in 0..<3 {
|
||||
if myReview.starRatings.count > i {
|
||||
let starRating = myReview.starRatings[i]
|
||||
ratingLabels[i].text = L(starRating.title)
|
||||
starViews[i].rating = Int(round(starRating.value))
|
||||
} else {
|
||||
ratingViews[i].isHidden = true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bX8-ZQ-XDA">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bX8-ZQ-XDA">
|
||||
<device id="retina5_5" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="Stack View standard spacing" minToolsVersion="9.0"/>
|
||||
<capability name="collection view cell content view" minToolsVersion="11.0"/>
|
||||
|
|
@ -1875,195 +1875,6 @@
|
|||
</objects>
|
||||
<point key="canvasLocation" x="929" y="1225"/>
|
||||
</scene>
|
||||
<!--My Review View Controller-->
|
||||
<scene sceneID="JfG-uh-TGE">
|
||||
<objects>
|
||||
<viewController storyboardIdentifier="MyReviewViewController" id="aI5-Bz-iIT" customClass="MyReviewViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<view key="view" contentMode="scaleToFill" id="Z6m-fj-o9a">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="240"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8zD-Hi-bKz">
|
||||
<rect key="frame" x="16" y="15.999999999999998" width="343" height="20.333333333333329"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="placepage_reviews_your_comment"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="amG-6c-cww">
|
||||
<rect key="frame" x="16" y="40.333333333333336" width="343" height="20.333333333333336"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="50" translatesAutoresizingMaskIntoConstraints="NO" id="t2i-YK-GIT" customClass="ExpandableLabel" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="16" y="68.666666666666686" width="343" height="77.333333333333314"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5Ja-0O-Ugm">
|
||||
<rect key="frame" x="16" y="154" width="359" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="tQz-kq-hmO"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="FLq-6F-G41">
|
||||
<rect key="frame" x="16" y="155" width="359" height="69"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bL2-ab-NQi">
|
||||
<rect key="frame" x="0.0" y="0.0" width="119.66666666666667" height="69"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rating" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nt5-FZ-MhW">
|
||||
<rect key="frame" x="0.0" y="8" width="119.66666666666667" height="14.333333333333336"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" placeholderIntrinsicWidth="100" placeholderIntrinsicHeight="15" translatesAutoresizingMaskIntoConstraints="NO" id="7Le-8Z-nd7" customClass="StarRatingView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="26.333333333333339" width="100" height="42.666666666666657"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="Nt5-FZ-MhW" secondAttribute="trailing" id="4Es-Ad-KQ1"/>
|
||||
<constraint firstItem="Nt5-FZ-MhW" firstAttribute="top" secondItem="bL2-ab-NQi" secondAttribute="top" constant="8" id="E1h-0K-wcW"/>
|
||||
<constraint firstItem="7Le-8Z-nd7" firstAttribute="leading" secondItem="bL2-ab-NQi" secondAttribute="leading" id="Xci-ur-2in"/>
|
||||
<constraint firstItem="7Le-8Z-nd7" firstAttribute="top" secondItem="Nt5-FZ-MhW" secondAttribute="bottom" constant="4" id="d2L-Aj-4Wx"/>
|
||||
<constraint firstAttribute="bottom" secondItem="7Le-8Z-nd7" secondAttribute="bottom" id="hJM-Gx-fMm"/>
|
||||
<constraint firstItem="Nt5-FZ-MhW" firstAttribute="leading" secondItem="bL2-ab-NQi" secondAttribute="leading" id="rFP-8U-vOt"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Haz-z3-DWY">
|
||||
<rect key="frame" x="119.66666666666666" y="0.0" width="119.66666666666666" height="69"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rating" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SBw-rM-tLc">
|
||||
<rect key="frame" x="0.0" y="8" width="119.66666666666667" height="14.333333333333336"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" placeholderIntrinsicWidth="100" placeholderIntrinsicHeight="15" translatesAutoresizingMaskIntoConstraints="NO" id="wK1-4N-yAu" customClass="StarRatingView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="26.333333333333339" width="100" height="42.666666666666657"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="SBw-rM-tLc" secondAttribute="trailing" id="RTK-WM-EFm"/>
|
||||
<constraint firstItem="wK1-4N-yAu" firstAttribute="leading" secondItem="Haz-z3-DWY" secondAttribute="leading" id="beq-i6-Fzo"/>
|
||||
<constraint firstItem="wK1-4N-yAu" firstAttribute="top" secondItem="SBw-rM-tLc" secondAttribute="bottom" constant="4" id="g5Z-GC-tWK"/>
|
||||
<constraint firstAttribute="bottom" secondItem="wK1-4N-yAu" secondAttribute="bottom" id="hIx-k5-NFE"/>
|
||||
<constraint firstItem="SBw-rM-tLc" firstAttribute="top" secondItem="Haz-z3-DWY" secondAttribute="top" constant="8" id="pXg-tL-0S5"/>
|
||||
<constraint firstItem="SBw-rM-tLc" firstAttribute="leading" secondItem="Haz-z3-DWY" secondAttribute="leading" id="usw-SR-Lmg"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vCK-fD-xLD">
|
||||
<rect key="frame" x="239.33333333333334" y="0.0" width="119.66666666666666" height="69"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rating" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lf4-8A-8j5">
|
||||
<rect key="frame" x="0.0" y="8" width="119.66666666666667" height="14.333333333333336"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" placeholderIntrinsicWidth="100" placeholderIntrinsicHeight="15" translatesAutoresizingMaskIntoConstraints="NO" id="N1Q-Q0-IIJ" customClass="StarRatingView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="26.333333333333339" width="100" height="42.666666666666657"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="Lf4-8A-8j5" secondAttribute="trailing" id="MxB-0K-LM8"/>
|
||||
<constraint firstAttribute="bottom" secondItem="N1Q-Q0-IIJ" secondAttribute="bottom" id="NO7-mA-Mya"/>
|
||||
<constraint firstItem="Lf4-8A-8j5" firstAttribute="top" secondItem="vCK-fD-xLD" secondAttribute="top" constant="8" id="PI6-bI-QaF"/>
|
||||
<constraint firstItem="N1Q-Q0-IIJ" firstAttribute="top" secondItem="Lf4-8A-8j5" secondAttribute="bottom" constant="4" id="gF5-wF-HQl"/>
|
||||
<constraint firstItem="Lf4-8A-8j5" firstAttribute="leading" secondItem="vCK-fD-xLD" secondAttribute="leading" id="ugJ-YV-Whi"/>
|
||||
<constraint firstItem="N1Q-Q0-IIJ" firstAttribute="leading" secondItem="vCK-fD-xLD" secondAttribute="leading" id="vTk-lS-dZJ"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
</stackView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1e8-3Q-gU6">
|
||||
<rect key="frame" x="0.0" y="239" width="375" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="RsA-aE-HDq"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<constraints>
|
||||
<constraint firstItem="t2i-YK-GIT" firstAttribute="top" secondItem="amG-6c-cww" secondAttribute="bottom" constant="8" id="4MK-WA-NW2"/>
|
||||
<constraint firstItem="FLq-6F-G41" firstAttribute="top" secondItem="5Ja-0O-Ugm" secondAttribute="bottom" id="7E9-bE-vgf"/>
|
||||
<constraint firstItem="FLq-6F-G41" firstAttribute="leading" secondItem="Z6m-fj-o9a" secondAttribute="leading" constant="16" id="80E-tR-PH7"/>
|
||||
<constraint firstAttribute="bottom" secondItem="1e8-3Q-gU6" secondAttribute="bottom" id="DFf-6f-o5R"/>
|
||||
<constraint firstAttribute="trailing" secondItem="1e8-3Q-gU6" secondAttribute="trailing" id="PaS-q5-yoG"/>
|
||||
<constraint firstAttribute="trailing" secondItem="FLq-6F-G41" secondAttribute="trailing" id="RKc-Tz-Cm2"/>
|
||||
<constraint firstItem="5Ja-0O-Ugm" firstAttribute="top" secondItem="t2i-YK-GIT" secondAttribute="bottom" constant="8" id="ZMy-Tv-U8V"/>
|
||||
<constraint firstAttribute="trailing" secondItem="t2i-YK-GIT" secondAttribute="trailing" constant="16" id="ZvK-BS-cWj"/>
|
||||
<constraint firstAttribute="trailing" secondItem="amG-6c-cww" secondAttribute="trailing" constant="16" id="dCH-GR-m7q"/>
|
||||
<constraint firstItem="amG-6c-cww" firstAttribute="leading" secondItem="Z6m-fj-o9a" secondAttribute="leading" constant="16" id="e9b-zE-OYT"/>
|
||||
<constraint firstItem="t2i-YK-GIT" firstAttribute="leading" secondItem="Z6m-fj-o9a" secondAttribute="leading" constant="16" id="eSG-L5-oJo"/>
|
||||
<constraint firstItem="amG-6c-cww" firstAttribute="top" secondItem="8zD-Hi-bKz" secondAttribute="bottom" constant="4" id="fCB-q9-ul3"/>
|
||||
<constraint firstItem="5Ja-0O-Ugm" firstAttribute="leading" secondItem="Z6m-fj-o9a" secondAttribute="leading" constant="16" id="fCu-Kz-t8u"/>
|
||||
<constraint firstAttribute="trailing" secondItem="5Ja-0O-Ugm" secondAttribute="trailing" id="fXA-m8-4EM"/>
|
||||
<constraint firstAttribute="trailing" secondItem="8zD-Hi-bKz" secondAttribute="trailing" constant="16" id="jg2-27-lA9"/>
|
||||
<constraint firstItem="1e8-3Q-gU6" firstAttribute="leading" secondItem="Z6m-fj-o9a" secondAttribute="leading" id="jwo-VG-WRR"/>
|
||||
<constraint firstItem="8zD-Hi-bKz" firstAttribute="leading" secondItem="Z6m-fj-o9a" secondAttribute="leading" constant="16" id="mdm-qv-qAO"/>
|
||||
<constraint firstItem="1e8-3Q-gU6" firstAttribute="top" secondItem="FLq-6F-G41" secondAttribute="bottom" constant="15" id="uC2-fr-aJi"/>
|
||||
<constraint firstItem="8zD-Hi-bKz" firstAttribute="top" secondItem="Z6m-fj-o9a" secondAttribute="top" constant="16" id="xJV-Gi-doA"/>
|
||||
</constraints>
|
||||
<viewLayoutGuide key="safeArea" id="jYQ-pI-7Cc"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<size key="freeformSize" width="375" height="240"/>
|
||||
<connections>
|
||||
<outlet property="dateLabel" destination="amG-6c-cww" id="ZON-6u-WAR"/>
|
||||
<outlet property="expandableLabel" destination="t2i-YK-GIT" id="7jV-Gy-gyj"/>
|
||||
<outletCollection property="ratingLabels" destination="Nt5-FZ-MhW" collectionClass="NSMutableArray" id="Q60-bd-GVB"/>
|
||||
<outletCollection property="ratingLabels" destination="SBw-rM-tLc" collectionClass="NSMutableArray" id="oP3-jm-RV5"/>
|
||||
<outletCollection property="ratingLabels" destination="Lf4-8A-8j5" collectionClass="NSMutableArray" id="sXi-2T-qBN"/>
|
||||
<outletCollection property="ratingViews" destination="bL2-ab-NQi" collectionClass="NSMutableArray" id="WOO-ho-byQ"/>
|
||||
<outletCollection property="ratingViews" destination="Haz-z3-DWY" collectionClass="NSMutableArray" id="c8j-Cr-ydJ"/>
|
||||
<outletCollection property="ratingViews" destination="vCK-fD-xLD" collectionClass="NSMutableArray" id="M4b-z2-Kke"/>
|
||||
<outletCollection property="starViews" destination="7Le-8Z-nd7" collectionClass="NSMutableArray" id="S3h-LE-Z3v"/>
|
||||
<outletCollection property="starViews" destination="wK1-4N-yAu" collectionClass="NSMutableArray" id="R7K-XM-qTd"/>
|
||||
<outletCollection property="starViews" destination="N1Q-Q0-IIJ" collectionClass="NSMutableArray" id="udv-S6-wYQ"/>
|
||||
</connections>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="GZq-KN-QJx" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="1604" y="312"/>
|
||||
</scene>
|
||||
<!--Info Item View Controller-->
|
||||
<scene sceneID="f7X-K7-lgf">
|
||||
<objects>
|
||||
|
|
@ -2180,81 +1991,6 @@
|
|||
</objects>
|
||||
<point key="canvasLocation" x="1566" y="-183"/>
|
||||
</scene>
|
||||
<!--Place Page Review View Controller-->
|
||||
<scene sceneID="CHq-9h-et4">
|
||||
<objects>
|
||||
<viewController storyboardIdentifier="PlacePageReviewViewController" id="vNL-ae-DbY" customClass="PlacePageReviewViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<view key="view" contentMode="scaleToFill" id="4g7-uy-zYe">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="150"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tqV-tM-Pas">
|
||||
<rect key="frame" x="16" y="16" width="343" height="20.666666666666671"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4AM-Q5-lT6">
|
||||
<rect key="frame" x="16" y="40.666666666666664" width="343" height="20.333333333333336"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="50" translatesAutoresizingMaskIntoConstraints="NO" id="Iys-0c-vVa" customClass="ExpandableLabel" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="16" y="69" width="343" height="65"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="o3A-Bf-2G1">
|
||||
<rect key="frame" x="0.0" y="149" width="375" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="6hd-D6-cbr"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<constraints>
|
||||
<constraint firstItem="Iys-0c-vVa" firstAttribute="top" secondItem="4AM-Q5-lT6" secondAttribute="bottom" constant="8" id="32r-ZR-eyo"/>
|
||||
<constraint firstItem="4AM-Q5-lT6" firstAttribute="leading" secondItem="4g7-uy-zYe" secondAttribute="leading" constant="16" id="4Bc-bF-aib"/>
|
||||
<constraint firstItem="tqV-tM-Pas" firstAttribute="leading" secondItem="4g7-uy-zYe" secondAttribute="leading" constant="16" id="4rj-2x-qON"/>
|
||||
<constraint firstAttribute="bottom" secondItem="o3A-Bf-2G1" secondAttribute="bottom" id="6Mx-Ih-H0D"/>
|
||||
<constraint firstAttribute="trailing" secondItem="4AM-Q5-lT6" secondAttribute="trailing" constant="16" id="6iu-RJ-T0P"/>
|
||||
<constraint firstAttribute="trailing" secondItem="tqV-tM-Pas" secondAttribute="trailing" constant="16" id="8Vn-pT-vW2"/>
|
||||
<constraint firstAttribute="trailing" secondItem="o3A-Bf-2G1" secondAttribute="trailing" id="OYg-pB-InC"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Iys-0c-vVa" secondAttribute="trailing" constant="16" id="QyR-Uq-FCR"/>
|
||||
<constraint firstItem="tqV-tM-Pas" firstAttribute="top" secondItem="4g7-uy-zYe" secondAttribute="top" constant="16" id="ZGh-2f-cgw"/>
|
||||
<constraint firstItem="Iys-0c-vVa" firstAttribute="leading" secondItem="4g7-uy-zYe" secondAttribute="leading" constant="16" id="gMZ-db-r7K"/>
|
||||
<constraint firstItem="o3A-Bf-2G1" firstAttribute="top" secondItem="Iys-0c-vVa" secondAttribute="bottom" constant="15" id="hct-xr-Sci"/>
|
||||
<constraint firstItem="o3A-Bf-2G1" firstAttribute="leading" secondItem="4g7-uy-zYe" secondAttribute="leading" id="mOI-IE-JRF"/>
|
||||
<constraint firstItem="4AM-Q5-lT6" firstAttribute="top" secondItem="tqV-tM-Pas" secondAttribute="bottom" constant="4" id="ryK-aq-xlO"/>
|
||||
</constraints>
|
||||
<viewLayoutGuide key="safeArea" id="Iyj-Gf-ueC"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<size key="freeformSize" width="375" height="150"/>
|
||||
<connections>
|
||||
<outlet property="dateLabel" destination="4AM-Q5-lT6" id="Tnk-Pg-pnC"/>
|
||||
<outlet property="expandableLabel" destination="Iys-0c-vVa" id="dQD-z3-Xaf"/>
|
||||
<outlet property="titleLabel" destination="tqV-tM-Pas" id="Fjs-i5-zo3"/>
|
||||
</connections>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="9DX-xE-SJs" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="1604" y="545"/>
|
||||
</scene>
|
||||
<!--Hotel Facility View Controller-->
|
||||
<scene sceneID="xAf-m3-ObI">
|
||||
<objects>
|
||||
|
|
@ -3204,6 +2940,72 @@
|
|||
</objects>
|
||||
<point key="canvasLocation" x="929" y="-703"/>
|
||||
</scene>
|
||||
<!--More Reviews View Controller-->
|
||||
<scene sceneID="Mgr-vZ-eCK">
|
||||
<objects>
|
||||
<tableViewController storyboardIdentifier="MoreReviewsViewController" id="Feu-nQ-14K" customClass="MoreReviewsViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="P9x-VF-dIZ">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<prototypes>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="MyReviewCell" id="V9w-Pe-h3w" customClass="MyReviewCell" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="28" width="414" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="V9w-Pe-h3w" id="KiX-oB-Nax">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="l1w-Q8-xNx" customClass="MyReviewView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
</view>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="l1w-Q8-xNx" secondAttribute="trailing" id="B62-xc-EeM"/>
|
||||
<constraint firstItem="l1w-Q8-xNx" firstAttribute="leading" secondItem="KiX-oB-Nax" secondAttribute="leading" id="Qyz-dF-RmB"/>
|
||||
<constraint firstAttribute="bottom" secondItem="l1w-Q8-xNx" secondAttribute="bottom" id="YK9-Ke-9jn"/>
|
||||
<constraint firstItem="l1w-Q8-xNx" firstAttribute="top" secondItem="KiX-oB-Nax" secondAttribute="top" id="oJf-Zf-fXh"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
<connections>
|
||||
<outlet property="myReviewView" destination="l1w-Q8-xNx" id="3cZ-N9-eF0"/>
|
||||
</connections>
|
||||
</tableViewCell>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UserReviewCell" id="e8f-4y-rPO" customClass="UserReviewCell" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="72" width="414" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="e8f-4y-rPO" id="1w2-rX-6Ae">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qRj-vE-LQ3" customClass="ReviewView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
</view>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="bottom" secondItem="qRj-vE-LQ3" secondAttribute="bottom" id="1mi-MU-uEx"/>
|
||||
<constraint firstItem="qRj-vE-LQ3" firstAttribute="top" secondItem="1w2-rX-6Ae" secondAttribute="top" id="9JI-QI-dm5"/>
|
||||
<constraint firstItem="qRj-vE-LQ3" firstAttribute="leading" secondItem="1w2-rX-6Ae" secondAttribute="leading" id="Sa9-Et-1JM"/>
|
||||
<constraint firstAttribute="trailing" secondItem="qRj-vE-LQ3" secondAttribute="trailing" id="oNb-nd-oV0"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
<connections>
|
||||
<outlet property="reviewView" destination="qRj-vE-LQ3" id="3Wf-UI-5Aw"/>
|
||||
</connections>
|
||||
</tableViewCell>
|
||||
</prototypes>
|
||||
<connections>
|
||||
<outlet property="dataSource" destination="Feu-nQ-14K" id="Udz-v3-V4w"/>
|
||||
<outlet property="delegate" destination="Feu-nQ-14K" id="Wwo-Mr-G62"/>
|
||||
</connections>
|
||||
</tableView>
|
||||
</tableViewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="rKm-hT-EZt" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="1594" y="608"/>
|
||||
</scene>
|
||||
</scenes>
|
||||
<resources>
|
||||
<image name="dialog_btn_press" width="280" height="44"/>
|
||||
|
|
|
|||
|
|
@ -8,12 +8,11 @@ class PlacePageBookmarkViewController: UIViewController {
|
|||
@IBOutlet var editButton: UIButton!
|
||||
@IBOutlet var expandableLabel: ExpandableLabel! {
|
||||
didSet {
|
||||
expandableLabel.textLabel.font = UIFont.regular14()
|
||||
expandableLabel.textLabel.textColor = UIColor.blackPrimaryText()
|
||||
expandableLabel.textLabel.numberOfLines = 5
|
||||
expandableLabel.expandButton.setTitleColor(UIColor.linkBlue(), for: .normal)
|
||||
expandableLabel.expandButton.titleLabel?.font = UIFont.regular14()
|
||||
expandableLabel.expandButton.setTitle(L("placepage_more_button"), for: .normal)
|
||||
expandableLabel.font = UIFont.regular14()
|
||||
expandableLabel.textColor = UIColor.blackPrimaryText()
|
||||
expandableLabel.numberOfLines = 5
|
||||
expandableLabel.expandColor = UIColor.linkBlue()
|
||||
expandableLabel.expandText = L("placepage_more_button")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -36,7 +35,7 @@ class PlacePageBookmarkViewController: UIViewController {
|
|||
if bookmarkData.isHtmlDescription {
|
||||
setHtmlDescription(description)
|
||||
} else {
|
||||
expandableLabel.textLabel.text = description
|
||||
expandableLabel.text = description
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -62,7 +61,7 @@ class PlacePageBookmarkViewController: UIViewController {
|
|||
}
|
||||
|
||||
DispatchQueue.main.async {
|
||||
self.expandableLabel.textLabel.attributedText = attributedString
|
||||
self.expandableLabel.attributedText = attributedString
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
class PlacePageReviewViewController: UIViewController {
|
||||
@IBOutlet var titleLabel: UILabel!
|
||||
@IBOutlet var dateLabel: UILabel!
|
||||
@IBOutlet var expandableLabel: ExpandableLabel! {
|
||||
didSet {
|
||||
expandableLabel.textLabel.font = UIFont.regular14()
|
||||
expandableLabel.textLabel.textColor = UIColor.blackPrimaryText()
|
||||
expandableLabel.expandButton.setTitleColor(UIColor.linkBlue(), for: .normal)
|
||||
expandableLabel.expandButton.titleLabel?.font = UIFont.regular14()
|
||||
expandableLabel.expandButton.setTitle(L("placepage_more_button"), for: .normal)
|
||||
}
|
||||
}
|
||||
|
||||
var review: UgcReview!
|
||||
lazy var dateFormatter: DateFormatter = {
|
||||
let formatter = DateFormatter()
|
||||
formatter.dateStyle = .long
|
||||
formatter.timeStyle = .none
|
||||
return formatter
|
||||
} ()
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
|
||||
titleLabel.text = review.author
|
||||
dateLabel.text = dateFormatter.string(from: review.date)
|
||||
expandableLabel.textLabel.text = review.text
|
||||
}
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@ protocol PlacePageReviewsViewControllerDelegate: AnyObject {
|
|||
func didPressMoreReviews()
|
||||
}
|
||||
|
||||
class PlacePageReviewsViewController: UIViewController {
|
||||
final class PlacePageReviewsViewController: UIViewController {
|
||||
@IBOutlet var stackView: UIStackView!
|
||||
|
||||
var ugcData: UgcData? {
|
||||
|
|
@ -10,33 +10,44 @@ class PlacePageReviewsViewController: UIViewController {
|
|||
updateReviews()
|
||||
}
|
||||
}
|
||||
|
||||
weak var delegate: PlacePageReviewsViewControllerDelegate?
|
||||
|
||||
lazy var myReviewViewController: MyReviewViewController = {
|
||||
let vc = storyboard!.instantiateViewController(ofType: MyReviewViewController.self)
|
||||
return vc
|
||||
} ()
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
}
|
||||
|
||||
// MARK: private
|
||||
|
||||
private lazy var dateFormatter: DateFormatter = {
|
||||
let formatter = DateFormatter()
|
||||
formatter.dateStyle = .long
|
||||
formatter.timeStyle = .none
|
||||
return formatter
|
||||
} ()
|
||||
|
||||
private func updateReviews() {
|
||||
guard let ugcData = ugcData else { return }
|
||||
|
||||
if let myReview = ugcData.myReview {
|
||||
myReviewViewController.myReview = myReview
|
||||
addToStack(myReviewViewController)
|
||||
let myReviewView = MyReviewView()
|
||||
myReviewView.defaultConfig()
|
||||
myReviewView.reviewView.authorLabel.text = L("placepage_reviews_your_comment")
|
||||
myReviewView.reviewView.dateLabel.text = dateFormatter.string(from: myReview.date)
|
||||
myReviewView.reviewView.reviewLabel.text = myReview.text
|
||||
|
||||
for i in 0..<3 {
|
||||
if myReview.starRatings.count > i {
|
||||
let starRating = myReview.starRatings[i]
|
||||
myReviewView.ratingViews[i].nameLabel.text = L(starRating.title)
|
||||
myReviewView.ratingViews[i].starRatingView.rating = Int(round(starRating.value))
|
||||
} else {
|
||||
myReviewView.ratingViews[i].isHidden = true
|
||||
}
|
||||
}
|
||||
stackView.addArrangedSubview(myReviewView)
|
||||
}
|
||||
|
||||
for i in 0..<3 {
|
||||
if i < ugcData.reviews.count {
|
||||
let review = ugcData.reviews[i]
|
||||
let vc = storyboard!.instantiateViewController(ofType: PlacePageReviewViewController.self)
|
||||
vc.review = review
|
||||
addToStack(vc)
|
||||
addReviewView(review)
|
||||
} else {
|
||||
break
|
||||
}
|
||||
|
|
@ -47,6 +58,16 @@ class PlacePageReviewsViewController: UIViewController {
|
|||
}
|
||||
}
|
||||
|
||||
private func addReviewView(_ review: UgcReview) {
|
||||
let reviewView = ReviewView()
|
||||
reviewView.defaultConfig()
|
||||
reviewView.authorLabel.text = review.author
|
||||
reviewView.dateLabel.text = dateFormatter.string(from: review.date)
|
||||
reviewView.reviewLabel.text = review.text
|
||||
|
||||
stackView.addArrangedSubview(reviewView)
|
||||
}
|
||||
|
||||
@objc private func onMoreReviewsButton(_ sender: UIButton) {
|
||||
delegate?.didPressMoreReviews()
|
||||
}
|
||||
|
|
@ -60,10 +81,4 @@ class PlacePageReviewsViewController: UIViewController {
|
|||
stackView.addArrangedSubview(button)
|
||||
button.addTarget(self, action: #selector(onMoreReviewsButton), for: .touchUpInside)
|
||||
}
|
||||
|
||||
private func addToStack(_ viewController: UIViewController) {
|
||||
addChild(viewController)
|
||||
stackView.addArrangedSubview(viewController.view)
|
||||
viewController.didMove(toParent: self)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -339,11 +339,11 @@ enum PlacePageState {
|
|||
}
|
||||
|
||||
private func updatePreviewOffset() {
|
||||
if traitCollection.horizontalSizeClass != .compact {
|
||||
return
|
||||
}
|
||||
self.view.layoutIfNeeded()
|
||||
scrollSteps = calculateSteps()
|
||||
if traitCollection.horizontalSizeClass != .compact || beginDragging {
|
||||
return
|
||||
}
|
||||
let state = placePageData.isPreviewPlus ? scrollSteps[2] : scrollSteps[1]
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration) {
|
||||
self.scrollView.contentOffset = CGPoint(x: 0, y: state.offset)
|
||||
|
|
@ -421,7 +421,10 @@ extension PlacePageViewController: AddReviewViewControllerDelegate {
|
|||
|
||||
extension PlacePageViewController: PlacePageReviewsViewControllerDelegate {
|
||||
func didPressMoreReviews() {
|
||||
|
||||
let moreReviews = storyboard!.instantiateViewController(ofType: MoreReviewsViewController.self)
|
||||
moreReviews.ugcData = placePageData.ugcData
|
||||
moreReviews.title = placePageData.previewData.title
|
||||
MapViewController.shared()?.navigationController?.pushViewController(moreReviews, animated: true)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,56 @@
|
|||
class ExpandableLabel: UIView {
|
||||
private var stackView = UIStackView()
|
||||
var textLabel = UILabel()
|
||||
var expandButton = UIButton()
|
||||
var expanded = false
|
||||
final class ExpandableLabel: UIView {
|
||||
typealias OnExpandClosure = (() -> Void) -> Void
|
||||
|
||||
private let stackView = UIStackView()
|
||||
private let textLabel = UILabel()
|
||||
private let expandLabel = UILabel()
|
||||
|
||||
var onExpandClosure: OnExpandClosure?
|
||||
|
||||
var font = UIFont.systemFont(ofSize: 16) {
|
||||
didSet {
|
||||
textLabel.font = font
|
||||
expandLabel.font = font
|
||||
}
|
||||
}
|
||||
|
||||
var textColor = UIColor.black {
|
||||
didSet {
|
||||
textLabel.textColor = textColor
|
||||
}
|
||||
}
|
||||
|
||||
var expandColor = UIColor.systemBlue {
|
||||
didSet {
|
||||
expandLabel.textColor = expandColor
|
||||
}
|
||||
}
|
||||
|
||||
var text: String? {
|
||||
didSet {
|
||||
textLabel.text = text
|
||||
expandLabel.isHidden = true
|
||||
}
|
||||
}
|
||||
|
||||
var attributedText: NSAttributedString? {
|
||||
didSet {
|
||||
textLabel.attributedText = attributedText
|
||||
expandLabel.isHidden = true
|
||||
}
|
||||
}
|
||||
|
||||
var expandText = "More" {
|
||||
didSet {
|
||||
expandLabel.text = expandText
|
||||
}
|
||||
}
|
||||
|
||||
var numberOfLines = 2 {
|
||||
didSet {
|
||||
textLabel.numberOfLines = numberOfLines > 0 ? numberOfLines + 1 : 0
|
||||
}
|
||||
}
|
||||
|
||||
override init(frame: CGRect) {
|
||||
super.init(frame: frame)
|
||||
|
|
@ -15,44 +63,60 @@ class ExpandableLabel: UIView {
|
|||
}
|
||||
|
||||
private func commonInit() {
|
||||
stackView.translatesAutoresizingMaskIntoConstraints = false
|
||||
stackView.axis = .vertical
|
||||
stackView.alignment = .leading
|
||||
textLabel.numberOfLines = 2
|
||||
textLabel.numberOfLines = numberOfLines > 0 ? numberOfLines + 1 : 0
|
||||
textLabel.contentMode = .topLeft
|
||||
expandButton.clipsToBounds = true
|
||||
expandButton.addTarget(self, action: #selector(onExpand(_:)), for: .touchUpInside)
|
||||
textLabel.font = font
|
||||
textLabel.textColor = textColor
|
||||
textLabel.text = text
|
||||
textLabel.attributedText = attributedText
|
||||
expandLabel.font = font
|
||||
expandLabel.textColor = expandColor
|
||||
expandLabel.text = expandText
|
||||
expandLabel.isHidden = true
|
||||
addSubview(stackView)
|
||||
|
||||
stackView.addArrangedSubview(textLabel)
|
||||
stackView.addArrangedSubview(expandButton)
|
||||
NSLayoutConstraint.activate([
|
||||
stackView.leftAnchor.constraint(equalTo: leftAnchor),
|
||||
stackView.topAnchor.constraint(equalTo: topAnchor),
|
||||
stackView.rightAnchor.constraint(equalTo: rightAnchor),
|
||||
stackView.bottomAnchor.constraint(equalTo: bottomAnchor)
|
||||
])
|
||||
stackView.addArrangedSubview(expandLabel)
|
||||
stackView.alignToSuperview()
|
||||
let gr = UITapGestureRecognizer(target: self, action: #selector(onExpand(_:)))
|
||||
addGestureRecognizer(gr)
|
||||
}
|
||||
|
||||
@objc func onExpand(_ sender: UIButton) {
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration) {
|
||||
self.textLabel.numberOfLines = 0
|
||||
self.expandButton.isHidden = true
|
||||
self.stackView.layoutIfNeeded()
|
||||
@objc func onExpand(_ sender: UITapGestureRecognizer) {
|
||||
if expandLabel.isHidden { return }
|
||||
|
||||
let expandClosure = {
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration) {
|
||||
self.textLabel.numberOfLines = 0
|
||||
self.expandLabel.isHidden = true
|
||||
self.stackView.layoutIfNeeded()
|
||||
}
|
||||
}
|
||||
if let onExpandClosure = onExpandClosure {
|
||||
onExpandClosure(expandClosure)
|
||||
} else {
|
||||
expandClosure()
|
||||
}
|
||||
}
|
||||
|
||||
override func layoutSubviews() {
|
||||
super.layoutSubviews()
|
||||
|
||||
guard let s = textLabel.text as NSString? else { return }
|
||||
let textRect = s.boundingRect(with: size,
|
||||
guard textLabel.numberOfLines > 0, textLabel.numberOfLines != numberOfLines, let s = textLabel.text as NSString? else { return }
|
||||
let textRect = s.boundingRect(with: CGSize(width: width, height: CGFloat.greatestFiniteMagnitude),
|
||||
options: .usesLineFragmentOrigin,
|
||||
attributes: [.font: textLabel.font!],
|
||||
attributes: [.font: font],
|
||||
context: nil)
|
||||
let lineHeight = textLabel.font.lineHeight
|
||||
if Int(lineHeight * CGFloat(textLabel.numberOfLines)) >= Int(textRect.height) {
|
||||
expandButton.isHidden = true
|
||||
if Int(lineHeight * CGFloat(numberOfLines + 1)) >= Int(textRect.height) {
|
||||
expandLabel.isHidden = true
|
||||
textLabel.numberOfLines = 0
|
||||
} else {
|
||||
expandLabel.isHidden = false
|
||||
textLabel.numberOfLines = numberOfLines
|
||||
}
|
||||
layoutIfNeeded()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
91
iphone/Maps/UI/PlacePage/Views/MyReviewView.swift
Normal file
91
iphone/Maps/UI/PlacePage/Views/MyReviewView.swift
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
final class ReviewRatingView: UIView {
|
||||
private let stackView = UIStackView()
|
||||
let nameLabel = UILabel()
|
||||
let starRatingView = StarRatingView()
|
||||
|
||||
override init(frame: CGRect) {
|
||||
super.init(frame: frame)
|
||||
|
||||
stackView.axis = .vertical
|
||||
stackView.alignment = .leading
|
||||
stackView.spacing = 4
|
||||
addSubview(stackView)
|
||||
|
||||
stackView.addArrangedSubview(nameLabel)
|
||||
stackView.addArrangedSubview(starRatingView)
|
||||
stackView.alignToSuperview()
|
||||
}
|
||||
|
||||
required init?(coder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
}
|
||||
|
||||
extension ReviewRatingView {
|
||||
func defaultConfig() {
|
||||
nameLabel.font = UIFont.regular14()
|
||||
nameLabel.textColor = UIColor.blackSecondaryText()
|
||||
starRatingView.activeColor = UIColor.ratingYellow()
|
||||
starRatingView.inactiveColor = UIColor.blackDividers()
|
||||
}
|
||||
}
|
||||
|
||||
final class MyReviewView: UIView {
|
||||
private let stackView = UIStackView()
|
||||
private let ratingsStackView = UIStackView()
|
||||
private let ratingsContainerView = UIView()
|
||||
let reviewView = ReviewView()
|
||||
let ratingViews = [ReviewRatingView(), ReviewRatingView(), ReviewRatingView()]
|
||||
let separator = UIView()
|
||||
|
||||
override init(frame: CGRect) {
|
||||
super.init(frame: frame)
|
||||
commonInit()
|
||||
}
|
||||
|
||||
required init?(coder: NSCoder) {
|
||||
super.init(coder: coder)
|
||||
commonInit()
|
||||
}
|
||||
|
||||
private func commonInit() {
|
||||
stackView.axis = .vertical
|
||||
stackView.alignment = .fill
|
||||
stackView.spacing = 8
|
||||
addSubview(stackView)
|
||||
|
||||
ratingsStackView.axis = .horizontal
|
||||
ratingsStackView.alignment = .fill
|
||||
ratingsStackView.distribution = .fillEqually
|
||||
ratingsContainerView.addSubview(ratingsStackView)
|
||||
ratingsStackView.alignToSuperview(UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 0))
|
||||
|
||||
stackView.addArrangedSubview(reviewView)
|
||||
stackView.addArrangedSubview(ratingsContainerView)
|
||||
|
||||
ratingViews.forEach {
|
||||
ratingsStackView.addArrangedSubview($0)
|
||||
}
|
||||
|
||||
stackView.alignToSuperview(UIEdgeInsets(top: 0, left: 0, bottom: -16, right: 0))
|
||||
|
||||
separator.translatesAutoresizingMaskIntoConstraints = false
|
||||
addSubview(separator)
|
||||
NSLayoutConstraint.activate([
|
||||
separator.heightAnchor.constraint(equalToConstant: 1),
|
||||
separator.leftAnchor.constraint(equalTo: leftAnchor),
|
||||
separator.bottomAnchor.constraint(equalTo: bottomAnchor),
|
||||
separator.rightAnchor.constraint(equalTo: rightAnchor)
|
||||
])
|
||||
}
|
||||
}
|
||||
|
||||
extension MyReviewView {
|
||||
func defaultConfig() {
|
||||
reviewView.defaultConfig()
|
||||
ratingViews.forEach {
|
||||
$0.defaultConfig()
|
||||
}
|
||||
separator.backgroundColor = UIColor.blackDividers()
|
||||
}
|
||||
}
|
||||
53
iphone/Maps/UI/PlacePage/Views/ReviewView.swift
Normal file
53
iphone/Maps/UI/PlacePage/Views/ReviewView.swift
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
final class ReviewView: UIView {
|
||||
private let stackView = UIStackView()
|
||||
let authorLabel = UILabel()
|
||||
let dateLabel = UILabel()
|
||||
let reviewLabel = ExpandableLabel()
|
||||
let separator = UIView()
|
||||
|
||||
override init(frame: CGRect) {
|
||||
super.init(frame: frame)
|
||||
commonInit()
|
||||
}
|
||||
|
||||
required init?(coder: NSCoder) {
|
||||
super.init(coder: coder)
|
||||
commonInit()
|
||||
}
|
||||
|
||||
private func commonInit() {
|
||||
stackView.axis = .vertical
|
||||
stackView.alignment = .leading
|
||||
stackView.spacing = 4
|
||||
addSubview(stackView)
|
||||
|
||||
stackView.addArrangedSubview(authorLabel)
|
||||
stackView.addArrangedSubview(dateLabel)
|
||||
stackView.addArrangedSubview(reviewLabel)
|
||||
stackView.setCustomSpacing(8, after: dateLabel)
|
||||
stackView.alignToSuperview(UIEdgeInsets(top: 16, left: 16, bottom: -8, right: -16))
|
||||
|
||||
separator.translatesAutoresizingMaskIntoConstraints = false
|
||||
addSubview(separator)
|
||||
NSLayoutConstraint.activate([
|
||||
separator.heightAnchor.constraint(equalToConstant: 1),
|
||||
separator.leftAnchor.constraint(equalTo: authorLabel.leftAnchor),
|
||||
separator.bottomAnchor.constraint(equalTo: bottomAnchor),
|
||||
separator.rightAnchor.constraint(equalTo: rightAnchor)
|
||||
])
|
||||
}
|
||||
}
|
||||
|
||||
extension ReviewView {
|
||||
func defaultConfig() {
|
||||
authorLabel.font = UIFont.bold14()
|
||||
authorLabel.textColor = UIColor.blackPrimaryText()
|
||||
dateLabel.font = UIFont.regular12()
|
||||
dateLabel.textColor = UIColor.blackSecondaryText()
|
||||
reviewLabel.font = UIFont.regular14()
|
||||
reviewLabel.textColor = UIColor.blackPrimaryText()
|
||||
reviewLabel.expandColor = UIColor.linkBlue()
|
||||
reviewLabel.expandText = L("placepage_more_button")
|
||||
separator.backgroundColor = UIColor.blackDividers()
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue