Merge tag 'Ent_TestFlight_8.2.2068'

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 */; };
+		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 */; };
 		7E5BAEB3A1FAD453D344F4AE /* Pods_entourage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E625F1010BF498EB31E0DB1 /* Pods_entourage.framework */; };
@@ -751,6 +752,7 @@
 		02FE55B42939F6020076F57A /* OnboardingEndCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingEndCell.swift; sourceTree = "<group>"; };
 		02FE55B6293A20030076F57A /* OnboardingEndViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingEndViewController.swift; sourceTree = "<group>"; };
 		1E625F1010BF498EB31E0DB1 /* Pods_entourage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_entourage.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		2628A0F1298AAA9400F1BF1D /* Extension_UILabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extension_UILabel.swift; sourceTree = "<group>"; };
 		268FCA292967281100159C34 /* MJAlertWithImageController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MJAlertWithImageController.swift; sourceTree = "<group>"; };
 		268FCA2B2967288100159C34 /* MJAlertWithImageController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MJAlertWithImageController.xib; sourceTree = "<group>"; };
 		6E0C250CECA46B36DA7AE8CC /* Pods-entourage.store.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-entourage.store.xcconfig"; path = "Target Support Files/Pods-entourage/Pods-entourage.store.xcconfig"; sourceTree = "<group>"; };
@@ -804,6 +806,7 @@
 				02C3ABF3279AB55D00817B82 /* Extensions_UIViewController.swift */,
 				0288A8DA27CD00FD008D7011 /* Extensions_UIImage.swift */,
 				0224597927FF454A00944DE4 /* Extensions_UITextField.swift */,
+				2628A0F1298AAA9400F1BF1D /* Extension_UILabel.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -1903,6 +1906,7 @@
 				028444CA282015A000AFC072 /* NeighborhoodParamsGroupViewController.swift in Sources */,
 				0220580727FB003700531720 /* BasePopViewController.swift in Sources */,
 				0224597A27FF454A00944DE4 /* Extensions_UITextField.swift in Sources */,
+				2628A0F2298AAA9400F1BF1D /* Extension_UILabel.swift in Sources */,
 				02B94C4528521F82006059EF /* PedagogicResource.swift in Sources */,
 				02B57D9A27FC433F005A567B /* ReportUserSendViewController.swift in Sources */,
 				022744712795BEC0005600A1 /* AuthService.swift in Sources */,
@@ -2201,8 +2205,8 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = buildNumberNotSet;
-				DEVELOPMENT_TEAM = RT7X9LLTN6;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = RT7X9LLTN6;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = "entourage/entourage-Info.plist";

entourage/Assets/Localizable.strings

@@ -812,7 +812,7 @@
 "event_create_phase_1_name_error" = "Le nom de l'événement doit contenir au minimum 2 caractères.";
 "event_create_phase_1_desc" = "Description - obligatoire";
 "event_create_phase_1_desc_placeholder" = "Présentez rapidement ce qu’il va se passer";
-"event_create_phase_1_desc_subtitle" = "(400 caractères max)";
+"event_create_phase_1_desc_subtitle" = "(900 caractères max)";
 "event_create_phase_1_photo" = "Photo - obligatoire";
 "event_create_phase_1_photo_desc" = " Vous pourrez la changer plus tard";
 

entourage/Managers/DeeplinkManager.swift

@@ -47,6 +47,37 @@ struct DeepLinkManager {
         }
     }
 
