Skip to content

Commit 9c25bba

Browse files
fanyufanyu
committed
Add links in shared media
1 parent 569bf19 commit 9c25bba

16 files changed

Lines changed: 339 additions & 0 deletions

File tree

‎Mixin.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,9 @@
595595
7C66F1BF268B3514006D8462 /* HomeAppsManager+FolderInteraction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C66F1BE268B3514006D8462 /* HomeAppsManager+FolderInteraction.swift */; };
596596
7C66F1C1268C0250006D8462 /* HomeAppsFolderInteraction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C66F1C0268C0250006D8462 /* HomeAppsFolderInteraction.swift */; };
597597
7C695D56285B25AB0042177C /* SpotlightManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C695D55285B25AB0042177C /* SpotlightManager.swift */; };
598+
7C6967F82864488E0042177C /* SharedMediaLinkTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C6967F72864488E0042177C /* SharedMediaLinkTableViewController.swift */; };
599+
7C6967FB286450DB0042177C /* SharedMediaLinkCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C6967F9286450DB0042177C /* SharedMediaLinkCell.swift */; };
600+
7C6967FC286450DB0042177C /* SharedMediaLinkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7C6967FA286450DB0042177C /* SharedMediaLinkCell.xib */; };
598601
7C6AD1F526A6794F00E6C41D /* StickersStoreViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C6AD1F426A6794F00E6C41D /* StickersStoreViewController.swift */; };
599602
7C7635B826A13461006101DB /* HomeAppsConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7635B726A13461006101DB /* HomeAppsConstants.swift */; };
600603
7C8CC5A4280D347A00F7CBDF /* PreviewWallpaperViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C8CC5A2280D347A00F7CBDF /* PreviewWallpaperViewController.swift */; };
@@ -1583,6 +1586,9 @@
15831586
7C66F1BE268B3514006D8462 /* HomeAppsManager+FolderInteraction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HomeAppsManager+FolderInteraction.swift"; sourceTree = "<group>"; };
15841587
7C66F1C0268C0250006D8462 /* HomeAppsFolderInteraction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeAppsFolderInteraction.swift; sourceTree = "<group>"; };
15851588
7C695D55285B25AB0042177C /* SpotlightManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpotlightManager.swift; sourceTree = "<group>"; };
1589+
7C6967F72864488E0042177C /* SharedMediaLinkTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedMediaLinkTableViewController.swift; sourceTree = "<group>"; };
1590+
7C6967F9286450DB0042177C /* SharedMediaLinkCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedMediaLinkCell.swift; sourceTree = "<group>"; };
1591+
7C6967FA286450DB0042177C /* SharedMediaLinkCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SharedMediaLinkCell.xib; sourceTree = "<group>"; };
15861592
7C6AD1F426A6794F00E6C41D /* StickersStoreViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StickersStoreViewController.swift; sourceTree = "<group>"; };
15871593
7C7635B726A13461006101DB /* HomeAppsConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeAppsConstants.swift; sourceTree = "<group>"; };
15881594
7C8CC5A2280D347A00F7CBDF /* PreviewWallpaperViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreviewWallpaperViewController.swift; sourceTree = "<group>"; };
@@ -2823,6 +2829,7 @@
28232829
7B8BB585234EE9A200991ACB /* SharedMediaAudioTableViewController.swift */,
28242830
7B8A6A6C2456C39F00ADC9EB /* SharedMediaPostTableViewController.swift */,
28252831
7BCEAA752350A20600F07635 /* SharedMediaDataTableViewController.swift */,
2832+
7C6967F72864488E0042177C /* SharedMediaLinkTableViewController.swift */,
28262833
7B3FD4EB241965AA00B58006 /* LocationViewController.swift */,
28272834
7B36919E233A1962007321A7 /* LocationPickerViewController.swift */,
28282835
7BB5250224160F3D0060DAE1 /* LocationPreviewViewController.swift */,
@@ -3519,6 +3526,8 @@
35193526
7B8BB591234F37D100991ACB /* SharedMediaAudioCell.swift */,
35203527
7BCEAA772350A29000F07635 /* SharedMediaDataCell.xib */,
35213528
7BCEAA792350A3A200F07635 /* SharedMediaDataCell.swift */,
3529+
7C6967FA286450DB0042177C /* SharedMediaLinkCell.xib */,
3530+
7C6967F9286450DB0042177C /* SharedMediaLinkCell.swift */,
35223531
7B8A6A732456E0EC00ADC9EB /* SharedMediaPostCell.xib */,
35233532
7B8A6A722456E0EC00ADC9EB /* SharedMediaPostCell.swift */,
35243533
7BFCB7752419FC5B00E7BC43 /* LocationCell.xib */,
@@ -3984,6 +3993,7 @@
39843993
7BFE47DD228432A600FC4379 /* PeerInfoView.xib in Resources */,
39853994
7B8A6A752456E0EC00ADC9EB /* SharedMediaPostCell.xib in Resources */,
39863995
7B8BB58E234F34FE00991ACB /* SharedMediaAudioCell.xib in Resources */,
3996+
7C6967FC286450DB0042177C /* SharedMediaLinkCell.xib in Resources */,
39873997
7BCA2E302452CBF6005BD2E4 /* AboutTableHeaderView.xib in Resources */,
39883998
DF8CECE71FC317BF00E40064 /* PayWindow.xib in Resources */,
39893999
7C6132B827953B4F002777EE /* DeleteAccountAbortWindow.xib in Resources */,
@@ -4338,6 +4348,7 @@
43384348
7BF49DD320C3DBAC00A8510E /* CaptchaManager.swift in Sources */,
43394349
DF8CECE11FC3054700E40064 /* TransferTypeCell.swift in Sources */,
43404350
7BCB8C8422BB56B8002A13CC /* DataAndStorageSettingsViewController.swift in Sources */,
4351+
7C6967F82864488E0042177C /* SharedMediaLinkTableViewController.swift in Sources */,
43414352
9BB351671FB19ECB00EDDD2C /* ConversationDateHeaderView.swift in Sources */,
43424353
DF2819752014669E001EE5FA /* RefreshAccountJob.swift in Sources */,
43434354
DF768563200647CC0055F3FF /* BouncingButton.swift in Sources */,
@@ -4505,6 +4516,7 @@
45054516
7B2E56B2244EC44E0073102C /* PinSettingsViewController.swift in Sources */,
45064517
7C2475C727795BC100112A30 /* DeleteAccountTableHeaderView.swift in Sources */,
45074518
7BACFED32459C47C0033A3CD /* BubblePath.swift in Sources */,
4519+
7C6967FB286450DB0042177C /* SharedMediaLinkCell.swift in Sources */,
45084520
ABE865BE23F2455800C0167D /* Scope.swift in Sources */,
45094521
DF121F351FA1C809000F701D /* CornerImageView.swift in Sources */,
45104522
9438252725EE697300709B7D /* CacheableAssetFileManager.swift in Sources */,

