mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-22 08:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into iOS-18

Browse source
This commit is contained in:
Thomas Ricouard 2024-07-05 11:42:30 +02:00
commit 76a6462867
4 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Packages/StatusKit/Sources/StatusKit/Editor/Components/MediaView.swift
View file

@ -106,6 +106,11 @@ extension StatusEditor {
} }
} }
} }
.alert("alert.error", isPresented: $isErrorDisplayed) {
Button("Ok", action: {})
} message: {
Text(container.error?.localizedDescription ?? "")
}
.overlay(alignment: .bottomTrailing) { .overlay(alignment: .bottomTrailing) {
makeAltMarker(container: container) makeAltMarker(container: container)
} }
@ -194,11 +199,6 @@ extension StatusEditor {
placeholderView placeholderView
Text("status.editor.error.upload") Text("status.editor.error.upload")
} }
.alert("alert.error", isPresented: $isErrorDisplayed) {
Button("Ok", action: {})
} message: {
Text(error.error ?? "")
}
} }
private func makeAltMarker(container: MediaContainer) -> some View { private func makeAltMarker(container: MediaContainer) -> some View {

26
Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowCardView.swift
View file

@ -256,25 +256,21 @@ public struct StatusRowCardView: View {
Button { Button {
routerPath.navigate(to: .accountDetailWithAccount(account: account)) routerPath.navigate(to: .accountDetailWithAccount(account: account))
} label: { } label: {
HStack(alignment: .center, spacing: 8) { HStack(alignment: .center, spacing: 4) {
AvatarView(account.avatar, config: .list) Image(systemName: "link")
Text("More from")
AvatarView(account.avatar, config: .boost)
.padding(.top, 2) .padding(.top, 2)
EmojiTextApp(account.cachedDisplayName, emojis: account.emojis)
HStack(alignment: .firstTextBaseline, spacing: 0) { .fontWeight(.semibold)
Text("More from ") .emojiText.size(Font.scaledFootnoteFont.emojiSize)
EmojiTextApp(account.cachedDisplayName, emojis: account.emojis) .emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset)
.fontWeight(.semibold)
.emojiText.size(Font.scaledFootnoteFont.emojiSize)
.emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset)
}
.font(.scaledFootnote)
.lineLimit(1)
.padding(.top, 3)
Spacer() Spacer()
Image(systemName: "chevron.right") Image(systemName: "chevron.right")
} }
.padding(.vertical, 4) .font(.scaledFootnote)
.lineLimit(1)
.padding(.top, 4)
} }
.buttonStyle(.plain) .buttonStyle(.plain)
} }

8
Packages/Timeline/Sources/Timeline/View/TimelineView.swift
View file

@ -222,12 +222,18 @@ public struct TimelineView: View {
Text(timeline.localizedTitle()) Text(timeline.localizedTitle())
.font(.caption) .font(.caption)
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
case .home: case let .link(url, _):
Text(timeline.localizedTitle()) Text(timeline.localizedTitle())
.font(.headline) .font(.headline)
Text(url.host() ?? url.absoluteString)
.font(.caption)
.foregroundStyle(.secondary)
default: default:
Text(timeline.localizedTitle()) Text(timeline.localizedTitle())
.font(.headline) .font(.headline)
Text(client.server)
.font(.caption)
.foregroundStyle(.secondary)
} }
} }
.accessibilityRepresentation { .accessibilityRepresentation {

2
Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift
View file

@ -303,7 +303,7 @@ extension TimelineViewModel: StatusesFetcher {
} }
} }
// Fetch pages from the top most status of the tomeline. // Fetch pages from the top most status of the timeline.
private func fetchNewPagesFrom(latestStatus: String, client: Client) async throws { private func fetchNewPagesFrom(latestStatus: String, client: Client) async throws {
canStreamEvents = false canStreamEvents = false
let initialTimeline = timeline let initialTimeline = timeline