oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'doc-with-text' into voice-calls-2

This commit is contained in:
Ryan Zhao 2021-12-07 15:54:09 +11:00
parent d2f29e7db2 6225c12ced
commit e42c8ea592
6 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Session/Conversations/Message Cells/Content Views/DocumentView.swift
View File

@ -4,7 +4,7 @@ final class DocumentView : UIView {
private let textColor: UIColor
// MARK: Settings
private static let iconImageViewSize: CGSize = CGSize(width: 26, height: 40)
private static let iconImageViewSize: CGSize = CGSize(width: 31, height: 40)
// MARK: Lifecycle
init(viewItem: ConversationViewItem, textColor: UIColor) {
@ -36,11 +36,21 @@ final class DocumentView : UIView {
titleLabel.lineBreakMode = .byTruncatingTail
titleLabel.text = attachment.sourceFilename ?? "File"
titleLabel.textColor = textColor
titleLabel.font = .systemFont(ofSize: Values.mediumFontSize, weight: .light)
titleLabel.font = .systemFont(ofSize: Values.smallFontSize, weight: .light)
// Size label
let sizeLabel = UILabel()
sizeLabel.lineBreakMode = .byTruncatingTail
sizeLabel.text = OWSFormat.formatFileSize(UInt(attachment.byteCount))
sizeLabel.textColor = textColor
sizeLabel.font = .systemFont(ofSize: Values.verySmallFontSize)
// Label stack view
let labelStackView = UIStackView(arrangedSubviews: [ titleLabel, sizeLabel ])
labelStackView.axis = .vertical
// Stack view
let stackView = UIStackView(arrangedSubviews: [ imageView, titleLabel ])
let stackView = UIStackView(arrangedSubviews: [ imageView, labelStackView ])
stackView.axis = .horizontal
stackView.spacing = Values.verySmallSpacing
stackView.alignment = .center
addSubview(stackView)
stackView.pin(to: self)
}

BIN
Session/Meta/Images.xcassets/Session/File.imageset/doc.pdf vendored
View File

Binary file not shown.

12
Session/Meta/Images.xcassets/Session/FileLarge.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "doc_large.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
Session/Meta/Images.xcassets/Session/FileLarge.imageset/doc_large.pdf vendored Normal file
View File

Binary file not shown.

3
SignalUtilitiesKit/Media Viewing & Editing/MediaMessageView.swift
View File

@ -269,7 +269,8 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate {
private func createGenericPreview() {
var subviews = [UIView]()
let imageView = createHeroImageView(imageName: "actionsheet_document_black")
let imageView = createHeroImageView(imageName: "FileLarge")
imageView.contentMode = .center
subviews.append(imageView)
let fileNameLabel = createFileNameLabel()

8
SignalUtilitiesKit/Utilities/OWSFormat.m
View File

@ -31,11 +31,11 @@ NS_ASSUME_NONNULL_BEGIN
const unsigned long kOneKilobyte = 1024;
const unsigned long kOneMegabyte = kOneKilobyte * kOneKilobyte;
if (fileSize > kOneMegabyte * 10) {
return [[formatter stringFromNumber:@((int)round(fileSize / (CGFloat)kOneMegabyte))]
if (fileSize > kOneMegabyte) {
return [[formatter stringFromNumber:@((double)lround(fileSize * 100 / (CGFloat)kOneMegabyte) / 100)]
stringByAppendingString:@" MB"];
} else if (fileSize > kOneKilobyte * 10) {
return [[formatter stringFromNumber:@((int)round(fileSize / (CGFloat)kOneKilobyte))]
} else if (fileSize > kOneKilobyte) {
return [[formatter stringFromNumber:@((double)lround(fileSize * 100 / (CGFloat)kOneKilobyte) / 100)]
stringByAppendingString:@" KB"];
} else {
return [NSString stringWithFormat:@"%lu Bytes", fileSize];