Skip to content

Commit 26da599

Browse files
ZryteZryte
Zryte
authored and
Zryte
committed
Update AmityUIKit v4.18.0-xcode26.3
1 parent 7e26185 commit 26da599

File tree

76 files changed

+1612
-486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1612
-486
lines changed

‎UpstraUIKit/AmityUIKit.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@
371371
78DA0324263C715C007C11CE /* AmityMyCommunityPreviewViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 78DA0320263C715C007C11CE /* AmityMyCommunityPreviewViewController.xib */; };
372372
78DA0325263C715C007C11CE /* AmityMyCommunityPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78DA0321263C715C007C11CE /* AmityMyCommunityPreviewViewController.swift */; };
373373
921C3FCB2C379FDB00BF403E /* AmitySocialV4Compatible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 921C3FCA2C379FDB00BF403E /* AmitySocialV4Compatible.swift */; };
374-
92EAD78F2F6D78380084BA8C /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 92EAD78E2F6D78380084BA8C /* SharedFrameworks */; };
374+
92F85A172F76B15A0055A2A6 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 92F85A162F76B15A0055A2A6 /* SharedFrameworks */; };
375375
970E784726429FA500E5FCEE /* ChatSettingsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970E784526429FA500E5FCEE /* ChatSettingsTableViewCell.swift */; };
376376
970E784826429FA500E5FCEE /* ChatSettingsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 970E784626429FA500E5FCEE /* ChatSettingsTableViewCell.xib */; };
377377
970E784E26429FB300E5FCEE /* AmityChatSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970E784C26429FB300E5FCEE /* AmityChatSettingsViewController.swift */; };
@@ -1340,7 +1340,7 @@
13401340
isa = PBXFrameworksBuildPhase;
13411341
buildActionMask = 2147483647;
13421342
files = (
1343-
92EAD78F2F6D78380084BA8C /* SharedFrameworks in Frameworks */,
1343+
92F85A172F76B15A0055A2A6 /* SharedFrameworks in Frameworks */,
13441344
68F5D9FA2B481E4000A9FA0D /* AmityUIKit4.framework in Frameworks */,
13451345
);
13461346
runOnlyForDeploymentPostprocessing = 0;
@@ -4515,7 +4515,7 @@
45154515
);
45164516
name = AmityUIKit;
45174517
packageProductDependencies = (
4518-
92EAD78E2F6D78380084BA8C /* SharedFrameworks */,
4518+
92F85A162F76B15A0055A2A6 /* SharedFrameworks */,
45194519
);
45204520
productName = UpstraUIKit;
45214521
productReference = 72A3503024EA811500DA9D46 /* AmityUIKit.framework */;
@@ -5531,7 +5531,7 @@
55315531
/* End XCConfigurationList section */
55325532

55335533
/* Begin XCSwiftPackageProductDependency section */
5534-
92EAD78E2F6D78380084BA8C /* SharedFrameworks */ = {
5534+
92F85A162F76B15A0055A2A6 /* SharedFrameworks */ = {
55355535
isa = XCSwiftPackageProductDependency;
55365536
productName = SharedFrameworks;
55375537
};

‎UpstraUIKit/AmityUIKit4/AmityUIKit4.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
684AE1012B0C5B0200FD7270 /* AmityUIKit4Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 684AE1002B0C5B0200FD7270 /* AmityUIKit4Tests.swift */; };
1212
685F16C22BFCABAD0016685F /* AmityReactionList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 685F16C12BFCABAD0016685F /* AmityReactionList.swift */; };
1313
685F16C62BFCABB50016685F /* ReactionTabBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 685F16C52BFCABB50016685F /* ReactionTabBarView.swift */; };
14-
92EAD78D2F6D782E0084BA8C /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 92EAD78C2F6D782E0084BA8C /* SharedFrameworks */; };
14+
92F85A152F76B14E0055A2A6 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 92F85A142F76B14E0055A2A6 /* SharedFrameworks */; };
1515
/* End PBXBuildFile section */
1616

1717
/* Begin PBXContainerItemProxy section */
@@ -573,6 +573,7 @@
573573
Social/Components/Products/ProductTagSelection/Elements/AmityProductTagSelectionHeaderElement.swift,
574574
Social/Components/Products/ProductTagSelection/Elements/AmityProductTagSelectionItemElement.swift,
575575
Social/Components/Products/ProductTagSelection/Elements/AmityProductTagSelectionSearchBarElement.swift,
576+
Social/Components/Products/ViewedProductTracker.swift,
576577
Social/Components/Search/AmityCommunitySearchResultComponent.swift,
577578
Social/Components/Search/AmityPostSearchResultComponent.swift,
578579
Social/Components/Search/AmityTopSearchBarComponent.swift,
@@ -762,7 +763,7 @@
762763
isa = PBXFrameworksBuildPhase;
763764
buildActionMask = 2147483647;
764765
files = (
765-
92EAD78D2F6D782E0084BA8C /* SharedFrameworks in Frameworks */,
766+
92F85A152F76B14E0055A2A6 /* SharedFrameworks in Frameworks */,
766767
);
767768
runOnlyForDeploymentPostprocessing = 0;
768769
};
@@ -1239,7 +1240,7 @@
12391240
/* End XCConfigurationList section */
12401241