+    static func setImage(notificationInstanceType:InstanceType) -> String {
+        switch notificationInstanceType {
+        case .users:
+            return "placeholder_user"
+        case .pois:
+            return "ic_notif_placeholder"
+        case .conversations:
+            return "placeholder_user"
+        case .neighborhoods:
+            return "placeholder_user"
+        case .outings:
+            return "placeholder_user"
+        case .partners:
+            return "ic_notif_placeholder"
+        case .resources:
+            return "placeholder_user"
+        case .contributions:
+            return "placeholder_user"
+        case .solicitations:
+            return "placeholder_user"
+        case .neighborhood_post:
+            return "placeholder_user"
+        case .outing_post:
+            return "placeholder_user"
+        case .none:
+            return "ic_notif_placeholder"
+        }
+    }
+
+
+
 
     //MARK: - Navigation Actions -
     static func showUser(userId:Int) {

entourage/Scenes/Conversations/ConversationListMainCell.swift

@@ -45,6 +45,11 @@ class ConversationListMainCell: UITableViewCell {
     func populateCell(message:Conversation, delegate:ConversationListMainCellDelegate, position:Int) {
         ui_username.text = message.title
         ui_role.text = message.getRolesWithPartnerFormated()
+        if let _message = message.getLastMessage {
+            ui_detail_message.setTextWithLinksDetected(_message) { url in
+                delegate.showWebUrl(url:url)
+            }
+        }
         ui_detail_message.text = message.getLastMessage
         ui_date.text = message.createdDateFormatted
 
@@ -99,5 +104,6 @@ class ConversationListMainCell: UITableViewCell {
 //MARK: - Protocol  -
 protocol ConversationListMainCellDelegate:AnyObject {
     func showUserDetail(_ position:Int)
+    func showWebUrl(url:URL)
 }
 

entourage/Scenes/Conversations/ConversationsMainHomeViewController.swift

@@ -249,6 +249,10 @@ extension ConversationsMainHomeViewController: UITableViewDataSource, UITableVie
 
 //MARK: - ConversationListMainCellDelegate -
 extension ConversationsMainHomeViewController: ConversationListMainCellDelegate {
+    func showWebUrl(url: URL) {
+        WebLinkManager.openUrl(url: url, openInApp: true, presenterViewController: self)
+    }
+
     func showUserDetail(_ position: Int) {
         //TODO: not use actually ;)
 

entourage/Scenes/Events/Cells/Feed/EventDetailFullCell.swift

@@ -232,8 +232,11 @@ class EventDetailFullCell: UITableViewCell {
 
         ui_lbl_nb_members.text = membersCount
 
-
-        ui_lbl_about_desc?.text = event.descriptionEvent
+        if let _desc = event.descriptionEvent {
+            ui_lbl_about_desc.setTextWithLinksDetected(_desc) { url in
+                delegate.showWebviewUrl(url:url)
+            }
+        }
 
         if let placeLimit = event.metadata?.place_limit, placeLimit > 0 {
             ui_view_place_limit.isHidden = false
@@ -367,4 +370,5 @@ protocol EventDetailFullDelegate:AnyObject {
     func showLocation()
     func leaveEvent()
     func addToCalendar()
+    func showWebviewUrl(url:URL)
 }

entourage/Scenes/Events/Cells/Feed/EventDetailTopFullCell.swift

@@ -139,7 +139,12 @@ class EventDetailTopFullCell: UITableViewCell {
         ui_lbl_nb_members.text = membersCount
 
         ui_title.text = event.title
-        ui_lbl_about_desc?.text = event.descriptionEvent
+        if let _desc = event.descriptionEvent {
+            ui_lbl_about_desc?.setTextWithLinksDetected(_desc, andLinkHandler: { url in
+                delegate.showWebUrl(url: url)
+            })
+        }
+
 
         if let placeLimit = event.metadata?.place_limit, placeLimit > 0 {
             ui_view_place_limit.isHidden = false
@@ -256,4 +261,5 @@ protocol EventDetailTopCellDelegate : AnyObject {
     func joinLeave()
     func showDetailFull()
     func showPlace()
+    func showWebUrl(url:URL)
 }

entourage/Scenes/Events/EventDetailFeedViewController.swift

@@ -655,6 +655,10 @@ extension EventDetailFeedViewController: MJNavBackViewDelegate {
 
 //MARK: - EventDetailTopCellDelegate -
 extension EventDetailFeedViewController:EventDetailTopCellDelegate {
+    func showWebUrl(url: URL) {
+        WebLinkManager.openUrl(url: url, openInApp: true, presenterViewController: self)
+    }
+
     func showMembers() {
         if let navVC = UIStoryboard.init(name: StoryboardName.neighborhood, bundle: nil).instantiateViewController(withIdentifier: "users_groupNav") as? UINavigationController, let vc = navVC.topViewController as? NeighBorhoodEventListUsersViewController {
             vc.event = event
@@ -690,6 +694,10 @@ extension EventDetailFeedViewController:EventDetailTopCellDelegate {
 
 //MARK: - NeighborhoodPostCellDelegate -
 extension EventDetailFeedViewController:NeighborhoodPostCellDelegate {
+    func showWebviewUrl(url: URL) {
+        WebLinkManager.openUrl(url: url, openInApp: true, presenterViewController: self)
+    }
+
     func showImage(imageUrl: URL?, postId: Int) {
         self.getDetailPost(eventId: self.eventId, parentPostId: postId)
     }

entourage/Scenes/Events/EventDetailFullFeedViewController.swift

@@ -136,6 +136,10 @@ extension EventDetailFullFeedViewController: UITableViewDataSource, UITableViewD
 
 //MARK: - EventDetailFullDelegate -
 extension EventDetailFullFeedViewController: EventDetailFullDelegate {
+    func showWebviewUrl(url: URL) {
+        WebLinkManager.openUrl(url: url, openInApp: true, presenterViewController: self)
+    }
+
     func showMembers() {
         if let navVC = UIStoryboard.init(name: StoryboardName.neighborhood, bundle: nil).instantiateViewController(withIdentifier: "users_groupNav") as? UINavigationController, let vc = navVC.topViewController as? NeighBorhoodEventListUsersViewController {
             vc.event = event

entourage/Scenes/Events/EventMainHomeViewController.swift

@@ -363,8 +363,6 @@ class EventMainHomeViewController: UIViewController {
 
     @IBAction func action_discover(_ sender: Any?) {
         isEventSelected = false
-
-
         if isEventSelected != currentSelectedIsEvent && self.eventsDiscoveredExtracted.events.count == 0 {
             currentPageDiscover = 1
             self.eventsDiscoveredExtracted.events.removeAll()
@@ -602,14 +600,11 @@ extension EventMainHomeViewController: UITableViewDataSource, UITableViewDelegat
 
         let cell = tableView.dequeueReusableCell(withIdentifier: cellName, for: indexPath) as! EventListCell
         cell.populateCell(event: event, hideSeparator: true)
-        if isEventSelected {
-            if event.checkIsEventPassed(){
-                cell.setPassed()
-            }else{
-                cell.setIncoming()
-            }
+        if event.checkIsEventPassed(){
+            cell.setPassed()
+        }else{
+            cell.setIncoming()
         }
-
         return cell
     }
 

entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodDetailTopCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import ActiveLabel
 
 class NeighborhoodDetailTopCell: UITableViewCell {
 
@@ -26,7 +27,7 @@ class NeighborhoodDetailTopCell: UITableViewCell {
     @IBOutlet weak var ui_lbl_bt_join: UILabel!
 
     @IBOutlet weak var ui_lbl_about_title: UILabel!
-    @IBOutlet weak var ui_lbl_about_desc: UILabel!
+    @IBOutlet weak var ui_lbl_about_desc: ActiveLabel!
 
     @IBOutlet weak var ui_taglist_view: TagListView!
 
@@ -121,8 +122,14 @@ class NeighborhoodDetailTopCell: UITableViewCell {
         ui_lbl_nb_members.text = membersCount
 
         ui_title.text = neighborhood.name
-        ui_lbl_about_desc?.text = neighborhood.aboutGroup
-
+        //ui_lbl_about_desc?.text = neighborhood.aboutGroup
+        if let _desc = neighborhood.aboutGroup{
+            ui_lbl_about_desc?.setTextWithLinksDetected(_desc, andLinkHandler: { url in
+                delegate.showWebUrl(url: url)
+            })
+
+        }
+
         let currentUserId = UserDefaults.currentUser?.sid
         if isFollowingGroup {
             ui_lbl_bt_join.setupFontAndColor(style: ApplicationTheme.getFontBoutonOrange())
@@ -195,6 +202,7 @@ protocol NeighborhoodDetailTopCellDelegate : AnyObject {
     func showMembers()
     func joinLeave()
     func showDetailFull()
+    func showWebUrl(url:URL)
 }
 
 

entourage/Scenes/Groups - Neighborhoods/Cells/Detail/NeighborhoodDetailTopCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -29,13 +29,13 @@
                 <rect key="frame" x="0.0" y="0.0" width="406" height="503"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TitreE" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ufu-cQ-0kZ">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="TitreE" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ufu-cQ-0kZ">
                         <rect key="frame" x="28" y="28" width="350" height="29"/>
                         <fontDescription key="fontDescription" type="boldSystem" pointSize="24"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NqP-dj-PlY">
+                    <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NqP-dj-PlY">
                         <rect key="frame" x="28" y="63" width="350" height="25"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="hyP-Ld-8Vq">
@@ -110,7 +110,7 @@
                             <constraint firstItem="hyP-Ld-8Vq" firstAttribute="leading" secondItem="NqP-dj-PlY" secondAttribute="leading" id="zOR-b9-9SX"/>
                         </constraints>
                     </view>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IDe-ts-1MI">
+                    <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IDe-ts-1MI">
                         <rect key="frame" x="28" y="108" width="140" height="44"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="254" verticalHuggingPriority="251" horizontalCompressionResistancePriority="754" image="ic_plus_white" translatesAutoresizingMaskIntoConstraints="NO" id="BAJ-31-kdt">
@@ -153,20 +153,20 @@
                             <constraint firstItem="RpC-Az-CBT" firstAttribute="leading" secondItem="IDe-ts-1MI" secondAttribute="leading" constant="20" id="za5-NU-YWq"/>
                         </constraints>
                     </view>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H48-1Z-fiF">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H48-1Z-fiF">
                         <rect key="frame" x="28" y="172" width="350" height="19"/>
                         <fontDescription key="fontDescription" name="Quicksand-Bold" family="Quicksand" pointSize="15"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="&quot; Bio bio bio &quot;" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N82-O7-OMh">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="&quot; Bio bio bio &quot;" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N82-O7-OMh">
                         <rect key="frame" x="28" y="195" width="350" height="20.5"/>
                         <fontDescription key="fontDescription" name="NunitoSans-Regular" family="Nunito Sans" pointSize="15"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" verticalHuggingPriority="252" verticalCompressionResistancePriority="752" translatesAutoresizingMaskIntoConstraints="NO" id="WJR-9r-zef" customClass="TagListView" customModule="Ent_Beta" customModuleProvider="target">
-                        <rect key="frame" x="28" y="239.5" width="350" height="235.5"/>
+                        <rect key="frame" x="28" y="463" width="350" height="12"/>
                         <color key="backgroundColor" red="1" green="0.61176470589999998" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" id="Uj6-9J-JAp"/>
@@ -229,6 +229,11 @@
             <point key="canvasLocation" x="133" y="75"/>
         </tableViewCell>
     </objects>
+    <designables>
+        <designable name="WJR-9r-zef">
+            <size key="intrinsicContentSize" width="350" height="12"/>
+        </designable>
+    </designables>
     <resources>
         <image name="ic_plus_white" width="19" height="19"/>
         <namedColor name="BeigeClair">