Update AmityUIKit v4.0.0-beta18

AmityCo · Aug 16, 2024 · 3704e2a · 3704e2a
1 parent ce30315
commit 3704e2a
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 34 deletions.
diff --git a/UpstraUIKit/AmityUIKit.xcodeproj/project.pbxproj b/UpstraUIKit/AmityUIKit.xcodeproj/project.pbxproj
@@ -371,7 +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 */; };
-		92C82A552C635BEA0030138B /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 92C82A542C635BEA0030138B /* SharedFrameworks */; };
+		92DE985C2C6F53780021C145 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 92DE985B2C6F53780021C145 /* 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 = (
-				92C82A552C635BEA0030138B /* SharedFrameworks in Frameworks */,
+				92DE985C2C6F53780021C145 /* SharedFrameworks in Frameworks */,
 				68F5D9FA2B481E4000A9FA0D /* AmityUIKit4.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4507,7 +4507,7 @@
 			);
 			name = AmityUIKit;
 			packageProductDependencies = (
-				92C82A542C635BEA0030138B /* SharedFrameworks */,
+				92DE985B2C6F53780021C145 /* SharedFrameworks */,
 			);
 			productName = UpstraUIKit;
 			productReference = 72A3503024EA811500DA9D46 /* AmityUIKit.framework */;
@@ -5523,7 +5523,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		92C82A542C635BEA0030138B /* SharedFrameworks */ = {
+		92DE985B2C6F53780021C145 /* SharedFrameworks */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = SharedFrameworks;
 		};

diff --git a/UpstraUIKit/AmityUIKit4/AmityUIKit4.xcodeproj/project.pbxproj b/UpstraUIKit/AmityUIKit4/AmityUIKit4.xcodeproj/project.pbxproj
@@ -274,9 +274,9 @@
 		9280FDD82C40EB970052F01A /* AmityCommunityFeedComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9280FDD72C40EB970052F01A /* AmityCommunityFeedComponent.swift */; };
 		9280FDDB2C40EBFC0052F01A /* AmityCommunityProfileTabComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9280FDDA2C40EBFC0052F01A /* AmityCommunityProfileTabComponent.swift */; };
 		92891DE32BACE17100B5111E /* LiveChatMessageBubbleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92891DE22BACE17100B5111E /* LiveChatMessageBubbleView.swift */; };
-		92C82A532C635BE20030138B /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 92C82A522C635BE20030138B /* SharedFrameworks */; };
 		92CC82702C332C4B0000B523 /* AmityCommentAdComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92CC826F2C332C4B0000B523 /* AmityCommentAdComponent.swift */; };
 		92D31B5C2BBCCDD000932DDA /* NetworkMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92D31B5B2BBCCDD000932DDA /* NetworkMonitor.swift */; };
+		92DE985E2C6F537D0021C145 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 92DE985D2C6F537D0021C145 /* SharedFrameworks */; };
 		92EF987F2BC5F7D60029B420 /* AmityLiveChatMessageSenderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92EF987E2BC5F7D60029B420 /* AmityLiveChatMessageSenderView.swift */; };
 		92EF98812BC5F9610029B420 /* AmityLiveChatMessageReceiverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92EF98802BC5F9610029B420 /* AmityLiveChatMessageReceiverView.swift */; };
 		92EF98832BC65EA90029B420 /* AmityMessageAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92EF98822BC65EA90029B420 /* AmityMessageAction.swift */; };
@@ -807,7 +807,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				92C82A532C635BE20030138B /* SharedFrameworks in Frameworks */,
+				92DE985E2C6F537D0021C145 /* SharedFrameworks in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2309,7 +2309,7 @@
 			);
 			name = AmityUIKit4;
 			packageProductDependencies = (
-				92C82A522C635BE20030138B /* SharedFrameworks */,
+				92DE985D2C6F537D0021C145 /* SharedFrameworks */,
 			);
 			productName = AmityUIKit4;
 			productReference = 684AE0F12B0C5B0200FD7270 /* AmityUIKit4.framework */;