‎Mixin/Assets.xcassets/Empty Indicator/ic_shared_link.imageset/Contents.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"filename" : "ic_shared_link@2x.png",
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"filename" : "ic_shared_link@3x.png",
14+
"idiom" : "universal",
15+
"scale" : "3x"
16+
}
17+
],
18+
"info" : {
19+
"author" : "xcode",
20+
"version" : 1
21+
}
22+
}

‎Mixin/Assets.xcassets/Empty Indicator/ic_shared_link.imageset/ic_shared_link@2x.png‎

4.12 KB
Loading

‎Mixin/Assets.xcassets/Empty Indicator/ic_shared_link.imageset/ic_shared_link@3x.png‎

6.36 KB
Loading

‎Mixin/Resources/en.lproj/Localizable.strings‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@
444444
"line_busy_remote" = "Line busy";
445445
"link_recognition_failure" = "Link recognition failure";
446446
"link_shareable_false" = "The link has been set to not allow sharing";
447+
"links" = "Links";
447448
"live" = "Live";
448449
"live_shareable_false" = "The live has been set to not allow sharing";
449450
"live_stream" = "live stream";
@@ -521,6 +522,7 @@
521522
"no_files" = "NO FILES";
522523
"no_hidden_assets" = "No hidden assets";
523524
"no_items_selected" = "No Items Selected";
525+
"no_links" = "NO LINKS";
524526
"no_logs" = "No logs";
525527
"no_media" = "NO MEDIA";
526528
"no_memo" = "No Memo";

‎Mixin/Resources/zh-Hans.lproj/Localizable.strings‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@
444444
"line_busy_remote" = "对方忙";
445445
"link_recognition_failure" = "链接识别失败";
446446
"link_shareable_false" = "该链接已被设置为不允许分享";
447+
"links" = "链接";
447448
"live" = "直播";
448449
"live_shareable_false" = "该直播已被设置为不允许转发";
449450
"live_stream" = "直播卡片";
@@ -521,6 +522,7 @@
521522
"no_files" = "没有文件";
522523
"no_hidden_assets" = "没有隐藏的资产";
523524
"no_items_selected" = "未选定项目";
525+
"no_links" = "没有链接";
524526
"no_logs" = "没有日志";
525527
"no_media" = "没有媒体";
526528
"no_memo" = "没有 Memo（备注）";

