SolarNetwork/App
3
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: SolarNetwork:234434f10295bd9905ff1f0e7ad60f006de5934b
Branches Tags
SolarNetwork:v3 SolarNetwork:v2
SolarNetwork:3.5.0+159 SolarNetwork:3.5.0+138 SolarNetwork:3.5.0+157 SolarNetwork:3.5.0+156 SolarNetwork:3.5.0+155 SolarNetwork:3.5.0+151 SolarNetwork:3.5.0+150 SolarNetwork:3.4.0+149 SolarNetwork:3.3.0+148 SolarNetwork:3.3.0+147 SolarNetwork:3.3.0+146 SolarNetwork:3.3.0+145 SolarNetwork:3.3.0+144 SolarNetwork:3.3.0+138 SolarNetwork:3.3.0+137 SolarNetwork:3.3.0+136 SolarNetwork:3.3.0+135 SolarNetwork:3.2.0+134 SolarNetwork:3.2.0+133 SolarNetwork:3.2.0+132 SolarNetwork:3.2.0+131 SolarNetwork:3.2.0+129 SolarNetwork:3.2.0+128 SolarNetwork:3.2.0+127 SolarNetwork:3.2.0+126 SolarNetwork:3.2.0+125 SolarNetwork:3.2.0+124 SolarNetwork:3.1.0+123 SolarNetwork:3.1.0+122 SolarNetwork:3.1.0+121 SolarNetwork:3.1.0+120 SolarNetwork:3.1.0+119 SolarNetwork:3.1.0+118 SolarNetwork:3.1.0+116 SolarNetwork:3.1.0+115 SolarNetwork:3.1.0+114 SolarNetwork:3.1.0+113 SolarNetwork:3.0.0+112 SolarNetwork:3.0.0+111 SolarNetwork:3.0.0+110 SolarNetwork:3.0.0+109 SolarNetwork:3.0.0+108 SolarNetwork:3.0.0+107 SolarNetwork:3.0.0+106 SolarNetwork:3.0.0+104 SolarNetwork:3.0.0+103 SolarNetwork:3.0.0+102 SolarNetwork:3.0.0+100 SolarNetwork:3.0.0+96 SolarNetwork:3.0.0+95 SolarNetwork:3.0.0+94 SolarNetwork:3.0.0+93 SolarNetwork:2.5.2+92 SolarNetwork:2.4.2+89 SolarNetwork:2.4.2+88 SolarNetwork:2.4.2+86 SolarNetwork:2.4.2+85 SolarNetwork:2.4.2+84 SolarNetwork:2.4.2+81 SolarNetwork:2.4.2+80 SolarNetwork:2.4.2+78 SolarNetwork:2.4.2+76 SolarNetwork:2.3.2+75 SolarNetwork:2.3.2+73 SolarNetwork:2.3.2+72 SolarNetwork:2.3.2+71 SolarNetwork:2.3.2+70 SolarNetwork:2.3.2+69 SolarNetwork:2.3.2+68 SolarNetwork:2.3.2+67 SolarNetwork:2.3.2+66 SolarNetwork:2.3.2+65 SolarNetwork:2.3.2+64 SolarNetwork:2.3.2+63 SolarNetwork:2.2.2+62 SolarNetwork:2.2.2+61 SolarNetwork:2.2.2+60 SolarNetwork:2.2.2+59 SolarNetwork:2.2.2+58 SolarNetwork:2.2.2+57 SolarNetwork:2.2.2+56 SolarNetwork:2.2.2+55 SolarNetwork:2.2.2+54 SolarNetwork:2.2.2+53 SolarNetwork:2.2.2+52 SolarNetwork:2.2.2+51 SolarNetwork:2.2.2+40 SolarNetwork:2.2.2+49 SolarNetwork:2.2.1+48 SolarNetwork:2.2.1+47 SolarNetwork:2.2.1+46 SolarNetwork:2.2.1+44 SolarNetwork:2.2.1+43 SolarNetwork:2.2.1+42 SolarNetwork:2.1.1+41 SolarNetwork:2.1.1+39 SolarNetwork:2.1.1+38 SolarNetwork:2.1.1+37 SolarNetwork:2.1.1+36 SolarNetwork:2.1.1+35 SolarNetwork:2.0.0+4 SolarNetwork:2.0.0+2
...
compare: SolarNetwork:44c5d916204022b2a4b09246a0fea1db6308ecca
Branches Tags
SolarNetwork:v3 SolarNetwork:v2
SolarNetwork:3.5.0+159 SolarNetwork:3.5.0+138 SolarNetwork:3.5.0+157 SolarNetwork:3.5.0+156 SolarNetwork:3.5.0+155 SolarNetwork:3.5.0+151 SolarNetwork:3.5.0+150 SolarNetwork:3.4.0+149 SolarNetwork:3.3.0+148 SolarNetwork:3.3.0+147 SolarNetwork:3.3.0+146 SolarNetwork:3.3.0+145 SolarNetwork:3.3.0+144 SolarNetwork:3.3.0+138 SolarNetwork:3.3.0+137 SolarNetwork:3.3.0+136 SolarNetwork:3.3.0+135 SolarNetwork:3.2.0+134 SolarNetwork:3.2.0+133 SolarNetwork:3.2.0+132 SolarNetwork:3.2.0+131 SolarNetwork:3.2.0+129 SolarNetwork:3.2.0+128 SolarNetwork:3.2.0+127 SolarNetwork:3.2.0+126 SolarNetwork:3.2.0+125 SolarNetwork:3.2.0+124 SolarNetwork:3.1.0+123 SolarNetwork:3.1.0+122 SolarNetwork:3.1.0+121 SolarNetwork:3.1.0+120 SolarNetwork:3.1.0+119 SolarNetwork:3.1.0+118 SolarNetwork:3.1.0+116 SolarNetwork:3.1.0+115 SolarNetwork:3.1.0+114 SolarNetwork:3.1.0+113 SolarNetwork:3.0.0+112 SolarNetwork:3.0.0+111 SolarNetwork:3.0.0+110 SolarNetwork:3.0.0+109 SolarNetwork:3.0.0+108 SolarNetwork:3.0.0+107 SolarNetwork:3.0.0+106 SolarNetwork:3.0.0+104 SolarNetwork:3.0.0+103 SolarNetwork:3.0.0+102 SolarNetwork:3.0.0+100 SolarNetwork:3.0.0+96 SolarNetwork:3.0.0+95 SolarNetwork:3.0.0+94 SolarNetwork:3.0.0+93 SolarNetwork:2.5.2+92 SolarNetwork:2.4.2+89 SolarNetwork:2.4.2+88 SolarNetwork:2.4.2+86 SolarNetwork:2.4.2+85 SolarNetwork:2.4.2+84 SolarNetwork:2.4.2+81 SolarNetwork:2.4.2+80 SolarNetwork:2.4.2+78 SolarNetwork:2.4.2+76 SolarNetwork:2.3.2+75 SolarNetwork:2.3.2+73 SolarNetwork:2.3.2+72 SolarNetwork:2.3.2+71 SolarNetwork:2.3.2+70 SolarNetwork:2.3.2+69 SolarNetwork:2.3.2+68 SolarNetwork:2.3.2+67 SolarNetwork:2.3.2+66 SolarNetwork:2.3.2+65 SolarNetwork:2.3.2+64 SolarNetwork:2.3.2+63 SolarNetwork:2.2.2+62 SolarNetwork:2.2.2+61 SolarNetwork:2.2.2+60 SolarNetwork:2.2.2+59 SolarNetwork:2.2.2+58 SolarNetwork:2.2.2+57 SolarNetwork:2.2.2+56 SolarNetwork:2.2.2+55 SolarNetwork:2.2.2+54 SolarNetwork:2.2.2+53 SolarNetwork:2.2.2+52 SolarNetwork:2.2.2+51 SolarNetwork:2.2.2+40 SolarNetwork:2.2.2+49 SolarNetwork:2.2.1+48 SolarNetwork:2.2.1+47 SolarNetwork:2.2.1+46 SolarNetwork:2.2.1+44 SolarNetwork:2.2.1+43 SolarNetwork:2.2.1+42 SolarNetwork:2.1.1+41 SolarNetwork:2.1.1+39 SolarNetwork:2.1.1+38 SolarNetwork:2.1.1+37 SolarNetwork:2.1.1+36 SolarNetwork:2.1.1+35 SolarNetwork:2.0.0+4 SolarNetwork:2.0.0+2

