From 6a07c9436c122f39024605ee523dada78746be76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cle=CC=81ment=20Perrousset?= Date: Thu, 16 Feb 2023 09:29:28 +0100 Subject: [PATCH 01/25] feature(EN-5686) : add assciation author on event --- entourage/Assets/Localizable.strings | 5 ++ entourage/Models/User.swift | 6 ++ .../Cells/Feed/EventDetailTopFullCell.swift | 18 +++++ .../Cells/Feed/EventDetailTopFullCell.xib | 47 +++++++++++- .../Cells/Feed/EventDetailTopLightCell.swift | 31 ++++---- .../Cells/Feed/EventDetailTopLightCell.xib | 56 ++++++++++++-- .../EventDetailFeedViewController.swift | 4 + .../Events/EventMainHomeViewController.swift | 1 + .../Cells/Detail/NeighborhoodPostCell.swift | 1 + .../NeighborhoodHomeViewController.swift | 1 + entourage/Scenes/Home/NotifInAppCell.swift | 2 + entourage/Storyboards/Event.storyboard | 76 +++++++++---------- entourage/Storyboards/Neighborhood.storyboard | 76 +++++++++---------- 13 files changed, 223 insertions(+), 101 deletions(-) diff --git a/entourage/Assets/Localizable.strings b/entourage/Assets/Localizable.strings index 807bc493c..ca40e1531 100644 --- a/entourage/Assets/Localizable.strings +++ b/entourage/Assets/Localizable.strings @@ -789,6 +789,11 @@ /** Events*/ "passed_event" = "Événements passés"; + + +//EVENT TOP Cell +"event_top_cell_organised_by" = "Organisé par "; + //Create "eventCreatePopCloseBackTitle" = "Attention"; diff --git a/entourage/Models/User.swift b/entourage/Models/User.swift index a1df2820b..618968dfe 100644 --- a/entourage/Models/User.swift +++ b/entourage/Models/User.swift @@ -281,6 +281,12 @@ struct UserLightNeighborhood: Codable { } return false } + func isAmbassador() -> Bool { + guard let role = role else { + return false + } + return role.contains("ambassador") + } } //MARK: - Organization - diff --git a/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.swift b/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.swift index 15bd6a93c..6ddfad125 100644 --- a/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.swift +++ b/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.swift @@ -46,6 +46,11 @@ class EventDetailTopFullCell: UITableViewCell { @IBOutlet weak var ib_btn_participate: UIButton! + @IBOutlet weak var ui_label_organised_by: UILabel! + + @IBOutlet weak var ui_view_organised_by: UIView! + + weak var delegate:EventDetailTopCellDelegate? = nil let topMarginConstraint:CGFloat = 24 @@ -189,6 +194,13 @@ class EventDetailTopFullCell: UITableViewCell { ui_lbl_bt_join.text = "event_detail_button_participe_OFF".localized } + if let _author = event.author { + ui_label_organised_by.text = "event_top_cell_organised_by".localized + _author.displayName + ui_view_organised_by.isHidden = false + }else { + ui_view_organised_by.isHidden = true + } + if let _interests = event.interests { ui_taglist_view?.removeAllTags() for interest in _interests { @@ -242,6 +254,11 @@ class EventDetailTopFullCell: UITableViewCell { } } + @IBAction func action_show_user(_ sender: Any) { + + } + + @IBAction func action_show_members(_ sender: Any) { delegate?.showMembers() } @@ -262,4 +279,5 @@ protocol EventDetailTopCellDelegate : AnyObject { func showDetailFull() func showPlace() func showWebUrl(url:URL) + func showUser() } diff --git a/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.xib b/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.xib index dd5c9b48b..001816790 100644 --- a/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.xib +++ b/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.xib @@ -112,7 +112,7 @@ - + @@ -211,7 +211,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -364,6 +404,7 @@ + @@ -377,6 +418,7 @@ + @@ -388,6 +430,7 @@ + diff --git a/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.swift b/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.swift index 10e9a45f7..e00eda1ce 100644 --- a/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.swift +++ b/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.swift @@ -38,8 +38,11 @@ class EventDetailTopLightCell: UITableViewCell { @IBOutlet weak var ui_img_bt_more: UIImageView! @IBOutlet weak var ui_lbl_bt_more: UILabel! + @IBOutlet weak var ui_view_organised_by: UIView! weak var delegate:EventDetailTopCellDelegate? = nil + @IBOutlet weak var ui_label_organised_by: UILabel! + @IBOutlet weak var ui_btn_organisez_by: UIButton! let cornerRadiusTag:CGFloat = 15 class var identifier:String {return String(describing: self) } @@ -161,23 +164,12 @@ class EventDetailTopLightCell: UITableViewCell { ui_location_name.attributedText = Utils.formatStringUnderline(textString: _addressName, textColor: .black) } -// if let _distance = event.distance { -// let _addressNameWithDistance = String.init(format: "event_places_distance".localized,_addressName, _distance.displayBaseStringDistance()) -// if event.isCanceled() { -// ui_location_name.text = _addressNameWithDistance -// } -// else { -// ui_location_name.attributedText = Utils.formatStringUnderline(textString: _addressNameWithDistance, textColor: .black) -// } -// -// }else{ -// if event.isCanceled() { -// ui_location_name.text = _addressName -// } -// else { -// ui_location_name.attributedText = Utils.formatStringUnderline(textString: _addressName, textColor: .black) -// } -// } + if let _author = event.author { + ui_label_organised_by.text = "event_top_cell_organised_by".localized + _author.displayName + ui_view_organised_by.isHidden = false + }else { + ui_view_organised_by.isHidden = true + } } @@ -194,6 +186,11 @@ class EventDetailTopLightCell: UITableViewCell { } } + + @IBAction func action_show_user(_ sender: Any) { + delegate?.showUser() + } + @IBAction func action_show_members(_ sender: Any) { delegate?.showMembers() } diff --git a/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.xib b/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.xib index 3de45966d..af1a330fa 100644 --- a/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.xib +++ b/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.xib @@ -1,9 +1,9 @@ - + - + @@ -106,10 +106,10 @@ - + - + @@ -208,7 +208,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -244,7 +284,7 @@ - + @@ -304,6 +344,7 @@ + @@ -312,6 +353,7 @@ + @@ -322,6 +364,7 @@ + @@ -329,6 +372,7 @@ + diff --git a/entourage/Scenes/Events/EventDetailFeedViewController.swift b/entourage/Scenes/Events/EventDetailFeedViewController.swift index 3f3585b1f..5afeb697b 100644 --- a/entourage/Scenes/Events/EventDetailFeedViewController.swift +++ b/entourage/Scenes/Events/EventDetailFeedViewController.swift @@ -655,6 +655,10 @@ extension EventDetailFeedViewController: MJNavBackViewDelegate { //MARK: - EventDetailTopCellDelegate - extension EventDetailFeedViewController:EventDetailTopCellDelegate { + func showUser() { + + } + func showWebUrl(url: URL) { WebLinkManager.openUrl(url: url, openInApp: true, presenterViewController: self) } diff --git a/entourage/Scenes/Events/EventMainHomeViewController.swift b/entourage/Scenes/Events/EventMainHomeViewController.swift index 6b6b7a257..c70fca4d9 100644 --- a/entourage/Scenes/Events/EventMainHomeViewController.swift +++ b/entourage/Scenes/Events/EventMainHomeViewController.swift @@ -453,6 +453,7 @@ class EventMainHomeViewController: UIViewController { } func setupViews() { + self.setMyFirst() ui_location_filter.setupFontAndColor(style: MJTextFontColorStyle(font: ApplicationTheme.getFontNunitoSemiBold(size: 13), color: .white)) ui_location_filter.text = currentFilter.getFilterButtonString() ui_label_title.text = "event_main_page_title".localized diff --git a/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostCell.swift b/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostCell.swift index 8a06ff73c..3fa0f014b 100644 --- a/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostCell.swift +++ b/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostCell.swift @@ -70,6 +70,7 @@ class NeighborhoodPostCell: UITableViewCell { func populateCell(message:PostMessage, delegate:NeighborhoodPostCellDelegate, currentIndexPath:IndexPath?, userId:Int?) { self.postMessage = message + print("eho " , self.postMessage.user?.partner?.name) self.delegate = delegate ui_username.text = message.user?.displayName ui_date.text = message.createdDateFormatted diff --git a/entourage/Scenes/Groups - Neighborhoods/NeighborhoodHomeViewController.swift b/entourage/Scenes/Groups - Neighborhoods/NeighborhoodHomeViewController.swift index 25983366f..8b4b0d075 100644 --- a/entourage/Scenes/Groups - Neighborhoods/NeighborhoodHomeViewController.swift +++ b/entourage/Scenes/Groups - Neighborhoods/NeighborhoodHomeViewController.swift @@ -430,6 +430,7 @@ class NeighborhoodHomeViewController: UIViewController { } func setupViews() { + self.setMyFirst() ui_label_title.text = "neighborhood_main_page_title".localized ui_label_groups.text = "neighborhood_main_page_button_myGroups".localized ui_label_discover.text = "neighborhood_main_page_button_discover".localized diff --git a/entourage/Scenes/Home/NotifInAppCell.swift b/entourage/Scenes/Home/NotifInAppCell.swift index ff1a7c43b..13d5f3848 100644 --- a/entourage/Scenes/Home/NotifInAppCell.swift +++ b/entourage/Scenes/Home/NotifInAppCell.swift @@ -30,6 +30,8 @@ class NotifInAppCell: UITableViewCell { ui_date.text = date if let imageUrl = imageUrl, let url = URL(string: imageUrl) { ui_image.sd_setImage(with: url, placeholderImage:UIImage(named: DeepLinkManager.setImage(notificationInstanceType: instanceString))) + }else{ + ui_image.image = UIImage(named: DeepLinkManager.setImage(notificationInstanceType: instanceString)) } if !isUnread { diff --git a/entourage/Storyboards/Event.storyboard b/entourage/Storyboards/Event.storyboard index e0979c603..dcca8ca37 100644 --- a/entourage/Storyboards/Event.storyboard +++ b/entourage/Storyboards/Event.storyboard @@ -1,9 +1,9 @@ - + - + @@ -210,82 +210,82 @@ - + - - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + diff --git a/entourage/Storyboards/Neighborhood.storyboard b/entourage/Storyboards/Neighborhood.storyboard index ac816a4c3..2f5e06faa 100644 --- a/entourage/Storyboards/Neighborhood.storyboard +++ b/entourage/Storyboards/Neighborhood.storyboard @@ -1,9 +1,9 @@ - + - + @@ -605,82 +605,82 @@ - + - - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + From 6088c6c06fcf8e1bc40ec1ba32a7d8a4837b31c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cle=CC=81ment=20Perrousset?= Date: Mon, 20 Feb 2023 14:06:22 +0100 Subject: [PATCH 02/25] fix(Event orga taf) : change some title refacto --- entourage/Assets/Localizable.strings | 5 +- .../Cells/Feed/EventDetailTopFullCell.swift | 12 ++++ .../Cells/Feed/EventDetailTopFullCell.xib | 59 +++++++++++++++++-- .../Cells/Feed/EventDetailTopLightCell.swift | 13 ++++ .../Cells/Feed/EventDetailTopLightCell.xib | 49 ++++++++++++++- .../Cells/Detail/NeighborhoodPostCell.swift | 23 +++++++- .../Detail/NeighborhoodPostImageCell.xib | 40 ++++++++----- .../Cells/Detail/NeighborhoodPostTextCell.xib | 14 ++++- entourage/Tools/Extensions/Extensions.swift | 28 +++++++++ 9 files changed, 214 insertions(+), 29 deletions(-) diff --git a/entourage/Assets/Localizable.strings b/entourage/Assets/Localizable.strings index ca40e1531..75187f506 100644 --- a/entourage/Assets/Localizable.strings +++ b/entourage/Assets/Localizable.strings @@ -653,6 +653,8 @@ /************* * Group detail */ +"title_is_ambassador" = "Ambassadeur •" ; +"title_is_admin" = "Administrateur •" ; "neighborhood_detail_button_join_member" = "Membre"; "neighborhood_detail_button_join_join" = "Rejoindre"; @@ -792,7 +794,8 @@ //EVENT TOP Cell -"event_top_cell_organised_by" = "Organisé par "; +"event_top_cell_organised_by" = "Organisé par "; +"event_top_cell_asso" = "Événement %@" ; //Create diff --git a/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.swift b/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.swift index 6ddfad125..d67e18388 100644 --- a/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.swift +++ b/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.swift @@ -49,6 +49,8 @@ class EventDetailTopFullCell: UITableViewCell { @IBOutlet weak var ui_label_organised_by: UILabel! @IBOutlet weak var ui_view_organised_by: UIView! + @IBOutlet weak var ui_view_association: UIView! + @IBOutlet weak var ui_label_association: UILabel! weak var delegate:EventDetailTopCellDelegate? = nil @@ -197,10 +199,20 @@ class EventDetailTopFullCell: UITableViewCell { if let _author = event.author { ui_label_organised_by.text = "event_top_cell_organised_by".localized + _author.displayName ui_view_organised_by.isHidden = false + if let _asso = _author.partner { + ui_view_association.isHidden = false + ui_label_association.text = String(format: "event_top_cell_asso".localized, _asso.name) + }else{ + ui_view_association.isHidden = true + } + }else { ui_view_organised_by.isHidden = true + ui_view_association.isHidden = true } + + if let _interests = event.interests { ui_taglist_view?.removeAllTags() for interest in _interests { diff --git a/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.xib b/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.xib index 001816790..b5c67d426 100644 --- a/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.xib +++ b/entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.xib @@ -109,10 +109,10 @@ - + - + @@ -276,6 +276,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -287,7 +329,7 @@ - + @@ -334,13 +376,13 @@ diff --git a/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.swift b/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.swift index e00eda1ce..1667ae058 100644 --- a/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.swift +++ b/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.swift @@ -41,6 +41,11 @@ class EventDetailTopLightCell: UITableViewCell { @IBOutlet weak var ui_view_organised_by: UIView! weak var delegate:EventDetailTopCellDelegate? = nil + @IBOutlet weak var ui_view_association: UIView! + + @IBOutlet weak var ui_label_association: UILabel! + + @IBOutlet weak var ui_label_organised_by: UILabel! @IBOutlet weak var ui_btn_organisez_by: UIButton! let cornerRadiusTag:CGFloat = 15 @@ -167,8 +172,16 @@ class EventDetailTopLightCell: UITableViewCell { if let _author = event.author { ui_label_organised_by.text = "event_top_cell_organised_by".localized + _author.displayName ui_view_organised_by.isHidden = false + if let _asso = _author.partner { + ui_view_association.isHidden = false + ui_label_association.text = String(format: "event_top_cell_asso".localized, _asso.name) + }else{ + ui_view_association.isHidden = true + } + }else { ui_view_organised_by.isHidden = true + ui_view_association.isHidden = true } } diff --git a/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.xib b/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.xib index af1a330fa..bd4984e29 100644 --- a/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.xib +++ b/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.xib @@ -106,10 +106,10 @@ - + - + @@ -273,6 +273,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -284,7 +322,7 @@ - + @@ -353,6 +391,7 @@ + @@ -362,6 +401,7 @@ + @@ -384,5 +424,8 @@ + + + diff --git a/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostCell.swift b/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostCell.swift index 3fa0f014b..d0134a92a 100644 --- a/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostCell.swift +++ b/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostCell.swift @@ -26,6 +26,8 @@ class NeighborhoodPostCell: UITableViewCell { @IBOutlet weak var ui_view_bt_send: UIView! @IBOutlet weak var ui_lb_chat: UILabel! + @IBOutlet weak var ui_label_ambassador: UILabel! + @IBOutlet weak var ui_btn_signal_post: UIButton! class var identifier: String { @@ -70,7 +72,6 @@ class NeighborhoodPostCell: UITableViewCell { func populateCell(message:PostMessage, delegate:NeighborhoodPostCellDelegate, currentIndexPath:IndexPath?, userId:Int?) { self.postMessage = message - print("eho " , self.postMessage.user?.partner?.name) self.delegate = delegate ui_username.text = message.user?.displayName ui_date.text = message.createdDateFormatted @@ -111,6 +112,26 @@ class NeighborhoodPostCell: UITableViewCell { else { ui_image_post?.image = UIImage.init(named: "placeholder_post") } + + var tagString = "" + if let _user = message.user { + if _user.isAdmin() { + tagString = tagString + "title_is_admin".localized + }else if _user.isAmbassador() { + tagString = tagString + "title_is_ambassador".localized + }else if let _partner = _user.partner { + tagString = tagString + _partner.name + } + } + if tagString.isEmpty { + ui_label_ambassador.isHidden = true + }else{ + if tagString.last == "•" { + tagString.removeLast() + } + ui_label_ambassador.isHidden = false + ui_label_ambassador.text = tagString + } } @IBAction func action_show_comments(_ sender: Any) { diff --git a/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostImageCell.xib b/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostImageCell.xib index 4e29d3804..852b3b887 100644 --- a/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostImageCell.xib +++ b/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostImageCell.xib @@ -33,14 +33,14 @@ - + - - + + - + - + - + + + - + - + @@ -183,14 +192,14 @@ Nous sommes prêt pour les beaux jours ! :-) - + - + + + - + @@ -255,6 +262,7 @@ Nous sommes prêt pour les beaux jours ! :-) + diff --git a/entourage/Tools/Extensions/Extensions.swift b/entourage/Tools/Extensions/Extensions.swift index fb9c0b276..5c7111d8b 100644 --- a/entourage/Tools/Extensions/Extensions.swift +++ b/entourage/Tools/Extensions/Extensions.swift @@ -197,6 +197,30 @@ extension UILabel { } } +extension UIView { + @IBInspectable var cradius: CGFloat { + get { + return layer.cornerRadius + } + set { + layer.cornerRadius = newValue + layer.masksToBounds = newValue > 0 + } + } +} + +extension UILabel { + @IBInspectable var cornerRadius: CGFloat { + get { + return layer.cornerRadius + } + set { + layer.cornerRadius = newValue + layer.masksToBounds = newValue > 0 + } + } +} + extension UITextField { func setupFontAndColor(style:MJTextFontColorStyle) { font = style.font @@ -249,4 +273,8 @@ extension UIView { self.isHidden = true self.heightAnchor.constraint(equalToConstant: 0).isActive = true } + func setVisibilityVisible(height:CGFloat) { + self.isHidden = false + self.heightAnchor.constraint(equalToConstant: height).isActive = true + } } From 94dbd65ee6f6cbc3bb4f5b3ef5055aff24ad6950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cle=CC=81ment=20Perrousset?= Date: Thu, 23 Feb 2023 09:49:58 +0100 Subject: [PATCH 03/25] fix(Group-Event) : tabs fix --- entourage.xcodeproj/project.pbxproj | 12 ++ entourage/Assets/Localizable.strings | 2 +- .../Cells/Feed/EventDetailFullCell.swift | 21 ++++ .../Events/Cells/Feed/EventDetailFullCell.xib | 107 ++++++++++++++---- .../Cells/Feed/EventDetailTopFullCell.swift | 1 - .../Cells/Feed/EventDetailTopFullCell.xib | 11 +- .../Cells/Feed/EventDetailTopLightCell.xib | 11 +- .../Events/EventMainHomeViewController.swift | 11 +- .../Cells/Detail/NeighborhoodPostCell.swift | 12 +- .../ReportGroupChoosePageViewController.swift | 14 +++ entourage/Storyboards/Event.storyboard | 11 +- .../Neighborhood_Report.storyboard | 58 +++++++--- 12 files changed, 207 insertions(+), 64 deletions(-) create mode 100644 entourage/Scenes/Groups - Neighborhoods/Signal/ReportGroupChoosePageViewController.swift diff --git a/entourage.xcodeproj/project.pbxproj b/entourage.xcodeproj/project.pbxproj index b47c94a87..5fe46aa4a 100644 --- a/entourage.xcodeproj/project.pbxproj +++ b/entourage.xcodeproj/project.pbxproj @@ -379,6 +379,7 @@ 02FCC3172812DDA500578407 /* NeighborhoodHomeGroupCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02FCC3162812DDA500578407 /* NeighborhoodHomeGroupCell.swift */; }; 02FE55B52939F6020076F57A /* OnboardingEndCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02FE55B42939F6020076F57A /* OnboardingEndCell.swift */; }; 02FE55B7293A20030076F57A /* OnboardingEndViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02FE55B6293A20030076F57A /* OnboardingEndViewController.swift */; }; + 261174FE29A670CB00735E9A /* ReportGroupChoosePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 261174FD29A670CB00735E9A /* ReportGroupChoosePageViewController.swift */; }; 2628A0F2298AAA9400F1BF1D /* Extension_UILabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2628A0F1298AAA9400F1BF1D /* Extension_UILabel.swift */; }; 268FCA2A2967281100159C34 /* MJAlertWithImageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 268FCA292967281100159C34 /* MJAlertWithImageController.swift */; }; 268FCA2C2967288100159C34 /* MJAlertWithImageController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 268FCA2B2967288100159C34 /* MJAlertWithImageController.xib */; }; @@ -752,6 +753,7 @@ 02FE55B42939F6020076F57A /* OnboardingEndCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingEndCell.swift; sourceTree = ""; }; 02FE55B6293A20030076F57A /* OnboardingEndViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingEndViewController.swift; sourceTree = ""; }; 1E625F1010BF498EB31E0DB1 /* Pods_entourage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_entourage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 261174FD29A670CB00735E9A /* ReportGroupChoosePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportGroupChoosePageViewController.swift; sourceTree = ""; }; 2628A0F1298AAA9400F1BF1D /* Extension_UILabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extension_UILabel.swift; sourceTree = ""; }; 268FCA292967281100159C34 /* MJAlertWithImageController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MJAlertWithImageController.swift; sourceTree = ""; }; 268FCA2B2967288100159C34 /* MJAlertWithImageController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MJAlertWithImageController.xib; sourceTree = ""; }; @@ -1433,10 +1435,12 @@ 02C6E86A28203E1F009D4289 /* Signal */ = { isa = PBXGroup; children = ( + 261174FF29A6718D00735E9A /* reportChooseCells */, 02C6E86C28203E1F009D4289 /* ReportGroupMainViewController.swift */, 02C6E86E28203E1F009D4289 /* ReportGroupPageViewController.swift */, 02C6E86B28203E1F009D4289 /* ReportGroupSendViewController.swift */, 02C6E86D28203E1F009D4289 /* ReportGroupViewController.swift */, + 261174FD29A670CB00735E9A /* ReportGroupChoosePageViewController.swift */, ); path = Signal; sourceTree = ""; @@ -1586,6 +1590,13 @@ path = cells; sourceTree = ""; }; + 261174FF29A6718D00735E9A /* reportChooseCells */ = { + isa = PBXGroup; + children = ( + ); + path = reportChooseCells; + sourceTree = ""; + }; 268FCA282965E6A000159C34 /* AlertWithImage */ = { isa = PBXGroup; children = ( @@ -1989,6 +2000,7 @@ 02C6E86728203141009D4289 /* NeighborhoodParamEditShowCell.swift in Sources */, 02B57D9E27FC9748005A567B /* PartnerDetailTopCell.swift in Sources */, 024131CB2862022100561FB4 /* EventCreateMainViewController.swift in Sources */, + 261174FE29A670CB00735E9A /* ReportGroupChoosePageViewController.swift in Sources */, 02C54ADF2885BD4A00754222 /* EventFiltersViewController.swift in Sources */, 02A92C2828980F8C000DFF95 /* ActionAddPhotoViewController.swift in Sources */, 0279680A2852472400311D8E /* PedagogicViewModel.swift in Sources */, diff --git a/entourage/Assets/Localizable.strings b/entourage/Assets/Localizable.strings index 75187f506..7e52a02df 100644 --- a/entourage/Assets/Localizable.strings +++ b/entourage/Assets/Localizable.strings @@ -636,7 +636,7 @@ * Group / communauté */ "neighborhood_main_page_title" = "Groupes"; -"neighborhood_main_page_button_myGroups" = "Je participe"; +"neighborhood_main_page_button_myGroups" = "Mes groupes"; "neighborhood_main_page_button_discover" = "Je découvre"; "neighborhoodInputSearch" = "Rechercher un groupe"; "neighborhood_main_page_members" = "%d membres"; diff --git a/entourage/Scenes/Events/Cells/Feed/EventDetailFullCell.swift b/entourage/Scenes/Events/Cells/Feed/EventDetailFullCell.swift index 063484ac4..e127f232d 100644 --- a/entourage/Scenes/Events/Cells/Feed/EventDetailFullCell.swift +++ b/entourage/Scenes/Events/Cells/Feed/EventDetailFullCell.swift @@ -47,6 +47,11 @@ class EventDetailFullCell: UITableViewCell { @IBOutlet weak var ui_lbl_about_title: UILabel! @IBOutlet weak var ui_lbl_about_desc: UILabel! + @IBOutlet weak var ui_view_organised_by: UIView! + + @IBOutlet weak var ui_label_association: UILabel! + @IBOutlet weak var ui_view_association: UIView! + @IBOutlet weak var ui_label_organised_by: UILabel! @IBOutlet weak var ui_iv_location: UIImageView! @IBOutlet weak var ui_label_distance: UILabel! @IBOutlet weak var ui_view_distance: UIView! @@ -267,6 +272,22 @@ class EventDetailFullCell: UITableViewCell { ui_view_button_join.backgroundColor = .appOrange ui_title_bt_join.text = "event_detail_button_participe_OFF".localized } + + if let _author = event.author { + ui_label_organised_by.text = "event_top_cell_organised_by".localized + _author.displayName + ui_view_organised_by.isHidden = false + if let _asso = _author.partner { + ui_view_association.isHidden = false + ui_label_association.text = String(format: "event_top_cell_asso".localized, _asso.name) + }else{ + ui_view_association.isHidden = true + } + + }else { + ui_view_organised_by.isHidden = true + ui_view_association.isHidden = true + } + } @IBAction func action_show_members(_ sender: Any) { diff --git a/entourage/Scenes/Events/Cells/Feed/EventDetailFullCell.xib b/entourage/Scenes/Events/Cells/Feed/EventDetailFullCell.xib index f1422d0e5..d81ebc0a7 100644 --- a/entourage/Scenes/Events/Cells/Feed/EventDetailFullCell.xib +++ b/entourage/Scenes/Events/Cells/Feed/EventDetailFullCell.xib @@ -1,9 +1,9 @@ - + - + @@ -30,7 +30,7 @@ - + @@ -55,10 +55,10 @@ - + - + @@ -157,10 +157,10 @@ - + - + @@ -214,8 +214,72 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -241,7 +305,7 @@ - + - + - + @@ -489,8 +489,5 @@ - - - diff --git a/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.xib b/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.xib index bd4984e29..3e2bffc39 100644 --- a/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.xib +++ b/entourage/Scenes/Events/Cells/Feed/EventDetailTopLightCell.xib @@ -281,8 +281,8 @@ - + - + @@ -424,8 +424,5 @@ - - - diff --git a/entourage/Scenes/Events/EventMainHomeViewController.swift b/entourage/Scenes/Events/EventMainHomeViewController.swift index c70fca4d9..5418b6bdd 100644 --- a/entourage/Scenes/Events/EventMainHomeViewController.swift +++ b/entourage/Scenes/Events/EventMainHomeViewController.swift @@ -42,6 +42,7 @@ class EventMainHomeViewController: UIViewController { @IBOutlet weak var ui_lbl_empty_subtitle_event: UILabel! @IBOutlet weak var ui_lbl_empty_title_event: UILabel! + @IBOutlet weak var uiBtnDiscover: UIButton! @IBOutlet weak var ui_arrow_show_empty: UIImageView! @IBOutlet weak var ui_view_empty_discover: UIView! @IBOutlet weak var ui_lbl_empty_title_discover: UILabel! @@ -396,11 +397,11 @@ class EventMainHomeViewController: UIViewController { } } - @IBAction func action_clear_filters(_ sender: Any) { - self.currentFilter.resetToDefault() - self.ui_location_filter.text = currentFilter.getFilterButtonString() - self.getEventsDiscovered(isReloadFromTab: false, reloadOther: false) - } +// @IBAction func action_clear_filters(_ sender: Any) { +// self.currentFilter.resetToDefault() +// self.ui_location_filter.text = currentFilter.getFilterButtonString() +// self.getEventsDiscovered(isReloadFromTab: false, reloadOther: false) +// } //MARK: - Methods - func changeTabSelection() { diff --git a/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostCell.swift b/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostCell.swift index d0134a92a..2396c0dc1 100644 --- a/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostCell.swift +++ b/entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodPostCell.swift @@ -116,11 +116,13 @@ class NeighborhoodPostCell: UITableViewCell { var tagString = "" if let _user = message.user { if _user.isAdmin() { - tagString = tagString + "title_is_admin".localized - }else if _user.isAmbassador() { - tagString = tagString + "title_is_ambassador".localized - }else if let _partner = _user.partner { - tagString = tagString + _partner.name + tagString = tagString + "title_is_admin".localized + " •" + } + if _user.isAmbassador() { + tagString = tagString + "title_is_ambassador".localized + " •" + } + if let _partner = _user.partner { + tagString = tagString + _partner.name + " •" } } if tagString.isEmpty { diff --git a/entourage/Scenes/Groups - Neighborhoods/Signal/ReportGroupChoosePageViewController.swift b/entourage/Scenes/Groups - Neighborhoods/Signal/ReportGroupChoosePageViewController.swift new file mode 100644 index 000000000..949c285cb --- /dev/null +++ b/entourage/Scenes/Groups - Neighborhoods/Signal/ReportGroupChoosePageViewController.swift @@ -0,0 +1,14 @@ +// +// ReportGroupChoosePageViewController.swift +// entourage +// +// Created by Clement entourage on 22/02/2023. +// + +import Foundation + +class ReportGroupChoosePageViewController:UIViewController { + + @IBOutlet weak var ui_tableview: UITableView! + +} diff --git a/entourage/Storyboards/Event.storyboard b/entourage/Storyboards/Event.storyboard index dcca8ca37..4aad8ae7d 100644 --- a/entourage/Storyboards/Event.storyboard +++ b/entourage/Storyboards/Event.storyboard @@ -84,7 +84,7 @@ - + - - + @@ -328,8 +328,8 @@ - - + + @@ -375,14 +375,14 @@ -