‎Mixin/UserInterface/Controllers/Chat/Cells/SharedMediaLinkCell.swift‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import UIKit
2+
3+
class SharedMediaLinkCell: ModernSelectedBackgroundCell {
4+
5+
@IBOutlet weak var linkLabel: UILabel!
6+
7+
}

‎Mixin/UserInterface/Controllers/Chat/Cells/SharedMediaLinkCell.xib‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3+
<device id="retina6_1" orientation="portrait" appearance="light"/>
4+
<dependencies>
5+
<deployment identifier="iOS"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
7+
<capability name="Named colors" minToolsVersion="9.0"/>
8+
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
10+
</dependencies>
11+
<objects>
12+
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
13+
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
14+
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="shared_media_link" rowHeight="90" id="KGk-i7-Jjw" customClass="SharedMediaLinkCell" customModule="Mixin" customModuleProvider="target">
15+
<rect key="frame" x="0.0" y="0.0" width="320" height="90"/>
16+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
17+
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
18+
<rect key="frame" x="0.0" y="0.0" width="320" height="90"/>
19+
<autoresizingMask key="autoresizingMask"/>
20+
<subviews>
21+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_clip_webpage" translatesAutoresizingMaskIntoConstraints="NO" id="n82-08-jOM">
22+
<rect key="frame" x="20" y="20" width="50" height="50"/>
23+
<color key="backgroundColor" name="background_input"/>
24+
<color key="tintColor" name="text_accessory"/>
25+
<constraints>
26+
<constraint firstAttribute="width" constant="50" id="N42-DC-V43"/>
27+
<constraint firstAttribute="width" secondItem="n82-08-jOM" secondAttribute="height" multiplier="1:1" id="rh6-Sx-gP6"/>
28+
</constraints>
29+
<userDefinedRuntimeAttributes>
30+
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
31+
<integer key="value" value="25"/>
32+
</userDefinedRuntimeAttribute>
33+
</userDefinedRuntimeAttributes>
34+
</imageView>
35+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="https://mixin.one" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rwK-op-hgf">
36+
<rect key="frame" x="86" y="35.5" width="214" height="19.5"/>
37+
<fontDescription key="fontDescription" type="system" pointSize="16"/>
38+
<color key="textColor" name="text"/>
39+
<nil key="highlightedColor"/>
40+
<userDefinedRuntimeAttributes>
41+
<userDefinedRuntimeAttribute type="string" keyPath="dynamicTextSize" value="regular16"/>
42+
</userDefinedRuntimeAttributes>
43+
</label>
44+
</subviews>
45+
<constraints>
46+
<constraint firstItem="n82-08-jOM" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="OGb-mm-Ixm"/>
47+
<constraint firstItem="rwK-op-hgf" firstAttribute="leading" secondItem="n82-08-jOM" secondAttribute="trailing" constant="16" id="XZ7-Hf-uc2"/>
48+
<constraint firstItem="rwK-op-hgf" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="msq-8f-P9Q"/>
49+
<constraint firstAttribute="trailing" secondItem="rwK-op-hgf" secondAttribute="trailing" constant="20" id="r4i-J4-lTq"/>
50+
<constraint firstItem="n82-08-jOM" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="zNz-sK-bX4"/>
51+
</constraints>
52+
</tableViewCellContentView>
53+
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
54+
<color key="backgroundColor" name="background"/>
55+
<connections>
56+
<outlet property="linkLabel" destination="rwK-op-hgf" id="Cih-MU-p0z"/>
57+
</connections>
58+
<point key="canvasLocation" x="134.78260869565219" y="212.94642857142856"/>
59+
</tableViewCell>
60+
</objects>
61+
<resources>
62+
<image name="ic_clip_webpage" width="23" height="23"/>
63+
<namedColor name="background">
64+
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
65+
</namedColor>
66+
<namedColor name="background_input">
67+
<color red="0.96078431372549022" green="0.96862745098039216" blue="0.98039215686274506" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
68+
</namedColor>
69+
<namedColor name="text">
70+
<color red="0.20000000298023224" green="0.20000000298023224" blue="0.20000000298023224" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
71+
</namedColor>
72+
<namedColor name="text_accessory">
73+
<color red="0.72200000286102295" green="0.74099999666213989" blue="0.77999997138977051" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
74+
</namedColor>
75+
</resources>
76+
</document>

