From 30ed61b8b4a69bcd0a245bd631f56ad3f738012b Mon Sep 17 00:00:00 2001 From: Zryte Date: Fri, 11 Oct 2024 17:13:19 +0700 Subject: [PATCH] Update AmityUIKit v4.0.0-beta25 --- .../AmityUIKit.xcodeproj/project.pbxproj | 8 +++--- .../AmityUIKit4.xcodeproj/project.pbxproj | 9 ++++--- .../project.pbxproj | 8 +++--- .../LiveStreamBroadcastVC+Permission.swift | 26 +++++++++---------- .../SampleApp.xcodeproj/project.pbxproj | 8 +++--- UpstraUIKit/SharedFrameworks/Package.swift | 20 +++++++------- 6 files changed, 41 insertions(+), 38 deletions(-) diff --git a/UpstraUIKit/AmityUIKit.xcodeproj/project.pbxproj b/UpstraUIKit/AmityUIKit.xcodeproj/project.pbxproj index 3d3fcd6..b304e8c 100644 --- a/UpstraUIKit/AmityUIKit.xcodeproj/project.pbxproj +++ b/UpstraUIKit/AmityUIKit.xcodeproj/project.pbxproj @@ -80,7 +80,6 @@ 68251A632ADEA16200395696 /* AmityPreviewLinkCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68251A612ADEA16200395696 /* AmityPreviewLinkCell.swift */; }; 68251A642ADEA16200395696 /* AmityPreviewLinkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 68251A622ADEA16200395696 /* AmityPreviewLinkCell.xib */; }; 6860B01B2ADE3D650042ED45 /* AmityPreviewLinkWizard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6860B01A2ADE3D650042ED45 /* AmityPreviewLinkWizard.swift */; }; - 6869149F2CB8056B00D64409 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 6869149E2CB8056B00D64409 /* SharedFrameworks */; }; 686E488F2B19A44900591E2D /* AmityStoryTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 686E488D2B19A44900591E2D /* AmityStoryTabViewController.swift */; }; 686E48902B19A44900591E2D /* AmityStoryTabViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 686E488E2B19A44900591E2D /* AmityStoryTabViewController.xib */; }; 6895D9262975359000E377F1 /* AmityAsyncAwaitTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6895D9252975359000E377F1 /* AmityAsyncAwaitTransformer.swift */; }; @@ -372,6 +371,7 @@ 78DA0324263C715C007C11CE /* AmityMyCommunityPreviewViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 78DA0320263C715C007C11CE /* AmityMyCommunityPreviewViewController.xib */; }; 78DA0325263C715C007C11CE /* AmityMyCommunityPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78DA0321263C715C007C11CE /* AmityMyCommunityPreviewViewController.swift */; }; 921C3FCB2C379FDB00BF403E /* AmitySocialV4Compatible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 921C3FCA2C379FDB00BF403E /* AmitySocialV4Compatible.swift */; }; + 926C52372CB92F750085CA64 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 926C52362CB92F750085CA64 /* SharedFrameworks */; }; 970E784726429FA500E5FCEE /* ChatSettingsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970E784526429FA500E5FCEE /* ChatSettingsTableViewCell.swift */; }; 970E784826429FA500E5FCEE /* ChatSettingsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 970E784626429FA500E5FCEE /* ChatSettingsTableViewCell.xib */; }; 970E784E26429FB300E5FCEE /* AmityChatSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970E784C26429FB300E5FCEE /* AmityChatSettingsViewController.swift */; }; @@ -1340,7 +1340,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6869149F2CB8056B00D64409 /* SharedFrameworks in Frameworks */, + 926C52372CB92F750085CA64 /* SharedFrameworks in Frameworks */, 68F5D9FA2B481E4000A9FA0D /* AmityUIKit4.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -4507,7 +4507,7 @@ ); name = AmityUIKit; packageProductDependencies = ( - 6869149E2CB8056B00D64409 /* SharedFrameworks */, + 926C52362CB92F750085CA64 /* SharedFrameworks */, ); productName = UpstraUIKit; productReference = 72A3503024EA811500DA9D46 /* AmityUIKit.framework */; @@ -5523,7 +5523,7 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 6869149E2CB8056B00D64409 /* SharedFrameworks */ = { + 926C52362CB92F750085CA64 /* SharedFrameworks */ = { isa = XCSwiftPackageProductDependency; productName = SharedFrameworks; }; diff --git a/UpstraUIKit/AmityUIKit4/AmityUIKit4.xcodeproj/project.pbxproj b/UpstraUIKit/AmityUIKit4/AmityUIKit4.xcodeproj/project.pbxproj index 27bc143..32fc3c4 100644 --- a/UpstraUIKit/AmityUIKit4/AmityUIKit4.xcodeproj/project.pbxproj +++ b/UpstraUIKit/AmityUIKit4/AmityUIKit4.xcodeproj/project.pbxproj @@ -172,7 +172,6 @@ 686830242C915DFC009B1694 /* TimeInterval+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 686830232C915DFC009B1694 /* TimeInterval+Extension.swift */; }; 6868302C2C92EBE4009B1694 /* AmityCommunityMembershipPageBehavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6868302B2C92EBE4009B1694 /* AmityCommunityMembershipPageBehavior.swift */; }; 686830332C993D52009B1694 /* AmityUserProfilePage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 686830322C993D52009B1694 /* AmityUserProfilePage.swift */; }; - 6869149D2CB8055500D64409 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 6869149C2CB8055500D64409 /* SharedFrameworks */; }; 686D173C2B1452A7007AEF59 /* AmityStoryTabComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 686D173B2B1452A7007AEF59 /* AmityStoryTabComponent.swift */; }; 686D173E2B1496D2007AEF59 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 686D173D2B1496D2007AEF59 /* Assets.xcassets */; }; 686D17402B149F63007AEF59 /* AmityIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 686D173F2B149F63007AEF59 /* AmityIcon.swift */; }; @@ -354,6 +353,7 @@ 926894402C474A49004CECF8 /* AmityCommunityPinnedPostComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9268943F2C474A49004CECF8 /* AmityCommunityPinnedPostComponent.swift */; }; 926894422C474A6A004CECF8 /* EmptyCommunityFeedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 926894412C474A6A004CECF8 /* EmptyCommunityFeedView.swift */; }; 926C520D2CB7190B0085CA64 /* AmityLivestreamPlayerPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 926C520C2CB7190B0085CA64 /* AmityLivestreamPlayerPage.swift */; }; + 926C52352CB92F5B0085CA64 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 926C52342CB92F5B0085CA64 /* SharedFrameworks */; }; 926F079C2BB4DDB9000806CB /* Shimmer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 926F079B2BB4DDB9000806CB /* Shimmer.swift */; }; 926F079E2BB4E25B000806CB /* LiveChatMessageBubble.swift in Sources */ = {isa = PBXBuildFile; fileRef = 926F079D2BB4E25B000806CB /* LiveChatMessageBubble.swift */; }; 9280FDAA2C3C8A390052F01A /* AmityCommunityProfilePage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9280FDA92C3C8A380052F01A /* AmityCommunityProfilePage.swift */; }; @@ -1016,7 +1016,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6869149D2CB8055500D64409 /* SharedFrameworks in Frameworks */, + 926C52352CB92F5B0085CA64 /* SharedFrameworks in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2751,6 +2751,9 @@ dependencies = ( ); name = AmityUIKit4; + packageProductDependencies = ( + 926C52342CB92F5B0085CA64 /* SharedFrameworks */, + ); productName = AmityUIKit4; productReference = 684AE0F12B0C5B0200FD7270 /* AmityUIKit4.framework */; productType = "com.apple.product-type.framework"; @@ -3602,7 +3605,7 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 6869149C2CB8055500D64409 /* SharedFrameworks */ = { + 926C52342CB92F5B0085CA64 /* SharedFrameworks */ = { isa = XCSwiftPackageProductDependency; productName = SharedFrameworks; }; diff --git a/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream.xcodeproj/project.pbxproj b/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream.xcodeproj/project.pbxproj index e787540..a942597 100644 --- a/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream.xcodeproj/project.pbxproj +++ b/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 686914A12CB8057A00D64409 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 686914A02CB8057A00D64409 /* SharedFrameworks */; }; + 926C52392CB92F7F0085CA64 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 926C52382CB92F7F0085CA64 /* SharedFrameworks */; }; A0B68B3026E07278007D7B5B /* LiveStreamViewController+GoLive.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0B68B2F26E07278007D7B5B /* LiveStreamViewController+GoLive.swift */; }; A0B68B3626E07824007D7B5B /* AsyncOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0B68B3526E07824007D7B5B /* AsyncOperation.swift */; }; A0B68B3F26E07912007D7B5B /* CreatePost.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0B68B3E26E07912007D7B5B /* CreatePost.swift */; }; @@ -69,7 +69,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 686914A12CB8057A00D64409 /* SharedFrameworks in Frameworks */, + 926C52392CB92F7F0085CA64 /* SharedFrameworks in Frameworks */, A0BD0B3426DDD9820054088B /* AmityUIKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -245,7 +245,7 @@ ); name = AmityUIKitLiveStream; packageProductDependencies = ( - 686914A02CB8057A00D64409 /* SharedFrameworks */, + 926C52382CB92F7F0085CA64 /* SharedFrameworks */, ); productName = AmityUIKitLiveStream; productReference = A0BD0B1526DCE4F50054088B /* AmityUIKitLiveStream.framework */; @@ -529,7 +529,7 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 686914A02CB8057A00D64409 /* SharedFrameworks */ = { + 926C52382CB92F7F0085CA64 /* SharedFrameworks */ = { isa = XCSwiftPackageProductDependency; productName = SharedFrameworks; }; diff --git a/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream/Broadcast/LiveStreamBroadcastVC+Permission.swift b/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream/Broadcast/LiveStreamBroadcastVC+Permission.swift index 85acbfe..565fb10 100644 --- a/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream/Broadcast/LiveStreamBroadcastVC+Permission.swift +++ b/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream/Broadcast/LiveStreamBroadcastVC+Permission.swift @@ -15,9 +15,9 @@ extension LiveStreamBroadcastViewController { if auth != .authorized { return false } -// if AVAudioSession.sharedInstance().recordPermission != .granted { -// return false -// } + if AVAudioSession.sharedInstance().recordPermission != .granted { + return false + } return true } @@ -35,17 +35,17 @@ extension LiveStreamBroadcastViewController { } } } -// let requestMicrophonePermission: (@escaping (Bool) -> Void) -> Void = { completion in -// AVAudioSession.sharedInstance().requestRecordPermission { granted in -// DispatchQueue.main.async { -// completion(granted) -// } -// } -// } + let requestMicrophonePermission: (@escaping (Bool) -> Void) -> Void = { completion in + AVAudioSession.sharedInstance().requestRecordPermission { granted in + DispatchQueue.main.async { + completion(granted) + } + } + } requestCameraPermission { cameraGranted in -// requestMicrophonePermission { microphoneGranted in - completion(cameraGranted && true) -// } + requestMicrophonePermission { microphoneGranted in + completion(cameraGranted && microphoneGranted) + } } } diff --git a/UpstraUIKit/SampleApp/SampleApp.xcodeproj/project.pbxproj b/UpstraUIKit/SampleApp/SampleApp.xcodeproj/project.pbxproj index 79e2d73..aad1742 100644 --- a/UpstraUIKit/SampleApp/SampleApp.xcodeproj/project.pbxproj +++ b/UpstraUIKit/SampleApp/SampleApp.xcodeproj/project.pbxproj @@ -23,7 +23,6 @@ 682C761C2B331DAE00018F80 /* AmityUIKit4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 684AE12D2B0C841400FD7270 /* AmityUIKit4.framework */; }; 682C761D2B331DAE00018F80 /* AmityUIKit4.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 684AE12D2B0C841400FD7270 /* AmityUIKit4.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 684097562B30607F00697E1B /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 684097552B30607F00697E1B /* GoogleService-Info.plist */; }; - 686914A32CB8058B00D64409 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 686914A22CB8058B00D64409 /* SharedFrameworks */; }; 68F5D9FE2B481E4700A9FA0D /* AmityUIKit4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 68F5D9FD2B481E4700A9FA0D /* AmityUIKit4.framework */; }; 68F5D9FF2B481E4700A9FA0D /* AmityUIKit4.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 68F5D9FD2B481E4700A9FA0D /* AmityUIKit4.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 7214C9CB2632BE5500192BB3 /* UserLevelPushNotificationsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7214C9CA2632BE5500192BB3 /* UserLevelPushNotificationsTableViewController.swift */; }; @@ -36,6 +35,7 @@ 729CAF3E273CC8ED000AE162 /* Binding+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 729CAF3D273CC8ED000AE162 /* Binding+Extension.swift */; }; 729CAF42273CC95B000AE162 /* EndpointManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 729CAF41273CC95B000AE162 /* EndpointManager.swift */; }; 72AACE0B273931F100E59D55 /* EndpointsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72AACE0A273931F100E59D55 /* EndpointsView.swift */; }; + 926C523B2CB92F8C0085CA64 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 926C523A2CB92F8C0085CA64 /* SharedFrameworks */; }; 92DBE8A62ACA98CF007D873C /* DataListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D495077325E637C1005C033F /* DataListViewController.swift */; }; 92DBE8A72ACA98CF007D873C /* SamplePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 724C25F3274CE38B0058B066 /* SamplePageViewController.swift */; }; 92DBE8A82ACA98CF007D873C /* PostCreatorSettingsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = A03190A6272169C1008A85DC /* PostCreatorSettingsPage.swift */; }; @@ -279,7 +279,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 686914A32CB8058B00D64409 /* SharedFrameworks in Frameworks */, + 926C523B2CB92F8C0085CA64 /* SharedFrameworks in Frameworks */, A0BD0B4826DDE0E30054088B /* AmityUIKitLiveStream.framework in Frameworks */, 68F5D9FE2B481E4700A9FA0D /* AmityUIKit4.framework in Frameworks */, D478D16926240A5E006EA140 /* AmityUIKit.framework in Frameworks */, @@ -605,7 +605,7 @@ ); name = SampleApp; packageProductDependencies = ( - 686914A22CB8058B00D64409 /* SharedFrameworks */, + 926C523A2CB92F8C0085CA64 /* SharedFrameworks */, ); productName = SampleApp; productReference = B78DA47524BED7D300EE902B /* SampleApp.app */; @@ -1288,7 +1288,7 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 686914A22CB8058B00D64409 /* SharedFrameworks */ = { + 926C523A2CB92F8C0085CA64 /* SharedFrameworks */ = { isa = XCSwiftPackageProductDependency; productName = SharedFrameworks; }; diff --git a/UpstraUIKit/SharedFrameworks/Package.swift b/UpstraUIKit/SharedFrameworks/Package.swift index c57e32b..9f1d07b 100644 --- a/UpstraUIKit/SharedFrameworks/Package.swift +++ b/UpstraUIKit/SharedFrameworks/Package.swift @@ -23,28 +23,28 @@ let package = Package( dependencies: []), .binaryTarget( name: "AmitySDK", - url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta24/AmitySDK.xcframework.zip", - checksum: "7d7fcb9195c0527f4965adf2e852638e1194c120ba6837aa891c60ae00383971" + url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta25/AmitySDK.xcframework.zip", + checksum: "63d0b5f205d90478a621c00449fadbf821afdc5b6b4d29ced5fae633e327face" ), .binaryTarget( name: "Realm", - url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta24/Realm.xcframework.zip", - checksum: "186cbc95ca38298768d5c9b9c4a6c4abc398e9ff4b1cf7104dbf4b0312293713" + url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta25/Realm.xcframework.zip", + checksum: "1e5c3b81e229b47751f00e501c54a84d1ef445607ed5c4af7dc6dbc459f3fa01" ), .binaryTarget( name: "RealmSwift", - url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta24/RealmSwift.xcframework.zip", - checksum: "07fc957571742897b01fd5a8f0ea17009b242031af79f745ae0dec9a99484c19" + url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta25/RealmSwift.xcframework.zip", + checksum: "12acc2b0e8e9e2999d6bb459e41eaf9e04131b4ab8e2cb68ea33a547dfc16035" ), .binaryTarget( name: "AmityLiveVideoBroadcastKit", - url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta24/AmityLiveVideoBroadcastKit.xcframework.zip", - checksum: "19334ff0939f6f022814573098149a4866bcc084161289d6e10b68bd20ece822" + url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta25/AmityLiveVideoBroadcastKit.xcframework.zip", + checksum: "36f0db6bfdd693ac32df2c2bf6ad13b6578bd503f939ce1120afebb3677f9a89" ), .binaryTarget( name: "AmityVideoPlayerKit", - url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta24/AmityVideoPlayerKit.xcframework.zip", - checksum: "f3a5f956a7edc44d4a78fb7f09140ba700287362a741bdfad1b6a91e0722d41e" + url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta25/AmityVideoPlayerKit.xcframework.zip", + checksum: "6871301ff32c34b75a63971e8715079baa8e821e3339299d99d6042e701802ac" ), .binaryTarget( name: "MobileVLCKit",