12411242
/* Begin XCSwiftPackageProductDependency section */
1242-
92EAD78C2F6D782E0084BA8C /* SharedFrameworks */ = {
1243+
92F85A142F76B14E0055A2A6 /* SharedFrameworks */ = {
12431244
isa = XCSwiftPackageProductDependency;
12441245
productName = SharedFrameworks;
12451246
};

‎UpstraUIKit/AmityUIKit4/AmityUIKit4/Assets.xcassets/replyArrowIcon.imageset/replyArrowIcon.svg‎

Lines changed: 2 additions & 2 deletions
Loading

‎UpstraUIKit/AmityUIKit4/AmityUIKit4/Assets.xcassets/tagIcon.imageset/Contents.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "ic_tag.svg",
4+
"filename" : "ic_product_tag.svg",
55
"idiom" : "universal"
66
}
77
],

‎UpstraUIKit/AmityUIKit4/AmityUIKit4/Assets.xcassets/tagIcon.imageset/ic_product_tag.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎UpstraUIKit/AmityUIKit4/AmityUIKit4/Assets.xcassets/tagIcon.imageset/ic_tag.svg‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎UpstraUIKit/AmityUIKit4/AmityUIKit4/Assets.xcassets/viewMoreReplyArrowIcon.imageset/Contents.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "viewMoreReplyArrowIcon.svg",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

‎UpstraUIKit/AmityUIKit4/AmityUIKit4/Assets.xcassets/viewMoreReplyArrowIcon.imageset/viewMoreReplyArrowIcon.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎UpstraUIKit/AmityUIKit4/AmityUIKit4/Chat/Components/Composer/Elements/AmityMessageTextEditorView.swift‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ extension AmityMessageTextEditorView: AmityViewBuildable {
4444
public func scrollEnabled(_ value: Bool) -> Self {
4545
mutating(keyPath: \.scrollEnabled, value: value)
4646
}
47+
48+
public func displayInlineSuggestionView(_ value: Bool) -> Self {
49+
mutating(keyPath: \.displayInlineSuggestionView, value: value)
50+
}
4751
}
4852

4953
public struct AmityMessageTextEditorView: View {
@@ -70,6 +74,7 @@ public struct AmityMessageTextEditorView: View {
7074
private var maxHashtagCount: Int = 5
7175
private var enableProductMention: Bool = false
7276
private var scrollEnabled: Bool = true
77+
private var displayInlineSuggestionView: Bool = true
7378

7479
public init(_ viewModel: AmityTextEditorViewModel, text: Binding<String>, mentionData: Binding<MentionData>, mentionedUsers: Binding<[AmityMentionUserModel]>, links: Binding<[LinkDetail]?>? = nil, textViewHeight: CGFloat, textEditorMaxHeight: CGFloat = 106, placeholderPadding: CGFloat = 5) {
7580
self._text = text
@@ -185,14 +190,16 @@ public struct AmityMessageTextEditorView: View {
185190
}
186191
}
187192
.onChange(of: viewModel.showSuggestionView) { show in
188-
if show {
189-
showSuggestionOverlay()
190-
} else {
191-
SuggestionOverlayWindow.dismiss()
193+
if displayInlineSuggestionView {
194+
if show {
195+
showSuggestionOverlay()
196+
} else {
197+
SuggestionOverlayWindow.dismiss()
198+
}
192199
}
193200
}
194201
.onChange(of: viewModel.suggestionViewCursorRect) { newRect in
195-
if viewModel.showSuggestionView {
202+
if viewModel.showSuggestionView && displayInlineSuggestionView {
196203
SuggestionOverlayWindow.updatePosition(at: newRect)
197204
}
198205
}

‎UpstraUIKit/AmityUIKit4/AmityUIKit4/Clip/Page/Feed/ClipFeedItemOverlayView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ extension ClipFeedItemOverlayView {
425425
private var postExpandableContent: some View {
426426
ExpandableText(post.text, defaultAction: {
427427
togglePostContentExpantion()
428-
}, metadata: post.metadata, mentionees: post.mentionees, onTapMentionee: { userId in
428+
}, metadata: post.metadata, mentionees: post.mentionees, links: post.links, onTapMentionee: { userId in
429429
// We do not support expanding text in this view, so we redirect to post detail page
430430
onTapAction?(.userProfile(userId: userId))
431431
})

0 commit comments

Comments
 (0)