@@ -3059,7 +3059,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		92C82A522C635BE20030138B /* SharedFrameworks */ = {
+		92DE985D2C6F537D0021C145 /* SharedFrameworks */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = SharedFrameworks;
 		};

diff --git a/...tyUIKit4/Chat/Compnents/Bubble/LiveChat/Reaction/AmityLiveChatMessageReactionPicker.swift b/...tyUIKit4/Chat/Compnents/Bubble/LiveChat/Reaction/AmityLiveChatMessageReactionPicker.swift
@@ -61,6 +61,7 @@ public struct AmityLiveChatMessageReactionPicker: AmityElementView {
                             .frame(width: 32, height: 32)
                     }
                 })
+                .accessibilityIdentifier(reaction.accessibilityId)
             }
         }
         .font(.title)

diff --git a/UpstraUIKit/AmityUIKit4/AmityUIKit4/Core/Components/Reaction/ReactionListContent.swift b/UpstraUIKit/AmityUIKit4/AmityUIKit4/Core/Components/Reaction/ReactionListContent.swift
@@ -118,15 +118,16 @@ struct ReactionListRowItem: View {
                 Text(user.displayName)
                     .font(.system(size: 15, weight: .semibold))
                     .foregroundColor(Color(viewConfig.theme.baseColor))
-                    .accessibilityIdentifier(AccessibilityID.Chat.ReactionList.userDisplayName)
                     .textShimmerEffect(cornerRadius: 10, isActive: isPlaceholder, color: viewConfig.theme.baseInverseColor)
+                    .accessibilityIdentifier(AccessibilityID.Chat.ReactionList.userDisplayName)
 
                 Text(AmityLocalizedStringSet.Reaction.tapToRemove.localizedString)
                     .font(.system(size: 13, weight: .regular))
                     .foregroundColor(Color(viewConfig.theme.baseColorShade1))
                     .textShimmerEffect(cornerRadius: 10, isActive: isPlaceholder, color: viewConfig.theme.baseInverseColor)
                     .padding(.top, 4)
                     .isHidden(!user.isLoggedInUser)
+                    .accessibilityIdentifier(AmityLocalizedStringSet.Reaction.tapToRemove.localizedString)
             }
 
             Spacer()

diff --git a/UpstraUIKit/AmityUIKit4/AmityUIKit4/Core/CustomViews/MessageOverlay/MessageActionView.swift b/UpstraUIKit/AmityUIKit4/AmityUIKit4/Core/CustomViews/MessageOverlay/MessageActionView.swift
@@ -57,6 +57,7 @@ struct MessageActionView: View {
             }
             .foregroundColor(Color(viewConfig.theme.baseInverseColor))
             .isHidden(message.syncState == .error)
+            .accessibilityIdentifier(AmityLocalizedStringSet.Chat.replyButton.localizedString)
 
             Divider()
                 .frame(maxWidth: .infinity)
@@ -67,6 +68,7 @@ struct MessageActionView: View {
                 dismissAction()
             }
             .foregroundColor(Color(viewConfig.theme.baseInverseColor))
+            .accessibilityIdentifier(AmityLocalizedStringSet.Chat.copyButton.localizedString)
 
             if !message.isOwner {
                 let isFlaggedByOwner = message.isFlaggedByMe ?? viewModel.isReportedByMe
@@ -85,6 +87,7 @@ struct MessageActionView: View {
 
                 }
                 .foregroundColor(Color.red)
+                .accessibilityIdentifier(isFlaggedByOwner ? AmityLocalizedStringSet.Chat.unReportButton.localizedString : AmityLocalizedStringSet.Chat.reportButton.localizedString)
             }
 
             if message.isOwner || message.hasModeratorPermissionInChannel {
@@ -98,7 +101,7 @@ struct MessageActionView: View {
                     dismissAction()
                 }
                 .foregroundColor(Color.red)
-
+                .accessibilityIdentifier(AmityLocalizedStringSet.Chat.deleteButton.localizedString)
             }
         }
         .frame(maxWidth: .infinity)

