Skip to content

Commit

Permalink
Merge tag 'Ent_TestFlight_8.3.2104'
Browse files Browse the repository at this point in the history
  • Loading branch information
FrPellissier committed Mar 27, 2023
2 parents bd51208 + 12517d1 commit 67425d6
Show file tree
Hide file tree
Showing 48 changed files with 1,604 additions and 294 deletions.
3 changes: 3 additions & 0 deletions bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,9 @@ workflows:
Workflow|${BITRISE_TRIGGERED_WORKFLOW_ID}
Prepare:
steps:
- set-java-version@1:
inputs:
- set_java_version: '17'
- activate-ssh-key:
run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
- git-clone@6:
Expand Down
32 changes: 32 additions & 0 deletions entourage.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,15 @@
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 */; };
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 */; };
264C1AFC29AF5BED0083F83E /* HeaderReportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 264C1AFB29AF5BED0083F83E /* HeaderReportView.swift */; };
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 */; };
7E5BAEB3A1FAD453D344F4AE /* Pods_entourage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E625F1010BF498EB31E0DB1 /* Pods_entourage.framework */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -752,9 +758,15 @@
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; };
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>"; };
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>"; };
264C1AFB29AF5BED0083F83E /* HeaderReportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderReportView.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>"; };
26BC119829C88CD700F204BB /* NeighborhoodPostDeletedCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NeighborhoodPostDeletedCell.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>"; };
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>"; };
Expand Down Expand Up @@ -981,6 +993,7 @@
0258AFE3282AD3BD00E7B4AA /* NeighborhoodEventsTableviewCell.swift */,
025C92C22834149B000970D9 /* NeighborhoodEventsTableviewCell.xib */,
025C92C428341611000970D9 /* NeighborhoodEventsCollectionviewCell.xib */,
26BC119829C88CD700F204BB /* NeighborhoodPostDeletedCell.xib */,
);
path = Detail;
sourceTree = "<group>";
Expand Down Expand Up @@ -1433,10 +1446,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 = "<group>";
Expand Down Expand Up @@ -1586,6 +1601,17 @@
path = cells;
sourceTree = "<group>";
};
261174FF29A6718D00735E9A /* reportChooseCells */ = {
isa = PBXGroup;
children = (
264C1AF529AD0E3C0083F83E /* ReportChooseViewCell.swift */,
264C1AF729AD22AB0083F83E /* ReportChooseViewCell.xib */,
264C1AF929AF52820083F83E /* HeaderReportView.xib */,
264C1AFB29AF5BED0083F83E /* HeaderReportView.swift */,
);
path = reportChooseCells;
sourceTree = "<group>";
};
268FCA282965E6A000159C34 /* AlertWithImage */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1745,6 +1771,7 @@
028D4F52293795B700A0BDD3 /* Onboarding.storyboard in Resources */,
0260E9D62936402100242A89 /* Intros.xcassets in Resources */,
021FD9672875F4ED00D3AA54 /* EventListMeCell.xib in Resources */,
264C1AFA29AF52820083F83E /* HeaderReportView.xib in Resources */,
025C92BA28340F10000970D9 /* NeighborhoodDetailTopMemberCell.xib in Resources */,
02B94C2C284F8F0C006059EF /* HomeActionCell.xib in Resources */,
02856F6227DA334100988FF7 /* ProfileParams.storyboard in Resources */,
Expand All @@ -1757,6 +1784,7 @@
025D8723278DD33800909101 /* Assets.xcassets in Resources */,
02E8544E2864AD2C0012D941 /* AddDescriptionFixedTableViewCell.xib in Resources */,
0208268028A68447004B1222 /* ActionDeletePopsViewController.xib in Resources */,
264C1AF829AD22AB0083F83E /* ReportChooseViewCell.xib in Resources */,
021FD9652875BEAC00D3AA54 /* Event.storyboard in Resources */,
02EFE47A289BFC0D00D70C68 /* Action_Create.storyboard in Resources */,
020AF5E528607EFE0012AE60 /* congrat_short_anim.json in Resources */,
Expand All @@ -1779,6 +1807,7 @@
023B07CC27D664F6007752AC /* Profile.xcassets in Resources */,
025D8768278DED3C00909101 /* AppConfigurations.plist in Resources */,
025C92B028340787000970D9 /* NeighborhoodPostTextCell.xib in Resources */,
26BC119929C88CD700F204BB /* NeighborhoodPostDeletedCell.xib in Resources */,
02CCE67C27D78CAB00D6976C /* NunitoSans-SemiBold.ttf in Resources */,
02CCE67D27D78CAB00D6976C /* NunitoSans-Bold.ttf in Resources */,
02F5FEC527E0CB6800A14313 /* MJAlertController.xib in Resources */,
Expand Down Expand Up @@ -1882,6 +1911,7 @@
02CCE68D27D7B8E700D6976C /* MainUserProfileViewController.swift in Sources */,
021318A927DF4E3100B0F1BD /* Metadatas.swift in Sources */,
02EC7E4927E87DD400C1110A /* EditProfilePhotoCell.swift in Sources */,
264C1AFC29AF5BED0083F83E /* HeaderReportView.swift in Sources */,
0208B0C5289D23E1009A7A58 /* ActionDetailFullViewController.swift in Sources */,
02B7922727F74CCB003AFFB9 /* NeighborhoodCreateMainViewController.swift in Sources */,
02F5278127999A8C00929431 /* MainGuideViewController.swift in Sources */,
Expand Down Expand Up @@ -1912,6 +1942,7 @@
022744712795BEC0005600A1 /* AuthService.swift in Sources */,
02C9B4AC27E2377A0026450A /* ParamsAboutCell.swift in Sources */,
0282637C282160B700B354F9 /* NeighborhoodCguCell.swift in Sources */,
264C1AF629AD0E3C0083F83E /* ReportChooseViewCell.swift in Sources */,
0224597827FF327C00944DE4 /* NeighborhoodCreateLocationCell.swift in Sources */,
02EFE47C289BFD2A00D70C68 /* ActionsMyListViewController.swift in Sources */,
024131D42862030A00561FB4 /* EventCreatePhase2ViewController.swift in Sources */,
Expand Down Expand Up @@ -1989,6 +2020,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 */,
Expand Down
25 changes: 24 additions & 1 deletion entourage/Assets/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,17 @@
"report_user_signal_error" = "Veuillez choisir au minimum une cause.";
"report_user_message_error" = "Veuillez saisir votre message. Merci";
"report_user_message_success" = "Utilisateur signalé";
"parameter_publication" = "Paramètres de la publication";
"supress_button_title" = "Supprimer";
"supress_alert_title" = "Supprimer la publication";
"supress_alert_text" = "Souhaitez-vous supprimer cette publication ?";
"deleted_post_text" = "Cette publication a été supprimée";