2 Commits
234434f102 ... 44c5d91620

Author SHA1 Message Date
LittleSheep
44c5d91620 💄 Better watchOS video attachment display 2025-10-30 00:03:24 +08:00
LittleSheep
7a5a2407b7 💄 Optimized post item row 2025-10-30 00:03:03 +08:00
2 changed files with 83 additions and 60 deletions
Expand all files Collapse all files

37
ios/WatchRunner Watch App/Views/AttachmentView.swift
View File

@@ -46,26 +46,34 @@ struct AttachmentView: View {
} }
} else if mimeType.starts(with: "video") { } else if mimeType.starts(with: "video") {
if let serverUrl = appState.serverUrl, let videoUrl = getAttachmentUrl(for: attachment.id, serverUrl: serverUrl) { if let serverUrl = appState.serverUrl, let videoUrl = getAttachmentUrl(for: attachment.id, serverUrl: serverUrl) {
let thumbnailUrl = videoUrl.appendingPathComponent("thumbnail") // Construct thumbnail URL
NavigationLink(destination: VideoPlayerView(videoUrl: videoUrl)) { NavigationLink(destination: VideoPlayerView(videoUrl: videoUrl)) {
AsyncImage(url: thumbnailUrl) { phase in if imageLoader.isLoading {
if let image = phase.image { ProgressView()
} else if let image = imageLoader.image {
ZStack {
image image
.resizable() .resizable()
.aspectRatio(contentMode: .fit) .aspectRatio(contentMode: .fit)
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
.cornerRadius(8) .cornerRadius(8)
} else if phase.error != nil {
Image(systemName: "play.rectangle.fill") // Placeholder for video thumbnail Image(systemName: "play.circle.fill")
.resizable() .resizable()
.aspectRatio(contentMode: .fit) .scaledToFit()
.frame(maxWidth: .infinity) .frame(width: 36, height: 36)
.foregroundColor(.gray) .foregroundColor(.white)
.cornerRadius(8) .shadow(color: .black.opacity(0.6), radius: 4, x: 0, y: 2)
} else {
ProgressView()
.cornerRadius(8)
} }
} else if imageLoader.errorMessage != nil {
Image(systemName: "play.rectangle.fill")
.resizable()
.aspectRatio(contentMode: .fit)
.frame(maxWidth: .infinity)
.foregroundColor(.gray)
.cornerRadius(8)
} else {
ProgressView()
.cornerRadius(8)
} }
} }
.buttonStyle(PlainButtonStyle()) .buttonStyle(PlainButtonStyle())
@@ -90,6 +98,11 @@ struct AttachmentView: View {
if attachment.mimeType?.starts(with: "image") == true { if attachment.mimeType?.starts(with: "image") == true {
await imageLoader.loadImage(from: attachmentUrl, token: token) await imageLoader.loadImage(from: attachmentUrl, token: token)
} }
if attachment.mimeType?.starts(with: "video") == true {
let thumbnailUrl = attachmentUrl
.appending(queryItems: [URLQueryItem(name: "thumbnail", value: "true")]) // Construct thumbnail URL
await imageLoader.loadImage(from: thumbnailUrl, token: token)
}
} }
} }
} }