diff --git a/UpstraUIKit/AmityUIKit4/AmityUIKit4/Core/Utilities/MessageReactionConfiguration.swift b/UpstraUIKit/AmityUIKit4/AmityUIKit4/Core/Utilities/MessageReactionConfiguration.swift
@@ -22,7 +22,7 @@ class MessageReactionConfiguration {
             let name = item["name"] ?? ""
             let image = ImageResource(name: item["image"] ?? "", bundle: AmityUIKit4Manager.bundle)
 
-            let item = AmityReactionType(name: name, image: image)
+            let item = AmityReactionType(name: name, image: image, accessibilityId: item["image"] ?? "")
             reactionList.append(item)
             availableReactions[name] = item
         }
@@ -31,12 +31,13 @@ class MessageReactionConfiguration {
     }
 
     func getReaction(withName name: String) -> AmityReactionType {
-        return availableReactions[name] ?? AmityReactionType(name: name, image: AmityIcon.Chat.unknownReaction.imageResource)
+        return availableReactions[name] ?? AmityReactionType(name: name, image: AmityIcon.Chat.unknownReaction.imageResource, accessibilityId: "unknown")
     }
 }
 
 struct AmityReactionType: Identifiable {
     let id: UUID = UUID()
     let name: String
     let image: ImageResource
+    let accessibilityId: String
 }
diff --git a/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream.xcodeproj/project.pbxproj b/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		92C82A572C635BF20030138B /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 92C82A562C635BF20030138B /* SharedFrameworks */; };
+		92DE98602C6F53850021C145 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 92DE985F2C6F53850021C145 /* 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 = (
-				92C82A572C635BF20030138B /* SharedFrameworks in Frameworks */,
+				92DE98602C6F53850021C145 /* SharedFrameworks in Frameworks */,
 				A0BD0B3426DDD9820054088B /* AmityUIKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -245,7 +245,7 @@
 			);
 			name = AmityUIKitLiveStream;
 			packageProductDependencies = (
-				92C82A562C635BF20030138B /* SharedFrameworks */,
+				92DE985F2C6F53850021C145 /* SharedFrameworks */,
 			);
 			productName = AmityUIKitLiveStream;
 			productReference = A0BD0B1526DCE4F50054088B /* AmityUIKitLiveStream.framework */;
@@ -529,7 +529,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		92C82A562C635BF20030138B /* SharedFrameworks */ = {
+		92DE985F2C6F53850021C145 /* SharedFrameworks */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = SharedFrameworks;
 		};

diff --git a/UpstraUIKit/SampleApp/SampleApp.xcodeproj/project.pbxproj b/UpstraUIKit/SampleApp/SampleApp.xcodeproj/project.pbxproj
@@ -33,7 +33,6 @@
 		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 */; };
-		92C82A592C635C160030138B /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 92C82A582C635C160030138B /* 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 */; };
@@ -95,6 +94,7 @@
 		92DBE8E32ACA98CF007D873C /* AmityVideoPlayerKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A0BD0B3F26DDE0020054088B /* AmityVideoPlayerKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		92DBE8E42ACA98CF007D873C /* Realm.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D45B3A93264A840300F6FF52 /* Realm.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		92DBE8E52ACA98CF007D873C /* AmityUIKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D478D153262409E5006EA140 /* AmityUIKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		92DE98622C6F53900021C145 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 92DE98612C6F53900021C145 /* SharedFrameworks */; };
 		97F101F526A69FBF00AD84A1 /* CustomChannelEventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97F101F426A69FBF00AD84A1 /* CustomChannelEventHandler.swift */; };
 		A03190A7272169C1008A85DC /* PostCreatorSettingsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = A03190A6272169C1008A85DC /* PostCreatorSettingsPage.swift */; };
 		A0BD0B4826DDE0E30054088B /* AmityUIKitLiveStream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A0BD0B4726DDE0E30054088B /* AmityUIKitLiveStream.framework */; };