//REPORT AND SUPPRESS POPUP
"report_post_cell_title" = "Signaler";
"suppress_post_cell_title" = "Supprimer ma publication";
"report_post_cell_subtitle" = "Signaler cette publication à l'équipe Entourage";
"suppress_post_cell_subtitle" = "";


/********
Expand Down Expand Up @@ -636,7 +647,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";
Expand All @@ -653,6 +664,8 @@
/*************
* Group detail
*/
"title_is_ambassador" = "Ambassadeur •" ;
"title_is_admin" = "Administrateur •" ;

"neighborhood_detail_button_join_member" = "Membre";
"neighborhood_detail_button_join_join" = "Rejoindre";
Expand Down Expand Up @@ -789,6 +802,12 @@

/** Events*/
"passed_event" = "Événements passés";


//EVENT TOP Cell
"event_top_cell_organised_by" = "Organisé par ";
"event_top_cell_asso" = "Événement %@" ;

//Create

"eventCreatePopCloseBackTitle" = "Attention";
Expand Down Expand Up @@ -894,7 +913,11 @@
"event_event_my_empty_subtitle" = "C'est l'occasion de découvrir ce qu'il se passe près de chez vous, ou de créer un nouvel événement !";
"event_event_discover_empty_title" = "Oups, aucun événement autour de vous";
"event_event_discover_empty_subtitle" = "Si aucun événement ne se trouve près de vous, vous pouvez élargir votre zone de recherche.";
"event_no_event_but_discover" = "C'est l'occasion de découvrir ce qu'il se passe près de chez nous, ou de créer un nouvel événement !";
"event_no_event_go_create" = "Aucun évènement autour de vous. N'hésitez pas à en créer un !";
"event_event_discover_clear_filters" = "Réinitialiser les filtres";
"event_title_btn_discover_event" = "Découvrir les évènements";
"event_title_btn_create_event" = "Créer un évènement";
"event_event_discover_empty_search_title" = "Mince, aucun résultat ne correspond à votre recherche !";
"event_event_discover_empty_search_subtitle" = "Vous ne trouvez pas l'événement de vos rêves ? N'attendez plus pour le créer ou élargissez votre zone de recherche.";
"event_detail_button_more" = "En savoir plus";
Expand Down
6 changes: 6 additions & 0 deletions entourage/Assets/Neighborhood.xcassets/report/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "attention Copy 4.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "attention Copy 21.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file not shown.
2 changes: 2 additions & 0 deletions entourage/Models/GlobalObjects.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ struct PostMessage:Codable {
var user:UserLightNeighborhood? = nil
var commentsCount:Int? = 0
var messageImageUrl:String? = nil
var status:String? = nil

var isRetryMsg = false

Expand All @@ -68,6 +69,7 @@ struct PostMessage:Codable {
case commentsCount = "comments_count"
case messageImageUrl = "image_url"
case read
case status
}

//Use to sort messages in days Dicts
Expand Down
6 changes: 6 additions & 0 deletions entourage/Models/User.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand Down
4 changes: 4 additions & 0 deletions entourage/Network Managers/Endpoints.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ let kAPIGetNeighborhoodMessages = "neighborhoods/%@/chat_messages/%@/comments?to
let kAPIReportPostNeighborhood = "neighborhoods/%@/chat_messages/%@/report?token=%@"
let kAPIReportPostCommentNeighborhood = "neighborhoods/%@/chat_messages/%@/report?token=%@"
let kAPIGetNeighborhoodPostMessage = "neighborhoods/%@/chat_messages/%@?token=%@&image_size=high"
let kAPIDeleteNeigborhoodPostMessage = "neighborhoods/%d/chat_messages/%d?token=%@"


//Amazon S3
let API_URL_USER_PREPARE_AVATAR_UPLOAD = "users/me/presigned_avatar_upload.json?token=%@"
Expand Down Expand Up @@ -85,6 +87,7 @@ let kAPIReportPostCommentEvent = "outings/%@/chat_messages/%@/report?token=%@"
let kAPIPostOutingPostMessage = "outings/%@/chat_messages?token=%@"
let kAPIGetOutingMessages = "outings/%@/chat_messages/%@/comments?token=%@"
let kAPIGetOutingPostMessage = "outings/%@/chat_messages/%@?token=%@&image_size=high"
let kAPIDeleteEventPostMessage = "outings/%d/chat_messages/%d?token=%@"

//Actions
let kAPIGetContrib = "contributions/%d?token=%@"
Expand Down Expand Up @@ -114,6 +117,7 @@ let kAPIBlockUser = "user_blocked_users/?token=%@"
let kAPIUnBlockUsers = "user_blocked_users/?token=%@"
let kAPIGetBlockedUsers = "user_blocked_users?token=%@"
let kAPIGetIsBlockedUser = "user_blocked_users/%d?token=%@"
let kAPIGetDeleteMessageInConv = "conversations/%d/chat_messages/%d"


//WebLink
Expand Down
19 changes: 18 additions & 1 deletion entourage/Network Managers/EventService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ struct EventService:ParsingDataCodable {
guard let token = UserDefaults.token else {return}
var endpoint = kAPIEventDetail
endpoint = String.init(format: endpoint, eventId, token)

NetworkManager.sharedInstance.requestGet(endPoint: endpoint, headers: nil, params: nil) { data, resp, error in

guard let data = data,error == nil,let _response = resp as? HTTPURLResponse, _response.statusCode < 300 else {
Expand Down Expand Up @@ -406,6 +405,24 @@ struct EventService:ParsingDataCodable {
}
}

//MARK DELETE EVENT POST
static func deletePostMessage(eventId:Int,messageId:Int, urlImage:String? = nil ,completion: @escaping (_ error:EntourageNetworkError?) -> Void) {
guard let token = UserDefaults.token else {return}
var endpoint = kAPIDeleteEventPostMessage
endpoint = String.init(format: endpoint, eventId, messageId, token)

NetworkManager.sharedInstance.requestDelete(endPoint: endpoint, headers: nil, body: nil) { data, resp, error in
guard let _ = data, error == nil, let _response = resp as? HTTPURLResponse, _response.statusCode < 300 else {
Logger.print("***** error delete event delete - \(error)")
DispatchQueue.main.async { completion(error) }
return
}
DispatchQueue.main.async { completion(nil) }
}
}



//MARK: - Comments for Post -

static func getCommentsFor(eventId:Int, parentPostId:Int, completion: @escaping (_ messages:[PostMessage]?, _ error:EntourageNetworkError?) -> Void) {
Expand Down
21 changes: 20 additions & 1 deletion entourage/Network Managers/NeighborhoodService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ struct NeighborhoodService:ParsingDataCodable {
var endpoint = kAPIGetNeighborhoodPostMessage
endpoint = String.init(format: endpoint,"\(neighborhoodId)","\(parentPostId)", token)

Logger.print("***** url get PostMessage : \(endpoint)")
Logger.print("***** url eho get PostMessage : \(endpoint)")

NetworkManager.sharedInstance.requestGet(endPoint: endpoint, headers: nil, params: nil) { data, resp, error in

Expand All @@ -343,6 +343,25 @@ struct NeighborhoodService:ParsingDataCodable {
}
}

//MARK: DELETE POST
static func deletePostMessage(groupId:Int,messageId:Int, urlImage:String? = nil ,completion: @escaping (_ error:EntourageNetworkError?) -> Void) {
guard let token = UserDefaults.token else {return}
var endpoint = kAPIDeleteNeigborhoodPostMessage
endpoint = String.init(format: endpoint, groupId, messageId, token)

NetworkManager.sharedInstance.requestDelete(endPoint: endpoint, headers: nil, body: nil) { data, resp, error in

guard let _ = data, error == nil, let _response = resp as? HTTPURLResponse, _response.statusCode < 300 else {
Logger.print("***** error DELETE event DELETE - \(error)")
DispatchQueue.main.async { completion(error) }
return
}
DispatchQueue.main.async { completion(nil) }
}
}



//MARK: - Comments for Post -

static func getCommentsFor(neighborhoodId:Int, parentPostId:Int, completion: @escaping (_ messages:[PostMessage]?, _ error:EntourageNetworkError?) -> Void) {
Expand Down
5 changes: 5 additions & 0 deletions entourage/Scenes/Actions/ActionDetailFullViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,11 @@ extension ActionDetailFullViewController: UITableViewDataSource, UITableViewDele

//MARK: - GroupDetailDelegate -
extension ActionDetailFullViewController: GroupDetailDelegate {
func publicationDeleted() {
getAction()
self.ui_tableview.reloadData()
}

func showMessage(signalType:GroupDetailSignalType) {
let alertVC = MJAlertController()
let buttonCancel = MJAlertButtonType(title: "OK".localized, titleStyle:ApplicationTheme.getFontCourantRegularNoir(size: 18, color: .white), bgColor: .appOrange, cornerRadius: -1)
Expand Down
Loading

0 comments on commit 67425d6

Please sign in to comment.