Merge tag 'Ent_TestFlight_8.7.2158'

ReseauEntourage · May 27, 2023 · 15b4496 · 15b4496
2 parents 4ee94b1 + 1b86c43
commit 15b4496
Show file tree

Hide file tree

Showing 33 changed files with 913 additions and 222 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,16 +60,6 @@ Pods/
 
 Carthage/Build
 
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
-
-fastlane/report.xml
-fastlane/screenshots
-
 ### Objective-C Patch ###
 *.xcscmblueprint
 

diff --git a/bitrise.yml b/bitrise.yml
@@ -11,7 +11,7 @@ app:
       is_expand: false
 meta:
   bitrise.io:
-    stack: osx-xcode-14.1.x
+    stack: osx-xcode-14.1.x-ventura
 trigger_map:
 - push_branch: develop
   workflow: Entourage-Preprod
@@ -123,11 +123,11 @@ workflows:
         - deploy_path: $BITRISE_DSYM_PATH
     - deploy-to-itunesconnect-application-loader:
         inputs:
-        - password: $FASTLANE_PASSWORD
+        - password: $APPLESTORE_PASSWORD
         - itunescon_user: $APPLE_ID
-    - firebase-dsym-upload@2:
+    - firebase-dsym-upload:
         inputs:
-        - fdu_fabric_location: ${BUILD_DIR%Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/upload-symbols
+        - fdu_fabric_location: ./firebase_tools/upload-symbols
         - fdu_logging: "yes"
         - fdu_google_services_location: ./entourage/Settings/Environment/GoogleService-Info.plist
     - cache-push:
@@ -183,4 +183,6 @@ workflows:
             # fail if any commands fails
             set -ex
 
+            chmod +x ./firebase_tools/upload-symbols
+
             ./Scripts/count_commit.sh
diff --git a/entourage.xcodeproj/project.pbxproj b/entourage.xcodeproj/project.pbxproj
@@ -381,6 +381,7 @@
 		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 */; };
+		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 */; };
 		264C1AFA29AF52820083F83E /* HeaderReportView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 264C1AF929AF52820083F83E /* HeaderReportView.xib */; };
@@ -389,6 +390,9 @@
 		268FCA2A2967281100159C34 /* MJAlertWithImageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 268FCA292967281100159C34 /* MJAlertWithImageController.swift */; };
 		268FCA2C2967288100159C34 /* MJAlertWithImageController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 268FCA2B2967288100159C34 /* MJAlertWithImageController.xib */; };
 		26BC119929C88CD700F204BB /* NeighborhoodPostDeletedCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 26BC119829C88CD700F204BB /* NeighborhoodPostDeletedCell.xib */; };
+		26F03C912A1B4E3100450A61 /* WelcomeOneTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26F03C902A1B4E3100450A61 /* WelcomeOneTitleCell.swift */; };
+		26F03C932A1B4E5900450A61 /* WelcomeOneTitleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 26F03C922A1B4E5900450A61 /* WelcomeOneTitleCell.xib */; };
+		26F03C952A1B813C00450A61 /* WelcomeOneContentMain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26F03C942A1B813C00450A61 /* WelcomeOneContentMain.swift */; };
 		7E5BAEB3A1FAD453D344F4AE /* Pods_entourage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E625F1010BF498EB31E0DB1 /* Pods_entourage.framework */; };
 /* End PBXBuildFile section */
 