@@ -276,7 +276,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				92C82A592C635C160030138B /* SharedFrameworks in Frameworks */,
+				92DE98622C6F53900021C145 /* SharedFrameworks in Frameworks */,
 				A0BD0B4826DDE0E30054088B /* AmityUIKitLiveStream.framework in Frameworks */,
 				68F5D9FE2B481E4700A9FA0D /* AmityUIKit4.framework in Frameworks */,
 				D478D16926240A5E006EA140 /* AmityUIKit.framework in Frameworks */,
@@ -601,7 +601,7 @@
 			);
 			name = SampleApp;
 			packageProductDependencies = (
-				92C82A582C635C160030138B /* SharedFrameworks */,
+				92DE98612C6F53900021C145 /* SharedFrameworks */,
 			);
 			productName = SampleApp;
 			productReference = B78DA47524BED7D300EE902B /* SampleApp.app */;
@@ -1282,15 +1282,15 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		92C82A582C635C160030138B /* SharedFrameworks */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = SharedFrameworks;
-		};
 		92DBE8A32ACA98CF007D873C /* FirebaseCrashlytics */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 92DBE8A42ACA98CF007D873C /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
 			productName = FirebaseCrashlytics;
 		};
+		92DE98612C6F53900021C145 /* SharedFrameworks */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = SharedFrameworks;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = B78DA46D24BED7D300EE902B /* Project object */;

diff --git 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-beta17/AmitySDK.xcframework.zip",
-                    checksum: "8b8a2700facf44e474c9495d8f20ca16c58ad4628db2d12a1893276631246e6a"
+                    url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta18/AmitySDK.xcframework.zip",
+                    checksum: "e005d7d55461e93a7a1d22793676cfcc770bac6aa58baac42ac703d83584b3a4"
                 ),
         .binaryTarget(
                     name: "Realm",
-                    url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta17/Realm.xcframework.zip",
-                    checksum: "34ee7908a7c7562443455905a74ae40edcb0cdc4da9b39e7caaf32ae8d540547"
+                    url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta18/Realm.xcframework.zip",
+                    checksum: "0173601b9255dbef962b947eab6db4b88dc3df0b3ae12f5eefe792e7cb2c4ae9"
                 ),
          .binaryTarget(
                     name: "RealmSwift",
-                    url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta17/RealmSwift.xcframework.zip",
-                    checksum: "4dc00dcb425ae3411cbc4013690e8569aeaeea59a7cd5bbdde9206d76577acaf"
+                    url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta18/RealmSwift.xcframework.zip",
+                    checksum: "3b8e5af0176cf6478c359d69f89964ad42af52b68a9ce42d34d4505e738ad7e1"
                 ),
         .binaryTarget(
                     name: "AmityLiveVideoBroadcastKit",
-                    url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta17/AmityLiveVideoBroadcastKit.xcframework.zip",
-                    checksum: "d14319260b2875269f592b0eaada6beb60f9c2ad8a564c1e256efe30b2b75979"
+                    url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta18/AmityLiveVideoBroadcastKit.xcframework.zip",
+                    checksum: "ec8666003cc744969815762a23fdaa3d9b67f879d4ec781f31af3f88969eb1c5"
                 ),
         .binaryTarget(
                     name: "AmityVideoPlayerKit",
-                    url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta17/AmityVideoPlayerKit.xcframework.zip",
-                    checksum: "4bfe0bec829d37c6c4aca5a335a74eecc01ce1fa9b023c5bb4cc25f9e0660455"
+                    url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/4.0.0-beta18/AmityVideoPlayerKit.xcframework.zip",
+                    checksum: "565ef70ef9e016fb2bee70f69158771c8dbac43cf6df3f916ab9adf19852d3a5"
                 ),
         .binaryTarget(
                     name: "MobileVLCKit",

diff --git a/...odules/Comunity/Follow/Follow Requests/ViewModel/AmityFollowRequestsScreenViewModel.swift b/...odules/Comunity/Follow/Follow Requests/ViewModel/AmityFollowRequestsScreenViewModel.swift
@@ -108,7 +108,6 @@ private extension AmityFollowRequestsScreenViewModel {
 
             followRequests = newRequests
             delegate?.screenViewModelDidGetRequests()
-            followToken?.invalidate()
         default: break
         }
     }