106
ios/WatchRunner Watch App/Views/PostViews.swift
View File

@@ -15,28 +15,26 @@ struct PostRowView: View {
var body: some View { var body: some View {
VStack(alignment: .leading, spacing: 4) { VStack(alignment: .leading, spacing: 4) {
HStack { HStack {
if let serverUrl = appState.serverUrl, let pictureId = post.publisher.picture?.id, let imageUrl = getAttachmentUrl(for: pictureId, serverUrl: serverUrl), let token = appState.token { if imageLoader.isLoading {
if imageLoader.isLoading { ProgressView()
ProgressView() .frame(width: 24, height: 24)
.frame(width: 24, height: 24) } else if let image = imageLoader.image {
} else if let image = imageLoader.image { image
image .resizable()
.resizable() .frame(width: 24, height: 24)
.frame(width: 24, height: 24) .clipShape(Circle())
.clipShape(Circle()) } else if let errorMessage = imageLoader.errorMessage {
} else if let errorMessage = imageLoader.errorMessage { Text("Failed: \(errorMessage)")
Text("Failed: \(errorMessage)") .font(.caption)
.font(.caption) .foregroundColor(.red)
.foregroundColor(.red) .frame(width: 24, height: 24)
.frame(width: 24, height: 24) } else {
} else { // Placeholder if no image and not loading
// Placeholder if no image and not loading Image(systemName: "person.circle.fill")
Image(systemName: "person.circle.fill") .resizable()
.resizable() .frame(width: 24, height: 24)
.frame(width: 24, height: 24) .clipShape(Circle())
.clipShape(Circle()) .foregroundColor(.gray)
.foregroundColor(.gray)
}
} }
Text(post.publisher.nick ?? post.publisher.name) Text(post.publisher.nick ?? post.publisher.name)
.font(.subheadline) .font(.subheadline)
@@ -57,7 +55,21 @@ struct PostRowView: View {
Text(content) Text(content)
.font(.body) .font(.body)
} }
}
if !post.attachments.isEmpty {
AttachmentView(attachment: post.attachments[0])
if post.attachments.count > 1 {
HStack(spacing: 8) {
Image(systemName: "paperclip.circle.fill")
.frame(width: 12, height: 12)
.foregroundStyle(.gray)
Text("\(post.attachments.count - 1)+ attachments")
.font(.footnote)
.foregroundStyle(.gray)
}
}
}
}.padding(.vertical)
} }
} }
@@ -70,32 +82,31 @@ struct PostDetailView: View {
ScrollView { ScrollView {
VStack(alignment: .leading, spacing: 8) { VStack(alignment: .leading, spacing: 8) {
HStack { HStack {
if let serverUrl = appState.serverUrl, let pictureId = post.publisher.picture?.id, let imageUrl = getAttachmentUrl(for: pictureId, serverUrl: serverUrl), let token = appState.token { if publisherImageLoader.isLoading {
if publisherImageLoader.isLoading { ProgressView()
ProgressView() .frame(width: 32, height: 32)
.frame(width: 32, height: 32) } else if let image = publisherImageLoader.image {
} else if let image = publisherImageLoader.image { image
image .resizable()
.resizable() .frame(width: 32, height: 32)
.frame(width: 32, height: 32) .clipShape(Circle())
.clipShape(Circle()) } else if let errorMessage = publisherImageLoader.errorMessage {
} else if let errorMessage = publisherImageLoader.errorMessage { Text("Failed: \(errorMessage)")
Text("Failed: \(errorMessage)") .font(.caption)
.font(.caption) .foregroundColor(.red)
.foregroundColor(.red) .frame(width: 32, height: 32)
.frame(width: 32, height: 32) } else {
} else { Image(systemName: "person.circle.fill")
Image(systemName: "person.circle.fill") .resizable()
.resizable() .frame(width: 32, height: 32)
.frame(width: 32, height: 32) .clipShape(Circle())
.clipShape(Circle()) .foregroundColor(.gray)
.foregroundColor(.gray)
}
} }
Text("@\(post.publisher.name)") Text("@\(post.publisher.name)")
.font(.headline) .font(.headline)
} }
.task(id: post.publisher.picture?.id) { // Use task(id:) to reload image when pictureId changes // Use task(id:) to reload image when pictureId changes
.task(id: post.publisher.picture?.id) {
if let serverUrl = appState.serverUrl, let pictureId = post.publisher.picture?.id, let imageUrl = getAttachmentUrl(for: pictureId, serverUrl: serverUrl), let token = appState.token { if let serverUrl = appState.serverUrl, let pictureId = post.publisher.picture?.id, let imageUrl = getAttachmentUrl(for: pictureId, serverUrl: serverUrl), let token = appState.token {
await publisherImageLoader.loadImage(from: imageUrl, token: token) await publisherImageLoader.loadImage(from: imageUrl, token: token)
} }
@@ -113,7 +124,6 @@ struct PostDetailView: View {
} }
if !post.attachments.isEmpty { if !post.attachments.isEmpty {
Divider()
Text("Attachments").font(.headline) Text("Attachments").font(.headline)
ForEach(post.attachments) { attachment in ForEach(post.attachments) { attachment in
AttachmentView(attachment: attachment) AttachmentView(attachment: attachment)
@@ -121,13 +131,12 @@ struct PostDetailView: View {
} }
if !post.tags.isEmpty { if !post.tags.isEmpty {
Divider()
Text("Tags").font(.headline) Text("Tags").font(.headline)
FlowLayout(alignment: .leading, spacing: 4) { FlowLayout(alignment: .leading, spacing: 4) {
ForEach(post.tags) { tag in ForEach(post.tags) { tag in
Text("#\(tag.name ?? tag.slug)") Text("#\(tag.name ?? tag.slug)")
.font(.caption) .font(.caption)
.padding(.horizontal, 6) .padding(.horizontal, 8)
.padding(.vertical, 3) .padding(.vertical, 3)
.background(Capsule().fill(Color.accentColor.opacity(0.2))) .background(Capsule().fill(Color.accentColor.opacity(0.2)))
.cornerRadius(5) .cornerRadius(5)
@@ -136,6 +145,7 @@ struct PostDetailView: View {
} }
} }
.padding() .padding()
.frame(width: .infinity)
} }
.navigationTitle("Post") .navigationTitle("Post")
} }