mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-10-31 16:24:11 +00:00
change applied and updated tests (#3751)
This commit is contained in:
Mauro
GitHub
@@ -6,6 +6,7 @@
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
import UniformTypeIdentifiers
|
||||
|
||||
extension String {
|
||||
/// Returns the string as an `AttributedString` with the specified character tinted in a different color.
|
||||
@@ -107,3 +108,13 @@ extension String {
|
||||
return "#\(aliasLocalPart):\(serverName)"
|
||||
}
|
||||
}
|
||||
|
||||
extension String {
|
||||
var validatedFileExtension: String {
|
||||
let fileExtension = (self as NSString).pathExtension
|
||||
guard !fileExtension.isEmpty else {
|
||||
return "bin"
|
||||
}
|
||||
return UTType(filenameExtension: fileExtension) != nil ? fileExtension : "bin"
|
||||
}
|
||||
}
|
||||
|
||||
+14
-7
@@ -38,6 +38,14 @@ struct MediaFileRoomTimelineContent: View {
|
||||
var shouldBoost = false
|
||||
var isAudioFile = false
|
||||
|
||||
private var fileDescription: String {
|
||||
var fileDescription = "\(filename.validatedFileExtension.uppercased())"
|
||||
if let fileSize {
|
||||
fileDescription += " (\(fileSize.formatted(.byteCount(style: .file))))"
|
||||
}
|
||||
return fileDescription
|
||||
}
|
||||
|
||||
var onMediaTap: (() -> Void)?
|
||||
|
||||
private var icon: KeyPath<CompoundIcons, Image> {
|
||||
@@ -69,14 +77,13 @@ struct MediaFileRoomTimelineContent: View {
|
||||
|
||||
var filePreview: some View {
|
||||
Label {
|
||||
HStack(spacing: 4) {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
Text(filename)
|
||||
.truncationMode(.middle)
|
||||
|
||||
if let fileSize {
|
||||
Text("(\(fileSize.formatted(.byteCount(style: .file))))")
|
||||
.layoutPriority(1) // We want the filename to truncate rather than the size.
|
||||
}
|
||||
.foregroundStyle(.compound.textPrimary)
|
||||
.font(.compound.bodyLG)
|
||||
Text(fileDescription)
|
||||
.font(.compound.bodySM)
|
||||
.foregroundStyle(.compound.textSecondary)
|
||||
}
|
||||
.font(.compound.bodyLG)
|
||||
.foregroundStyle(.compound.textPrimary)
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8e0cde871c15aa0fadf7c4f36f1e8efaaf1b6e4b183745970521c7e0682cc7ae
|
||||
size 91919
|
||||
oid sha256:15b1a0f770650e13802ff707e7c16bdb413f43c311593129cbb90a2a6b077114
|
||||
size 94305
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ea99daf61180bf74a70fdfcdcf78f775cafbcf06034ef5cd35f887c7ebd09c92
|
||||
size 94531
|
||||
oid sha256:15b1a0f770650e13802ff707e7c16bdb413f43c311593129cbb90a2a6b077114
|
||||
size 94305
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:462fbf7b26d76217a9045ba76a97c5172c63817383caf15e7a82e1db89a36d2f
|
||||
size 48610
|
||||
oid sha256:f9fa223814715cbd47cb54dce8193cd54a7bd4cbf8c2be9764926fd10c0b463f
|
||||
size 50364
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fb2174ebc097d4670f75b14e90074fe5477d9ae364dc40f520e8e3d51f316cd4
|
||||
size 50374
|
||||
oid sha256:f9fa223814715cbd47cb54dce8193cd54a7bd4cbf8c2be9764926fd10c0b463f
|
||||
size 50364
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d3b53e20f2c6cc50e19de94c8af37e1a0f4b96ed577994d4f5e8e6d2bbda4607
|
||||
size 99180
|
||||
oid sha256:9553383b6be10ac1d6adb795e060655a93b7a2c38e1adbbef82b23f8a1fa166a
|
||||
size 101537
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:48b6f07f5253cb191f6e29bc089f9b53170084b12b2a53fee14421926f59ed06
|
||||
size 103858
|
||||
oid sha256:605320bc00ac3836f3323512e295c64fe19cbf9ea528b2f4fde788fd22b9f7d3
|
||||
size 103179
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c591e0f26fcb14be30b7076970c1bfc32603ab3c88d0ac3390b550c1d252f058
|
||||
size 55077
|
||||
oid sha256:cf70fca82218f56874b858681386b5c53192454c614838752586e0c9e22c85f3
|
||||
size 56349
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c98cc16ddfe4c0b0f428806446c933bb9a0e0637090e0b525b4a20e89f37f263
|
||||
size 59016
|
||||
oid sha256:1fb063ce065d3a557691b74159dd70dfd850fc31cb4dc1a15fcd256d365a2255
|
||||
size 57644
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7e72e9a0f59a3b8967f7457cdbb2c11214f0793ea89807e3894a316c51b8cdf7
|
||||
size 120661
|
||||
oid sha256:a398ca747389932748299327e31bfdabb9e4759a661387afc6125b7e9aa7ac17
|
||||
size 123297
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ddbef7603abfb93c1edd1c78cd3f8d9a6f8f484fca89d92abb8d3d424c185f87
|
||||
size 124318
|
||||
oid sha256:a398ca747389932748299327e31bfdabb9e4759a661387afc6125b7e9aa7ac17
|
||||
size 123297
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e737333650f3f467d240e4a7e709fe38ed74f2370a08e54d2286a4b20339499f
|
||||
size 72725
|
||||
oid sha256:03c95247ecd8dd51d818defc30ed7b889e5197063cc23cc12d9c3ac674462a15
|
||||
size 75840
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0ea15196e740ba28f3818f83a778d9992dacb10b9a9959c0f5edad69121c9212
|
||||
size 76629
|
||||
oid sha256:03c95247ecd8dd51d818defc30ed7b889e5197063cc23cc12d9c3ac674462a15
|
||||
size 75840
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e2a98c631c75cda4c23c5526e2afb813aa2c080be3bc67fb6d738bccb67bdb57
|
||||
size 136530
|
||||
oid sha256:b8a2e89475abd3331c24e4dd2f41c3412d8e2d072fb9fcad6b05c3fd6e2cc819
|
||||
size 139102
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ef3b12f53fb49c4a0a3a11f1abffb21764d7b214b425437dccf572adeabf758a
|
||||
size 143746
|
||||
oid sha256:c624fe747a8d28aa799c6a47ab307f97106ecfedcb03129889f2fc35dec7c590
|
||||
size 142396
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3392233ca4467a372098ec75f53e1041490c4a2f721c0a9f547e83e434b6c318
|
||||
size 89292
|
||||
oid sha256:a32e3c387a8e6f0c089173ebcd213025d8130f48215dd19ebd44ac66eb340f3d
|
||||
size 91452
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:09c4eed152e1b3fcf6ccda1baa1778577e4cc71d239bc6c30aea17213c1273e9
|
||||
size 95252
|
||||
oid sha256:ab1bd64ed2509602ae16dbe5b7fd0eed4a778619e35ddd767ceb50d784afe099
|
||||
size 94093
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:55c63245de93fd3f295d495159923d9cdad7cb08774ac3de8c857a44913f8e55
|
||||
size 146447
|
||||
oid sha256:2706041d0803d773bfebcbcf9b9f2d0b54d6dfb2fa7b61fb175f79d5de336a21
|
||||
size 152101
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ff5bbb6dd0962f5246e39c9b38084a3e7d1ba320090bf47e79538f03e12a798d
|
||||
size 148498
|
||||
oid sha256:bfd3635e367e292e462a88c1ff7076200b9b89934c280063a7bba476c42f3010
|
||||
size 154388
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6c9bc334c55493ebf517d89d146846856d98b7031e7dc97685a94df9ac0d6b3a
|
||||
size 87020
|
||||
oid sha256:aa7f02abcec60f6d8be088601ef94a07a2b9d75ddae4ffb7eea7fd4992a7408d
|
||||
size 90368
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:aa9e0604a29c55902623b10044f4ea1a4f6ced7ad21480bbc0526ab762e88449
|
||||
size 89081
|
||||
oid sha256:121425745b9ec4d55a99e666c1cab14aedcd8ff5e1d316614923b1242e3b27aa
|
||||
size 92904
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7d51b385f71b84074878e9145752ffd96cd0d9221de758c7cfbde7ce0298b696
|
||||
size 2081577
|
||||
oid sha256:4a0c7bec8f90090923528bd84a61a77bd587f0b2352be2230f0d82b4b1d1c7af
|
||||
size 2085445
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9122b2a2e8e953518dadd09954758f8bfea29d9c3078b6a417947ec0a768ce2a
|
||||
size 2197095
|
||||
oid sha256:c384cb75e4b48e4934ef5bf25987a8fbe624075e918354804f587d90537c2441
|
||||
size 2201718
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a978fab354e4b360e81da55cd7e5f48c310ed4ec3c6ef7ad635c048425990dfb
|
||||
size 2082605
|
||||
oid sha256:04198840d8f6a143b04499b94e37d0abb164c50ee91822e91de9e1d40bc1caf7
|
||||
size 2087285
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:39feefa42a79f179b3a2cd961ef1bacef531ff04709a8acb073bfd8bd4388e03
|
||||
size 2211971
|
||||
oid sha256:56cb534e20e09599be869f0c12f87a4a9bea24ea3f28773068f5740f5644b713
|
||||
size 2215188
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a4c100a1e5a919919a79f08d52402f2bf18985dfbbd8ccbda7d309f75bb2fd83
|
||||
size 891050
|
||||
oid sha256:5406eea050be76f1ffcfad1d11713095daa93bd2d7d97b1813e0d7f8efe598d6
|
||||
size 892907
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e7e38f1e27a86f8e355ff5b9a4b34d66433749e27a29ae7d5c3342c83f370303
|
||||
size 1004157
|
||||
oid sha256:2978f935ee4253c9a34834447d58dd797c01abd60652875bef8711f0dd51b505
|
||||
size 1006148
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a61217ebfe902b3008eb01c6739d72cf85f54a89cc6d94b4d75efa514d3c98bb
|
||||
size 890512
|
||||
oid sha256:5ed43135ae2c527428e24a124d86f86aad6ac562aa3444791fd6e3e8c089ff96
|
||||
size 892418
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:75e0d87e2ee0812325bf26d35ca471a28c1b90cbee297dc30148941d64c69e84
|
||||
size 1010197
|
||||
oid sha256:77a61a2135d03b7d094b65a14f6be31bc2d38744cb7cd4edeb63a6571762ce28
|
||||
size 1012560
|
||||
|
||||
Reference in New Issue
Block a user