@@ -761,6 +765,7 @@
 		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 = "<group>"; };
 		2628A0F1298AAA9400F1BF1D /* Extension_UILabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extension_UILabel.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>"; };
 		264C1AF929AF52820083F83E /* HeaderReportView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HeaderReportView.xib; sourceTree = "<group>"; };
@@ -769,6 +774,9 @@
 		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>"; };
 		26BC119829C88CD700F204BB /* NeighborhoodPostDeletedCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NeighborhoodPostDeletedCell.xib; sourceTree = "<group>"; };
+		26F03C902A1B4E3100450A61 /* WelcomeOneTitleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeOneTitleCell.swift; sourceTree = "<group>"; };
+		26F03C922A1B4E5900450A61 /* WelcomeOneTitleCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WelcomeOneTitleCell.xib; sourceTree = "<group>"; };
+		26F03C942A1B813C00450A61 /* WelcomeOneContentMain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeOneContentMain.swift; 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>"; };
 		BFFEEE559B5D831168F2302C /* Pods-entourage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-entourage.debug.xcconfig"; path = "Target Support Files/Pods-entourage/Pods-entourage.debug.xcconfig"; sourceTree = "<group>"; };
 		EF9863871BD660A314749193 /* Pods-entourage.beta.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-entourage.beta.xcconfig"; path = "Target Support Files/Pods-entourage/Pods-entourage.beta.xcconfig"; sourceTree = "<group>"; };
@@ -1188,6 +1196,7 @@
 		02681953278DF6E400A98A4A /* Scenes */ = {
 			isa = PBXGroup;
 			children = (
+				2645C1CC2A14FD9000AE8953 /* Welcome */,
 				02681977278DF72D00A98A4A /* pre_onboarding */,
 				02E069CB279184B3006DB1B6 /* Onboarding */,
 				026819B7278E105600A98A4A /* Login */,
@@ -1615,6 +1624,25 @@
 			path = reportChooseCells;
 			sourceTree = "<group>";
 		};
+		2645C1CC2A14FD9000AE8953 /* Welcome */ = {
+			isa = PBXGroup;
+			children = (
+				2645C1CD2A14FDDE00AE8953 /* welcomecells */,
+				2645C1D02A150FD300AE8953 /* WelcomeViewController.swift */,
+			);
+			path = Welcome;
+			sourceTree = "<group>";
+		};
+		2645C1CD2A14FDDE00AE8953 /* welcomecells */ = {
+			isa = PBXGroup;
+			children = (
+				26F03C902A1B4E3100450A61 /* WelcomeOneTitleCell.swift */,
+				26F03C922A1B4E5900450A61 /* WelcomeOneTitleCell.xib */,
+				26F03C942A1B813C00450A61 /* WelcomeOneContentMain.swift */,
+			);
+			path = welcomecells;
+			sourceTree = "<group>";
+		};
 		268FCA282965E6A000159C34 /* AlertWithImage */ = {
 			isa = PBXGroup;
 			children = (
@@ -1784,6 +1812,7 @@
 				02E0EFA82878709D009B2C65 /* EventDetailTopLightCell.xib in Resources */,
 				02C91A2B278F47F300305E0B /* Localizable.strings in Resources */,
 				024131DB2862126B00561FB4 /* Events.xcassets in Resources */,
+				26F03C932A1B4E5900450A61 /* WelcomeOneTitleCell.xib in Resources */,
 				025D8723278DD33800909101 /* Assets.xcassets in Resources */,
 				02E8544E2864AD2C0012D941 /* AddDescriptionFixedTableViewCell.xib in Resources */,
 				0208268028A68447004B1222 /* ActionDeletePopsViewController.xib in Resources */,
@@ -1892,6 +1921,7 @@
 				0229376D27A434F500206201 /* ApplicationTheme.swift in Sources */,
 				02B94C21284F5838006059EF /* HomeMainViewController.swift in Sources */,
 				02F5FEC427E0CB6800A14313 /* MJAlertController.swift in Sources */,
+				2645C1D12A150FD300AE8953 /* WelcomeViewController.swift in Sources */,
 				02B94C1A284F508B006059EF /* HomeService.swift in Sources */,
 				02B94C1C284F50D8006059EF /* Home.swift in Sources */,
 				0223E5142864A4B200E7556E /* AddDescriptionTableViewCell.swift in Sources */,
@@ -1916,6 +1946,7 @@
 				02EC7E4927E87DD400C1110A /* EditProfilePhotoCell.swift in Sources */,
 				264C1AFC29AF5BED0083F83E /* HeaderReportView.swift in Sources */,
 				0208B0C5289D23E1009A7A58 /* ActionDetailFullViewController.swift in Sources */,
+				26F03C952A1B813C00450A61 /* WelcomeOneContentMain.swift in Sources */,
 				02B7922727F74CCB003AFFB9 /* NeighborhoodCreateMainViewController.swift in Sources */,
 				02F5278127999A8C00929431 /* MainGuideViewController.swift in Sources */,
 				02369719296D9F6A00E2CACC /* DetailMessageTopPostCell.swift in Sources */,
@@ -2147,6 +2178,7 @@
 				02F527992799A1F300929431 /* GuideDelegates.swift in Sources */,
 				0224597F28006ACF00944DE4 /* NeighborhoodCreateAddOtherCell.swift in Sources */,
 				02B94C27284F63AB006059EF /* HomeContribCell.swift in Sources */,
+				26F03C912A1B4E3100450A61 /* WelcomeOneTitleCell.swift in Sources */,
 				02E2192728355C11002A1FCB /* NeighborhoodPostPicturePreviewResizeViewController.swift in Sources */,
 				021FBF9228856DC600710584 /* EventUploadPictureService.swift in Sources */,
 				02DD1E91280853CF00538EF4 /* NeighborhoodEditViewController.swift in Sources */,

diff --git a/entourage/AppState.swift b/entourage/AppState.swift
@@ -11,7 +11,6 @@ import SimpleKeychain
 struct AppState {
 
     static func checkNotifcationsAndGoMainScreen() {
-        print("eho")
         let center = UNUserNotificationCenter.current()
         center.getNotificationSettings { settings in
             var status = settings.authorizationStatus

diff --git a/entourage/Assets/Assets.xcassets/welcome/Contents.json b/entourage/Assets/Assets.xcassets/welcome/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/entourage/Assets/Assets.xcassets/welcome/ic_backgrnd_welcome.imageset/Contents.json b/entourage/Assets/Assets.xcassets/welcome/ic_backgrnd_welcome.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "header.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/entourage/Assets/Assets.xcassets/welcome/ic_backgrnd_welcome.imageset/header.pdf b/entourage/Assets/Assets.xcassets/welcome/ic_backgrnd_welcome.imageset/header.pdf
diff --git a/entourage/Assets/Assets.xcassets/welcome/ic_other_welcome.imageset/Contents.json b/entourage/Assets/Assets.xcassets/welcome/ic_other_welcome.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "groupe selfie.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}