Skip to content

Commit

Permalink
Merge tag 'Ent_TestFlight_8.12.2231'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	entourage/Scenes/Home/HomeMainViewController.swift
  • Loading branch information
@FrPellissier
FrPellissier committed Oct 4, 2023
2 parents 3da2a60 + 9a99ef0 commit e160da9
Show file tree
Hide file tree
Showing 20 changed files with 826 additions and 148 deletions.
1 change: 1 addition & 0 deletions Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ target 'entourage' do
use_frameworks!

pod 'GooglePlaces'

end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ SPEC REPOS:
SPEC CHECKSUMS:
GooglePlaces: c57cd5aa7e91d10fa5106c792de74f3bd6436260

PODFILE CHECKSUM: d8ad7bc8b27ba1a4779fe28eb5bbb3cd2569fe9e
PODFILE CHECKSUM: c9d719a04bb42afadacbe54a65187f62ebe9f939

COCOAPODS: 1.11.3
40 changes: 24 additions & 16 deletions entourage.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,8 @@
2628A0F2298AAA9400F1BF1D /* Extension_UILabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2628A0F1298AAA9400F1BF1D /* Extension_UILabel.swift */; };
2636B9622A7B9F04007EE1B2 /* RugbySpecialPopUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2636B9612A7B9F04007EE1B2 /* RugbySpecialPopUpViewController.swift */; };
2636B9642A7BA199007EE1B2 /* anim_rugby.json in Resources */ = {isa = PBXBuildFile; fileRef = 2636B9632A7BA199007EE1B2 /* anim_rugby.json */; };
264446D02AA1E04800EA2EED /* ActionPasseOneDemand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 264446CF2AA1E04800EA2EED /* ActionPasseOneDemand.swift */; };
264446D22AA1E05B00EA2EED /* ActionPassedOneContrib.swift in Sources */ = {isa = PBXBuildFile; fileRef = 264446D12AA1E05B00EA2EED /* ActionPassedOneContrib.swift */; };
2645C1D12A150FD300AE8953 /* WelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2645C1D02A150FD300AE8953 /* WelcomeViewController.swift */; };
264C1AF629AD0E3C0083F83E /* ReportChooseViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 264C1AF529AD0E3C0083F83E /* ReportChooseViewCell.swift */; };
264C1AF829AD22AB0083F83E /* ReportChooseViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 264C1AF729AD22AB0083F83E /* ReportChooseViewCell.xib */; };
Expand Down Expand Up @@ -796,6 +798,8 @@
2628A0F1298AAA9400F1BF1D /* Extension_UILabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extension_UILabel.swift; sourceTree = "<group>"; };
2636B9612A7B9F04007EE1B2 /* RugbySpecialPopUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RugbySpecialPopUpViewController.swift; sourceTree = "<group>"; };
2636B9632A7BA199007EE1B2 /* anim_rugby.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_rugby.json; sourceTree = "<group>"; };
264446CF2AA1E04800EA2EED /* ActionPasseOneDemand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionPasseOneDemand.swift; sourceTree = "<group>"; };
264446D12AA1E05B00EA2EED /* ActionPassedOneContrib.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionPassedOneContrib.swift; sourceTree = "<group>"; };
2645C1D02A150FD300AE8953 /* WelcomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeViewController.swift; sourceTree = "<group>"; };
264C1AF529AD0E3C0083F83E /* ReportChooseViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportChooseViewCell.swift; sourceTree = "<group>"; };
264C1AF729AD22AB0083F83E /* ReportChooseViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReportChooseViewCell.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1740,6 +1744,8 @@
children = (
26BE845F2A67F26000DC2586 /* ActionPassedOneVC.swift */,
26BE84632A67F50500DC2586 /* ActionPassedTwoVC.swift */,
264446CF2AA1E04800EA2EED /* ActionPasseOneDemand.swift */,
264446D12AA1E05B00EA2EED /* ActionPassedOneContrib.swift */,
);
path = actionpassed;
sourceTree = "<group>";
Expand Down Expand Up @@ -1846,14 +1852,14 @@
mainGroup = 025D870D278DD33600909101;
packageReferences = (
02DB3BC627A14DFC004732C9 /* XCRemoteSwiftPackageReference "Nantes" */,
0288A8E227CD11E9008D7011 /* XCRemoteSwiftPackageReference "SDWebImage" */,
0246604B27D8A49E00FE1EF8 /* XCRemoteSwiftPackageReference "IHProgressHUD" */,
0288A8E227CD11E9008D7011 /* XCRemoteSwiftPackageReference "SDWebImage.git" */,
0246604B27D8A49E00FE1EF8 /* XCRemoteSwiftPackageReference "IHProgressHUD.git" */,
029E307D27DB60D300B12357 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
02E0098A27E37B1100BB23CA /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
02B94C3E2850D4A2006059EF /* XCRemoteSwiftPackageReference "IQKeyboardManager" */,
020AF5DC286064AC0012AE60 /* XCRemoteSwiftPackageReference "lottie-ios" */,
02B94C3E2850D4A2006059EF /* XCRemoteSwiftPackageReference "IQKeyboardManager.git" */,
020AF5DC286064AC0012AE60 /* XCRemoteSwiftPackageReference "lottie-ios.git" */,
02F8276F2967287B000CA150 /* XCRemoteSwiftPackageReference "SimpleKeychain" */,
02E9D6C02970124800F9625D /* XCRemoteSwiftPackageReference "ActiveLabel.swift" */,
02E9D6C02970124800F9625D /* XCRemoteSwiftPackageReference "ActiveLabel.swift.git" */,
);
productRefGroup = 025D8717278DD33600909101 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -2122,6 +2128,7 @@
02B94C23284F594A006059EF /* HomeMainViewModel.swift in Sources */,
2619E1432A261C93000BD574 /* WelcomeTwoViewController.swift in Sources */,
26C1BB6A2A3B3C6400C81C09 /* WelcomeThreeDemandExampleCell.swift in Sources */,
264446D22AA1E05B00EA2EED /* ActionPassedOneContrib.swift in Sources */,
02E0EFA328787082009B2C65 /* EventDetailTopFullCell.swift in Sources */,
02A92C222897E68B000DFF95 /* ActionCreatePhase1ViewController.swift in Sources */,
0224596F27FF28FC00944DE4 /* MJErrorInputTextView.swift in Sources */,
Expand Down Expand Up @@ -2163,6 +2170,7 @@
024131D9286207D100561FB4 /* EventMainHomeViewController.swift in Sources */,
021E03D027D8EE2B003745DE /* MainUserActivitiesCell.swift in Sources */,
026819BF278E105600A98A4A /* OTLoginNextViewController.swift in Sources */,
264446D02AA1E04800EA2EED /* ActionPasseOneDemand.swift in Sources */,
02FB5444287DC01200E4B9FA /* EventDetailFullCell.swift in Sources */,
025D8766278DEC2100909101 /* Extensions.swift in Sources */,
028D4F562937970500A0BDD3 /* OnboardingPhase1ViewController.swift in Sources */,
Expand Down Expand Up @@ -2692,23 +2700,23 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
020AF5DC286064AC0012AE60 /* XCRemoteSwiftPackageReference "lottie-ios" */ = {
020AF5DC286064AC0012AE60 /* XCRemoteSwiftPackageReference "lottie-ios.git" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/airbnb/lottie-ios.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 3.0.0;
};
};
0246604B27D8A49E00FE1EF8 /* XCRemoteSwiftPackageReference "IHProgressHUD" */ = {
0246604B27D8A49E00FE1EF8 /* XCRemoteSwiftPackageReference "IHProgressHUD.git" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Swiftify-Corp/IHProgressHUD.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.1.8;
};
};
0288A8E227CD11E9008D7011 /* XCRemoteSwiftPackageReference "SDWebImage" */ = {
0288A8E227CD11E9008D7011 /* XCRemoteSwiftPackageReference "SDWebImage.git" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/SDWebImage/SDWebImage.git";
requirement = {
Expand All @@ -2724,7 +2732,7 @@
minimumVersion = 8.0.0;
};
};
02B94C3E2850D4A2006059EF /* XCRemoteSwiftPackageReference "IQKeyboardManager" */ = {
02B94C3E2850D4A2006059EF /* XCRemoteSwiftPackageReference "IQKeyboardManager.git" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/hackiftekhar/IQKeyboardManager.git";
requirement = {
Expand All @@ -2748,7 +2756,7 @@
minimumVersion = 8.0.0;
};
};
02E9D6C02970124800F9625D /* XCRemoteSwiftPackageReference "ActiveLabel.swift" */ = {
02E9D6C02970124800F9625D /* XCRemoteSwiftPackageReference "ActiveLabel.swift.git" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/optonaut/ActiveLabel.swift.git";
requirement = {
Expand All @@ -2769,22 +2777,22 @@
/* Begin XCSwiftPackageProductDependency section */
020AF5DD286064AC0012AE60 /* Lottie */ = {
isa = XCSwiftPackageProductDependency;
package = 020AF5DC286064AC0012AE60 /* XCRemoteSwiftPackageReference "lottie-ios" */;
package = 020AF5DC286064AC0012AE60 /* XCRemoteSwiftPackageReference "lottie-ios.git" */;
productName = Lottie;
};
0246604C27D8A49E00FE1EF8 /* IHProgressHUD */ = {
isa = XCSwiftPackageProductDependency;
package = 0246604B27D8A49E00FE1EF8 /* XCRemoteSwiftPackageReference "IHProgressHUD" */;
package = 0246604B27D8A49E00FE1EF8 /* XCRemoteSwiftPackageReference "IHProgressHUD.git" */;
productName = IHProgressHUD;
};
0288A8E327CD11E9008D7011 /* SDWebImage */ = {
isa = XCSwiftPackageProductDependency;
package = 0288A8E227CD11E9008D7011 /* XCRemoteSwiftPackageReference "SDWebImage" */;
package = 0288A8E227CD11E9008D7011 /* XCRemoteSwiftPackageReference "SDWebImage.git" */;
productName = SDWebImage;
};
0288A8E527CD11E9008D7011 /* SDWebImageMapKit */ = {
isa = XCSwiftPackageProductDependency;
package = 0288A8E227CD11E9008D7011 /* XCRemoteSwiftPackageReference "SDWebImage" */;
package = 0288A8E227CD11E9008D7011 /* XCRemoteSwiftPackageReference "SDWebImage.git" */;
productName = SDWebImageMapKit;
};
029E307E27DB60D300B12357 /* FirebaseAnalytics */ = {
Expand All @@ -2794,7 +2802,7 @@
};
02B94C3F2850D4A2006059EF /* IQKeyboardManagerSwift */ = {
isa = XCSwiftPackageProductDependency;
package = 02B94C3E2850D4A2006059EF /* XCRemoteSwiftPackageReference "IQKeyboardManager" */;
package = 02B94C3E2850D4A2006059EF /* XCRemoteSwiftPackageReference "IQKeyboardManager.git" */;
productName = IQKeyboardManagerSwift;
};
02DB3BC727A14DFC004732C9 /* Nantes */ = {
Expand Down Expand Up @@ -2824,7 +2832,7 @@
};
02E9D6C12970124900F9625D /* ActiveLabel */ = {
isa = XCSwiftPackageProductDependency;
package = 02E9D6C02970124800F9625D /* XCRemoteSwiftPackageReference "ActiveLabel.swift" */;
package = 02E9D6C02970124800F9625D /* XCRemoteSwiftPackageReference "ActiveLabel.swift.git" */;
productName = ActiveLabel;
};
02F827702967287B000CA150 /* SimpleKeychain */ = {
Expand Down
2 changes: 1 addition & 1 deletion entourage/MainTabbarViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class MainTabbarViewController: UITabBarController {
}
@objc func showMyNeighborhoods() {
if let vc = groupVC.topViewController as? NeighborhoodHomeViewController {
vc.setMyFirst()
vc.setDiscoverFirst()
}
self.selectedIndex = 3
self.boldSelectedItem()
Expand Down
47 changes: 47 additions & 0 deletions entourage/Managers/DeeplinkManager.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,52 @@ import Foundation
struct DeepLinkManager {

static func presentAction(notification:NotificationPushData) {
if notification.stage != nil && !notification.stage!.isEmpty{
if notification.stage == "h1" {
DeepLinkManager.showWelcomeOne()
return
}
if notification.stage == "j2" {
DeepLinkManager.showWelcomeTwo()
return
}
if notification.stage == "j5" {
DeepLinkManager.showWelcomeThree()
return
}
if notification.stage == "j8" {
DeepLinkManager.showWelcomeFour()
return
}
if notification.stage == "j11" {
DeepLinkManager.showWelcomeFive()
return
}

}
if notification.context != nil && !notification.context!.isEmpty{
if notification.context == "h1" {
DeepLinkManager.showWelcomeOne()
return
}
if notification.context == "j2" {
DeepLinkManager.showWelcomeTwo()
return
}
if notification.stage == "j5" {
DeepLinkManager.showWelcomeThree()
return
}
if notification.context == "j8" {
DeepLinkManager.showWelcomeFour()
return
}
if notification.context == "j11" {
DeepLinkManager.showWelcomeFive()
return
}

}
switch notification.instanceType {
case .users:
showUser(userId: notification.instanceId)
Expand Down Expand Up @@ -420,6 +466,7 @@ struct DeepLinkManager {
}
}


static func showResourceUniversalLink(id:String) {
if let vc = UIStoryboard.init(name: StoryboardName.main, bundle: nil).instantiateViewController(withIdentifier: "pedagoDetailVC") as? PedagogicDetailViewController {
vc.hashdResourceId = id
Expand Down
7 changes: 7 additions & 0 deletions entourage/Managers/UniversalLinkManager.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ struct UniversalLinkManager {
if components.host != stagingURL {
iterator = 1
}

if pathComponents.contains("actions"){
if let url = components.url {
print("eho url ", url)
WebLinkManager.openUrl(url: url, openInApp: true, presenterViewController: AppState.getTopViewController())
}
}

if pathComponents.contains("outings") && pathComponents.contains("chat_messages"){
if pathComponents.count > 3 + iterator , let _eventhashId = pathComponents[2+iterator] as? String, let _posthashId = pathComponents[3+iterator] as? String {
Expand Down
1 change: 1 addition & 0 deletions entourage/Models/NotificationPushData.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ struct NotificationPushData {
//value = h1, j2, j8, j11
var url: String? = nil
var stage:String? = nil
var context:String? = nil

init(instanceName:String, instanceId:Int, postId:Int?) {
self.instanceType = InstanceType.getFromString(key: instanceName)
Expand Down
8 changes: 7 additions & 1 deletion entourage/Scenes/Events/EventDetailMessagesViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ extension EventDetailMessagesViewController: UITableViewDataSource, UITableViewD

let cell = tableView.dequeueReusableCell(withIdentifier: identifier, for: indexPath) as! DetailMessageTopPostCell
cell.populateCell(message: postMessage!)

cell.delegate = self
return cell
}

Expand Down Expand Up @@ -384,3 +384,9 @@ extension EventDetailMessagesViewController:GroupDetailDelegate {
protocol UpdateCommentCountDelegate:AnyObject {
func updateCommentCount(parentCommentId:Int,nbComments:Int, currentIndexPathSelected:IndexPath?)
}

extension EventDetailMessagesViewController:DetailMessageTopCellDelegate{
func showWebView(url: URL) {
WebLinkManager.openUrl(url: url, openInApp: true, presenterViewController: self)
}
}
17 changes: 15 additions & 2 deletions ...urage/Scenes/Groups - Neighborhoods/Cells/Message top cell/DetailMessageTopPostCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,19 @@
//

import UIKit
import ActiveLabel

protocol DetailMessageTopCellDelegate{
func showWebView(url:URL)
}

class DetailMessageTopPostCell: UITableViewCell {

@IBOutlet weak var ui_iv_user: UIImageView!

@IBOutlet weak var ui_user: UILabel!

@IBOutlet weak var ui_comment: UILabel!
@IBOutlet weak var ui_comment: ActiveLabel!

@IBOutlet weak var ui_image_post: UIImageView?

Expand All @@ -25,24 +30,32 @@ class DetailMessageTopPostCell: UITableViewCell {

var postId:Int = 0
var imageUrl:URL? = nil
var delegate:DetailMessageTopCellDelegate?

var postMessage:PostMessage!

override func awakeFromNib() {
super.awakeFromNib()
print("eho top cell")
ui_iv_user.layer.cornerRadius = ui_iv_user.frame.height / 2

ui_user.setupFontAndColor(style: MJTextFontColorStyle(font: ApplicationTheme.getFontNunitoRegular(size: 12), color: .appOrangeLight))

ui_comment.setupFontAndColor(style: ApplicationTheme.getFontCourantRegularNoir())

ui_comment.enabledTypes = [.url]
ui_comment.handleURLTap { url in
// Ouvrez le lien dans Safari, par exemple
self.delegate?.showWebView(url: url)
}
ui_image_post?.layer.cornerRadius = 8

}

func populateCell(message:PostMessage) {
self.postMessage = message
ui_user.text = "\(message.user?.displayName ?? "-") le \(message.createdDateFormatted)"
ui_comment.text = message.content

postId = message.uid

if let _url = message.user?.avatarURL, let url = URL(string: _url) {
Expand Down
Loading

0 comments on commit e160da9

Please sign in to comment.