‎Mixin/UserInterface/Controllers/Chat/SharedMediaLinkTableViewController.swift‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
import UIKit
2+
import MixinServices
3+
4+
class SharedMediaLinkTableViewController: SharedMediaTableViewController {
5+
6+
private var dates = [String]()
7+
private var items = [String: [HyperlinkItem]]()
8+
9+
override func viewDidLoad() {
10+
super.viewDidLoad()
11+
tableView.register(R.nib.sharedMediaLinkCell)
12+
tableView.dataSource = self
13+
tableView.delegate = self
14+
reloadData()
15+
}
16+
17+
}
18+
19+
extension SharedMediaLinkTableViewController: UITableViewDataSource {
20+
21+
func numberOfSections(in tableView: UITableView) -> Int {
22+
items.count
23+
}
24+
25+
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
26+
items[dates[section]]?.count ?? 0
27+
}
28+
29+
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
30+
let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.shared_media_link, for: indexPath)!
31+
if let item = item(at: indexPath) {
32+
cell.linkLabel.text = item.link
33+
}
34+
return cell
35+
}
36+
37+
}
38+
39+
extension SharedMediaLinkTableViewController: UITableViewDelegate {
40+
41+
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
42+
let view = tableView.dequeueReusableHeaderFooterView(withIdentifier: headerReuseId) as! SharedMediaTableHeaderView
43+
if section < dates.count {
44+
view.label.text = dates[section]
45+
}
46+
return view
47+
}
48+
49+
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
50+
tableView.deselectRow(at: indexPath, animated: true)
51+
if let item = item(at: indexPath), let url = URL(string: item.link), let container = parent?.parent {
52+
let context = MixinWebViewController.Context(conversationId: conversationId, initialUrl: url)
53+
MixinWebViewController.presentInstance(with: context, asChildOf: container)
54+
}
55+
}
56+
57+
}
58+
59+
extension SharedMediaLinkTableViewController {
60+
61+
private func item(at indexPath: IndexPath) -> HyperlinkItem? {
62+
guard indexPath.section < dates.count else {
63+
return nil
64+
}
65+
let date = dates[indexPath.section]
66+
guard let items = self.items[date], indexPath.row >= 0, indexPath.row < items.count else {
67+
return nil
68+
}
69+
return items[indexPath.row]
70+
}
71+
72+
private func reloadData() {
73+
DispatchQueue.global().async { [weak self] in
74+
guard let self = self else {
75+
return
76+
}
77+
let linkItems = HyperlinkDAO.shared.hyperlinks(conversationId: self.conversationId)
78+
DispatchQueue.main.async {
79+
for item in linkItems {
80+
let date = item.createdAt.toUTCDate()
81+
let title = DateFormatter.dateSimple.string(from: date)
82+
if self.items[title] != nil {
83+
self.items[title]!.append(item)
84+
} else {
85+
self.dates.append(title)
86+
self.items[title] = [item]
87+
}
88+
}
89+
self.tableView.reloadData()
90+
self.tableView.checkEmpty(dataCount: self.items.count,
91+
text: R.string.localizable.no_links(),
92+
photo: R.image.emptyIndicator.ic_shared_link()!)
93+
}
94+
}
95+
}
96+
97+
}

‎Mixin/UserInterface/Controllers/Chat/SharedMediaViewController.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class SharedMediaViewController: UIViewController {
1515
private lazy var audioViewController = SharedMediaAudioTableViewController()
1616
private lazy var dataViewController = SharedMediaDataTableViewController()
1717
private lazy var postViewController = SharedMediaPostTableViewController()
18+
private lazy var linkViewController = SharedMediaLinkTableViewController()
1819

1920
private var contentViewController: UIViewController?
2021

@@ -24,6 +25,7 @@ class SharedMediaViewController: UIViewController {
2425
R.string.localizable.media(),
2526
R.string.localizable.audio(),
2627
R.string.localizable.post(),
28+
R.string.localizable.links(),
2729
R.string.localizable.file()
2830
]
2931
load(child: mediaViewController)
@@ -37,6 +39,8 @@ class SharedMediaViewController: UIViewController {
3739
load(child: audioViewController)
3840
case 2:
3941
load(child: postViewController)
42+
case 3:
43+
load(child: linkViewController)
4044
default:
4145
load(child: dataViewController)
4246
}

0 commit comments

Comments
 (0)