From ce50fd9265b3921cb9b445bd3470b5759a9f5df5 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Thu, 25 Jan 2024 12:12:46 +1100 Subject: [PATCH] ui: implement invite a friend screen with SwiftUI --- Session.xcodeproj/project.pbxproj | 8 ++ .../InviteAFriendScreen.swift | 122 ++++++++++++++++++ .../New Conversation/NewMessageScreen.swift | 13 ++ .../StartConversationScreen.swift | 50 +++---- .../Translations/en.lproj/Localizable.strings | 1 + 5 files changed, 172 insertions(+), 22 deletions(-) create mode 100644 Session/Home/New Conversation/InviteAFriendScreen.swift create mode 100644 Session/Home/New Conversation/NewMessageScreen.swift diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index ad39b3591..496f539e2 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -173,6 +173,8 @@ 946B34492B5E04BB004CB4A3 /* CustomTopTabBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946B34482B5E04BB004CB4A3 /* CustomTopTabBar.swift */; }; 946B344B2B5E08F3004CB4A3 /* ScanQRCodeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946B344A2B5E08F3004CB4A3 /* ScanQRCodeScreen.swift */; }; 946B344D2B5F67B4004CB4A3 /* StartConversationScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946B344C2B5F67B4004CB4A3 /* StartConversationScreen.swift */; }; + 946B344F2B61D80B004CB4A3 /* InviteAFriendScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946B344E2B61D80B004CB4A3 /* InviteAFriendScreen.swift */; }; + 946B34512B61D818004CB4A3 /* NewMessageScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946B34502B61D818004CB4A3 /* NewMessageScreen.swift */; }; 99978E3F7A80275823CA9014 /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_SessionNotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29E827FDF6C1032BB985740C /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_SessionNotificationServiceExtension.framework */; }; A11CD70D17FA230600A2D1B1 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A11CD70C17FA230600A2D1B1 /* QuartzCore.framework */; }; A163E8AB16F3F6AA0094D68B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A163E8AA16F3F6A90094D68B /* Security.framework */; }; @@ -1313,6 +1315,8 @@ 946B34482B5E04BB004CB4A3 /* CustomTopTabBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTopTabBar.swift; sourceTree = ""; }; 946B344A2B5E08F3004CB4A3 /* ScanQRCodeScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanQRCodeScreen.swift; sourceTree = ""; }; 946B344C2B5F67B4004CB4A3 /* StartConversationScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartConversationScreen.swift; sourceTree = ""; }; + 946B344E2B61D80B004CB4A3 /* InviteAFriendScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InviteAFriendScreen.swift; sourceTree = ""; }; + 946B34502B61D818004CB4A3 /* NewMessageScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewMessageScreen.swift; sourceTree = ""; }; A11CD70C17FA230600A2D1B1 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; A163E8AA16F3F6A90094D68B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; A1C32D4D17A0652C000A904E /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; }; @@ -2420,6 +2424,8 @@ 7B8C44C428B49DDA00FBE25F /* NewConversationVC.swift */, 7BB92B3E28C825FD0082762F /* NewConversationViewModel.swift */, 946B344C2B5F67B4004CB4A3 /* StartConversationScreen.swift */, + 946B344E2B61D80B004CB4A3 /* InviteAFriendScreen.swift */, + 946B34502B61D818004CB4A3 /* NewMessageScreen.swift */, ); path = "New Conversation"; sourceTree = ""; @@ -6261,6 +6267,7 @@ FD71163E28E2C82900B47552 /* SessionCell.swift in Sources */, 4CA485BB2232339F004B9E7D /* PhotoCaptureViewController.swift in Sources */, 946B34472B5DF0B7004CB4A3 /* QRCodeScreen.swift in Sources */, + 946B34512B61D818004CB4A3 /* NewMessageScreen.swift in Sources */, C328254925CA60E60062D0A7 /* ContextMenuVC+Action.swift in Sources */, FD71164628E2CC1300B47552 /* SessionHighlightingBackgroundLabel.swift in Sources */, 4542DF54208D40AC007B4E76 /* LoadingViewController.swift in Sources */, @@ -6302,6 +6309,7 @@ 7BAADFCE27B215FE007BCF92 /* UIView+Draggable.swift in Sources */, 45C0DC1B1E68FE9000E04C47 /* UIApplication+OWS.swift in Sources */, FDF222072818CECF000A4995 /* ConversationViewModel.swift in Sources */, + 946B344F2B61D80B004CB4A3 /* InviteAFriendScreen.swift in Sources */, 4539B5861F79348F007141FF /* PushRegistrationManager.swift in Sources */, 7BD976972A776C76001B466F /* SessionCarouselView+SwiftUI.swift in Sources */, B8041A9525C8FA1D003C2166 /* MediaLoaderView.swift in Sources */, diff --git a/Session/Home/New Conversation/InviteAFriendScreen.swift b/Session/Home/New Conversation/InviteAFriendScreen.swift new file mode 100644 index 000000000..45ad027e2 --- /dev/null +++ b/Session/Home/New Conversation/InviteAFriendScreen.swift @@ -0,0 +1,122 @@ +// Copyright © 2024 Rangeproof Pty Ltd. All rights reserved. + +import SwiftUI +import SessionUIKit +import SignalUtilitiesKit +import SessionUtilitiesKit + +struct InviteAFriendScreen: View { + @EnvironmentObject var host: HostWrapper + + @State private var copied: Bool = false + private let accountId: String = getUserHexEncodedPublicKey() + + static private let cornerRadius: CGFloat = 13 + static private let buttonWidth: CGFloat = 160 + + var body: some View { + ZStack(alignment: .center) { + VStack( + alignment: .center, + spacing: Values.mediumSpacing + ) { + Text(accountId) + .font(.system(size: Values.smallFontSize)) + .multilineTextAlignment(.center) + .foregroundColor(themeColor: .textPrimary) + .frame( + maxWidth: .infinity, + maxHeight: .infinity + ) + .fixedSize(horizontal: false, vertical: true) + .padding(.all, Values.largeSpacing) + .overlay( + RoundedRectangle( + cornerSize: CGSize( + width: Self.cornerRadius, + height: Self.cornerRadius + ) + ) + .stroke(themeColor: .borderSeparator) + ) + + Text("invite_a_friend_explanation".localized()) + .font(.system(size: Values.verySmallFontSize)) + .multilineTextAlignment(.center) + .foregroundColor(themeColor: .textSecondary) + .padding(.horizontal, Values.smallSpacing) + + HStack( + alignment: .center, + spacing: 0 + ) { + Button { + share() + } label: { + Text("share".localized()) + .bold() + .font(.system(size: Values.mediumFontSize)) + .foregroundColor(themeColor: .textPrimary) + .frame( + maxWidth: Self.buttonWidth, + minHeight: Values.mediumButtonHeight, + alignment: .center + ) + .overlay( + Capsule() + .stroke(themeColor: .textPrimary) + ) + } + .frame(maxWidth: .infinity) + + Spacer(minLength: Values.mediumSpacing) + + Button { + copyAccoounId() + } label: { + let buttonTitle: String = self.copied ? "copied".localized() : "copy".localized() + Text(buttonTitle) + .bold() + .font(.system(size: Values.mediumFontSize)) + .foregroundColor(themeColor: .textPrimary) + .frame( + maxWidth: Self.buttonWidth, + minHeight: Values.mediumButtonHeight, + alignment: .center + ) + .overlay( + Capsule() + .stroke(themeColor: .textPrimary) + ) + } + .frame(maxWidth: .infinity) + } + + Spacer() + } + .padding(Values.largeSpacing) + } + .backgroundColor(themeColor: .backgroundSecondary) + } + + private func copyAccoounId() { + UIPasteboard.general.string = self.accountId + self.copied = true + } + + private func share() { + let invitation: String = "Hey, I've been using Session to chat with complete privacy and security. Come join me! My Account ID is \n\n\(self.accountId) \n\nDownload it at https://getsession.org/" + + self.host.controller?.present( + UIActivityViewController( + activityItems: [ invitation ], + applicationActivities: nil + ), + animated: true + ) + } +} + +#Preview { + InviteAFriendScreen() +} diff --git a/Session/Home/New Conversation/NewMessageScreen.swift b/Session/Home/New Conversation/NewMessageScreen.swift new file mode 100644 index 000000000..01a871c65 --- /dev/null +++ b/Session/Home/New Conversation/NewMessageScreen.swift @@ -0,0 +1,13 @@ +// Copyright © 2024 Rangeproof Pty Ltd. All rights reserved. + +import SwiftUI + +struct NewMessageScreen: View { + var body: some View { + Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/) + } +} + +#Preview { + NewMessageScreen() +} diff --git a/Session/Home/New Conversation/StartConversationScreen.swift b/Session/Home/New Conversation/StartConversationScreen.swift index 34f458d92..e81bdb2ca 100644 --- a/Session/Home/New Conversation/StartConversationScreen.swift +++ b/Session/Home/New Conversation/StartConversationScreen.swift @@ -6,6 +6,8 @@ import SignalUtilitiesKit import SessionUtilitiesKit struct StartConversationScreen: View { + @EnvironmentObject var host: HostWrapper + var body: some View { ZStack(alignment: .topLeading) { ScrollView(.vertical, showsIndicators: false) { @@ -54,7 +56,10 @@ struct StartConversationScreen: View { image: "icon_invite", title: "vc_settings_invite_a_friend_button_title".localized() ) { - + let viewController: SessionHostingViewController = SessionHostingViewController(rootView: InviteAFriendScreen()) + viewController.setNavBarTitle("vc_settings_invite_a_friend_button_title".localized()) + viewController.setUpDismissingButton(on: .right) + self.host.controller?.navigationController?.pushViewController(viewController, animated: true) } } .padding(.bottom, Values.mediumSpacing) @@ -89,29 +94,30 @@ fileprivate struct NewConversationCell: View { let action: () -> () var body: some View { - HStack( - alignment: .center, - spacing: Values.smallSpacing - ) { - ZStack(alignment: .center) { - Image(image) - .renderingMode(.template) + Button { + action() + } label: { + HStack( + alignment: .center, + spacing: Values.smallSpacing + ) { + ZStack(alignment: .center) { + Image(image) + .renderingMode(.template) + .foregroundColor(themeColor: .textPrimary) + .frame(width: 25, height: 24, alignment: .bottom) + } + .frame(width: 38, height: 38, alignment: .leading) + + Text(title) + .font(.system(size: Values.mediumLargeFontSize)) .foregroundColor(themeColor: .textPrimary) - .frame(width: 25, height: 24, alignment: .bottom) + .frame( + maxWidth: .infinity, + alignment: .leading + ) } - .frame(width: 38, height: 38, alignment: .leading) - - Text(title) - .font(.system(size: Values.mediumLargeFontSize)) - .foregroundColor(themeColor: .textPrimary) - .frame( - maxWidth: .infinity, - alignment: .leading - ) - } - .frame(height: 55) - .onTapGesture { - action() + .frame(height: 55) } } } diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index 7e945b0a7..2656b32da 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -873,3 +873,4 @@ The point that a message will disappear in a disappearing message update message "your_account_id" = "Your Account ID"; "account_id_qr_code_explanation" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; +"invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them";