mirror of
https://github.com/Dimillian/IceCubesApp.git
synced 2025-02-16 17:55:13 +00:00
Lint
This commit is contained in:
parent
2a3da72239
commit
a72f290038
38 changed files with 209 additions and 207 deletions
|
@ -1,4 +1,5 @@
|
||||||
import AppAccount
|
import AppAccount
|
||||||
|
import AuthenticationServices
|
||||||
import Combine
|
import Combine
|
||||||
import DesignSystem
|
import DesignSystem
|
||||||
import Env
|
import Env
|
||||||
|
@ -7,7 +8,6 @@ import Network
|
||||||
import NukeUI
|
import NukeUI
|
||||||
import SafariServices
|
import SafariServices
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
import AuthenticationServices
|
|
||||||
|
|
||||||
@MainActor
|
@MainActor
|
||||||
struct AddAccountView: View {
|
struct AddAccountView: View {
|
||||||
|
|
|
@ -72,24 +72,24 @@ struct SettingsTabs: View {
|
||||||
}
|
}
|
||||||
.navigationDestination(item: $startingPoint) { targetView in
|
.navigationDestination(item: $startingPoint) { targetView in
|
||||||
switch targetView {
|
switch targetView {
|
||||||
case .display:
|
case .display:
|
||||||
DisplaySettingsView()
|
DisplaySettingsView()
|
||||||
case .haptic:
|
case .haptic:
|
||||||
HapticSettingsView()
|
HapticSettingsView()
|
||||||
case .remoteTimelines:
|
case .remoteTimelines:
|
||||||
RemoteTimelinesSettingView()
|
RemoteTimelinesSettingView()
|
||||||
case .tagGroups:
|
case .tagGroups:
|
||||||
TagsGroupSettingView()
|
TagsGroupSettingView()
|
||||||
case .recentTags:
|
case .recentTags:
|
||||||
RecenTagsSettingView()
|
RecenTagsSettingView()
|
||||||
case .content:
|
case .content:
|
||||||
ContentSettingsView()
|
ContentSettingsView()
|
||||||
case .swipeActions:
|
case .swipeActions:
|
||||||
SwipeActionsSettingsView()
|
SwipeActionsSettingsView()
|
||||||
case .tabAndSidebarEntries:
|
case .tabAndSidebarEntries:
|
||||||
EmptyView()
|
EmptyView()
|
||||||
case .translation:
|
case .translation:
|
||||||
TranslationSettingsView()
|
TranslationSettingsView()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,11 +29,11 @@ public struct DefaultListEntityQuery: EntityQuery {
|
||||||
var account
|
var account
|
||||||
|
|
||||||
public func entities(for _: [ListEntity.ID]) async throws -> [ListEntity] {
|
public func entities(for _: [ListEntity.ID]) async throws -> [ListEntity] {
|
||||||
await fetchLists().map{ .init(list: $0 )}
|
await fetchLists().map { .init(list: $0) }
|
||||||
}
|
}
|
||||||
|
|
||||||
public func suggestedEntities() async throws -> [ListEntity] {
|
public func suggestedEntities() async throws -> [ListEntity] {
|
||||||
await fetchLists().map{ .init(list: $0 )}
|
await fetchLists().map { .init(list: $0) }
|
||||||
}
|
}
|
||||||
|
|
||||||
public func defaultResult() async -> ListEntity? {
|
public func defaultResult() async -> ListEntity? {
|
||||||
|
|
|
@ -10,12 +10,12 @@ struct AccountWidgetProvider: AppIntentTimelineProvider {
|
||||||
.init(date: Date(), account: .placeholder(), avatar: nil)
|
.init(date: Date(), account: .placeholder(), avatar: nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func snapshot(for configuration: AccountWidgetConfiguration, in context: Context) async -> AccountWidgetEntry {
|
func snapshot(for configuration: AccountWidgetConfiguration, in _: Context) async -> AccountWidgetEntry {
|
||||||
let account = await fetchAccount(configuration: configuration)
|
let account = await fetchAccount(configuration: configuration)
|
||||||
return .init(date: Date(), account: account, avatar: nil)
|
return .init(date: Date(), account: account, avatar: nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func timeline(for configuration: AccountWidgetConfiguration, in context: Context) async -> Timeline<AccountWidgetEntry> {
|
func timeline(for configuration: AccountWidgetConfiguration, in _: Context) async -> Timeline<AccountWidgetEntry> {
|
||||||
let account = await fetchAccount(configuration: configuration)
|
let account = await fetchAccount(configuration: configuration)
|
||||||
let images = try? await loadImages(urls: [account.avatar])
|
let images = try? await loadImages(urls: [account.avatar])
|
||||||
return .init(entries: [.init(date: Date(), account: account, avatar: images?.first?.value)],
|
return .init(entries: [.init(date: Date(), account: account, avatar: images?.first?.value)],
|
||||||
|
|
|
@ -11,7 +11,6 @@ struct AccountWidgetView: View {
|
||||||
@Environment(\.widgetFamily) var family
|
@Environment(\.widgetFamily) var family
|
||||||
@Environment(\.redactionReasons) var redacted
|
@Environment(\.redactionReasons) var redacted
|
||||||
|
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
VStack(alignment: .center, spacing: 4) {
|
VStack(alignment: .center, spacing: 4) {
|
||||||
if let avatar = entry.avatar {
|
if let avatar = entry.avatar {
|
||||||
|
|
|
@ -138,13 +138,13 @@ public struct AccountDetailContextMenu: View {
|
||||||
}
|
}
|
||||||
|
|
||||||
#if canImport(_Translation_SwiftUI)
|
#if canImport(_Translation_SwiftUI)
|
||||||
if #available(iOS 17.4, *) {
|
if #available(iOS 17.4, *) {
|
||||||
Button {
|
Button {
|
||||||
showTranslateView = true
|
showTranslateView = true
|
||||||
} label: {
|
} label: {
|
||||||
Label("status.action.translate", systemImage: "captions.bubble")
|
Label("status.action.translate", systemImage: "captions.bubble")
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if viewModel.relationship?.following == true {
|
if viewModel.relationship?.following == true {
|
||||||
|
|
|
@ -85,14 +85,14 @@ public struct AccountDetailView: View {
|
||||||
Spacer()
|
Spacer()
|
||||||
Image(systemName: "chevron.right")
|
Image(systemName: "chevron.right")
|
||||||
}
|
}
|
||||||
.onTapGesture {
|
.onTapGesture {
|
||||||
if let account = viewModel.account {
|
if let account = viewModel.account {
|
||||||
routerPath.navigate(to: .accountMediaGridView(account: account,
|
routerPath.navigate(to: .accountMediaGridView(account: account,
|
||||||
initialMediaStatuses: viewModel.statusesMedias))
|
initialMediaStatuses: viewModel.statusesMedias))
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#if !os(visionOS)
|
#if !os(visionOS)
|
||||||
.listRowBackground(theme.primaryBackgroundColor)
|
.listRowBackground(theme.primaryBackgroundColor)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
StatusesListView(fetcher: viewModel,
|
StatusesListView(fetcher: viewModel,
|
||||||
|
|
|
@ -85,7 +85,7 @@ import SwiftUI
|
||||||
|
|
||||||
private(set) var statuses: [Status] = []
|
private(set) var statuses: [Status] = []
|
||||||
var statusesMedias: [MediaStatus] {
|
var statusesMedias: [MediaStatus] {
|
||||||
statuses.filter{ !$0.mediaAttachments.isEmpty }.flatMap{ $0.asMediaStatus}
|
statuses.filter { !$0.mediaAttachments.isEmpty }.flatMap { $0.asMediaStatus }
|
||||||
}
|
}
|
||||||
|
|
||||||
var boosts: [Status] = []
|
var boosts: [Status] = []
|
||||||
|
|
|
@ -128,7 +128,7 @@ public struct AccountsListView: View {
|
||||||
PlaceholderView(iconName: "person.icloud",
|
PlaceholderView(iconName: "person.icloud",
|
||||||
title: "No accounts found",
|
title: "No accounts found",
|
||||||
message: "This list of accounts is empty")
|
message: "This list of accounts is empty")
|
||||||
.listRowSeparator(.hidden)
|
.listRowSeparator(.hidden)
|
||||||
} else {
|
} else {
|
||||||
ForEach(accounts) { account in
|
ForEach(accounts) { account in
|
||||||
if let relationship = relationships.first(where: { $0.id == account.id }) {
|
if let relationship = relationships.first(where: { $0.id == account.id }) {
|
||||||
|
@ -139,7 +139,7 @@ public struct AccountsListView: View {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if !os(visionOS)
|
#if !os(visionOS)
|
||||||
.listRowBackground(theme.primaryBackgroundColor)
|
.listRowBackground(theme.primaryBackgroundColor)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
switch nextPageState {
|
switch nextPageState {
|
||||||
|
|
|
@ -99,21 +99,21 @@ public struct EditAccountView: View {
|
||||||
viewModel.isPhotoPickerPresented = true
|
viewModel.isPhotoPickerPresented = true
|
||||||
}
|
}
|
||||||
if viewModel.avatar != nil || viewModel.header != nil {
|
if viewModel.avatar != nil || viewModel.header != nil {
|
||||||
Divider()
|
Divider()
|
||||||
}
|
}
|
||||||
if viewModel.avatar != nil {
|
if viewModel.avatar != nil {
|
||||||
Button("account.edit.avatar.delete", role: .destructive) {
|
Button("account.edit.avatar.delete", role: .destructive) {
|
||||||
Task {
|
Task {
|
||||||
await viewModel.deleteAvatar()
|
await viewModel.deleteAvatar()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if viewModel.header != nil {
|
if viewModel.header != nil {
|
||||||
Button("account.edit.header.delete", role: .destructive) {
|
Button("account.edit.header.delete", role: .destructive) {
|
||||||
Task {
|
Task {
|
||||||
await viewModel.deleteHeader()
|
await viewModel.deleteHeader()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
Image(systemName: "photo.badge.plus")
|
Image(systemName: "photo.badge.plus")
|
||||||
|
|
|
@ -51,19 +51,19 @@ import SwiftUI
|
||||||
didSet {
|
didSet {
|
||||||
if let item = mediaPickers.first {
|
if let item = mediaPickers.first {
|
||||||
Task {
|
Task {
|
||||||
if isChangingAvatar {
|
if isChangingAvatar {
|
||||||
if let data = await getItemImageData(item: item, for: .avatar) {
|
if let data = await getItemImageData(item: item, for: .avatar) {
|
||||||
_ = await uploadAvatar(data: data)
|
_ = await uploadAvatar(data: data)
|
||||||
}
|
|
||||||
isChangingAvatar = false
|
|
||||||
} else if isChangingHeader {
|
|
||||||
if let data = await getItemImageData(item: item, for: .header) {
|
|
||||||
_ = await uploadHeader(data: data)
|
|
||||||
}
|
|
||||||
isChangingHeader = false
|
|
||||||
}
|
}
|
||||||
await fetchAccount()
|
isChangingAvatar = false
|
||||||
mediaPickers = []
|
} else if isChangingHeader {
|
||||||
|
if let data = await getItemImageData(item: item, for: .header) {
|
||||||
|
_ = await uploadHeader(data: data)
|
||||||
|
}
|
||||||
|
isChangingHeader = false
|
||||||
|
}
|
||||||
|
await fetchAccount()
|
||||||
|
mediaPickers = []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -186,26 +186,26 @@ import SwiftUI
|
||||||
}
|
}
|
||||||
|
|
||||||
extension EditAccountViewModel {
|
extension EditAccountViewModel {
|
||||||
private enum ItemType {
|
private enum ItemType {
|
||||||
case avatar
|
case avatar
|
||||||
case header
|
case header
|
||||||
|
|
||||||
var maxHeight: CGFloat {
|
var maxHeight: CGFloat {
|
||||||
switch self {
|
switch self {
|
||||||
case .avatar:
|
case .avatar:
|
||||||
400
|
400
|
||||||
case .header:
|
case .header:
|
||||||
500
|
500
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
var maxWidth: CGFloat {
|
|
||||||
switch self {
|
|
||||||
case .avatar:
|
|
||||||
400
|
|
||||||
case .header:
|
|
||||||
1500
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var maxWidth: CGFloat {
|
||||||
|
switch self {
|
||||||
|
case .avatar:
|
||||||
|
400
|
||||||
|
case .header:
|
||||||
|
1500
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
import SwiftUI
|
|
||||||
import DesignSystem
|
import DesignSystem
|
||||||
import NukeUI
|
|
||||||
import Env
|
import Env
|
||||||
import MediaUI
|
import MediaUI
|
||||||
import Models
|
import Models
|
||||||
import Network
|
import Network
|
||||||
|
import NukeUI
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
@MainActor
|
@MainActor
|
||||||
public struct AccountDetailMediaGridView: View {
|
public struct AccountDetailMediaGridView: View {
|
||||||
|
@ -18,7 +18,7 @@ public struct AccountDetailMediaGridView: View {
|
||||||
|
|
||||||
public init(account: Account, initialMediaStatuses: [MediaStatus]) {
|
public init(account: Account, initialMediaStatuses: [MediaStatus]) {
|
||||||
self.account = account
|
self.account = account
|
||||||
self.mediaStatuses = initialMediaStatuses
|
mediaStatuses = initialMediaStatuses
|
||||||
}
|
}
|
||||||
|
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
|
@ -26,7 +26,8 @@ public struct AccountDetailMediaGridView: View {
|
||||||
LazyVGrid(columns: [.init(.flexible(minimum: 100), spacing: 4),
|
LazyVGrid(columns: [.init(.flexible(minimum: 100), spacing: 4),
|
||||||
.init(.flexible(minimum: 100), spacing: 4),
|
.init(.flexible(minimum: 100), spacing: 4),
|
||||||
.init(.flexible(minimum: 100), spacing: 4)],
|
.init(.flexible(minimum: 100), spacing: 4)],
|
||||||
spacing: 4) {
|
spacing: 4)
|
||||||
|
{
|
||||||
ForEach(mediaStatuses) { status in
|
ForEach(mediaStatuses) { status in
|
||||||
GeometryReader { proxy in
|
GeometryReader { proxy in
|
||||||
if let url = status.attachment.url {
|
if let url = status.attachment.url {
|
||||||
|
@ -35,7 +36,7 @@ public struct AccountDetailMediaGridView: View {
|
||||||
case .image:
|
case .image:
|
||||||
LazyImage(url: url, transaction: Transaction(animation: .easeIn)) { state in
|
LazyImage(url: url, transaction: Transaction(animation: .easeIn)) { state in
|
||||||
if let image = state.image {
|
if let image = state.image {
|
||||||
image
|
image
|
||||||
.resizable()
|
.resizable()
|
||||||
.scaledToFill()
|
.scaledToFill()
|
||||||
.frame(width: proxy.size.width, height: proxy.size.width)
|
.frame(width: proxy.size.width, height: proxy.size.width)
|
||||||
|
@ -96,21 +97,21 @@ public struct AccountDetailMediaGridView: View {
|
||||||
}
|
}
|
||||||
.navigationTitle(account.displayName ?? "")
|
.navigationTitle(account.displayName ?? "")
|
||||||
#if !os(visionOS)
|
#if !os(visionOS)
|
||||||
.scrollContentBackground(.hidden)
|
.scrollContentBackground(.hidden)
|
||||||
.background(theme.primaryBackgroundColor)
|
.background(theme.primaryBackgroundColor)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
private func fetchNextPage() async throws {
|
private func fetchNextPage() async throws {
|
||||||
let client = client
|
let client = client
|
||||||
let newStatuses: [Status] =
|
let newStatuses: [Status] =
|
||||||
try await client.get(endpoint: Accounts.statuses(id: account.id,
|
try await client.get(endpoint: Accounts.statuses(id: account.id,
|
||||||
sinceId: mediaStatuses.last?.id,
|
sinceId: mediaStatuses.last?.id,
|
||||||
tag: nil,
|
tag: nil,
|
||||||
onlyMedia: true,
|
onlyMedia: true,
|
||||||
excludeReplies: true,
|
excludeReplies: true,
|
||||||
excludeReblogs: true,
|
excludeReblogs: true,
|
||||||
pinned: nil))
|
pinned: nil))
|
||||||
mediaStatuses.append(contentsOf: newStatuses.flatMap{ $0.asMediaStatus })
|
mediaStatuses.append(contentsOf: newStatuses.flatMap { $0.asMediaStatus })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,8 +3,8 @@ import SwiftUI
|
||||||
#if canImport(_Translation_SwiftUI)
|
#if canImport(_Translation_SwiftUI)
|
||||||
import Translation
|
import Translation
|
||||||
|
|
||||||
extension View {
|
public extension View {
|
||||||
public func addTranslateView(isPresented: Binding<Bool>, text: String) -> some View {
|
func addTranslateView(isPresented: Binding<Bool>, text: String) -> some View {
|
||||||
if #available(iOS 17.4, *) {
|
if #available(iOS 17.4, *) {
|
||||||
return self.translationPresentation(isPresented: isPresented, text: text)
|
return self.translationPresentation(isPresented: isPresented, text: text)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -137,7 +137,7 @@ public enum SettingsStartingPoint {
|
||||||
public var path: [RouterDestination] = []
|
public var path: [RouterDestination] = []
|
||||||
public var presentedSheet: SheetDestination?
|
public var presentedSheet: SheetDestination?
|
||||||
|
|
||||||
public static var settingsStartingPoint: SettingsStartingPoint? = nil
|
public static var settingsStartingPoint: SettingsStartingPoint?
|
||||||
|
|
||||||
public init() {}
|
public init() {}
|
||||||
|
|
||||||
|
|
|
@ -130,10 +130,10 @@ import SwiftUI
|
||||||
}
|
}
|
||||||
|
|
||||||
var newPageResults: SearchResults = try await client.get(endpoint: Search.search(query: searchQuery,
|
var newPageResults: SearchResults = try await client.get(endpoint: Search.search(query: searchQuery,
|
||||||
type: type,
|
type: type,
|
||||||
offset: offset,
|
offset: offset,
|
||||||
following: nil),
|
following: nil),
|
||||||
forceVersion: .v2)
|
forceVersion: .v2)
|
||||||
if type == .accounts {
|
if type == .accounts {
|
||||||
let relationships: [Relationship] =
|
let relationships: [Relationship] =
|
||||||
try await client.get(endpoint: Accounts.relationships(ids: newPageResults.accounts.map(\.id)))
|
try await client.get(endpoint: Accounts.relationships(ids: newPageResults.accounts.map(\.id)))
|
||||||
|
@ -149,8 +149,6 @@ import SwiftUI
|
||||||
case .statuses:
|
case .statuses:
|
||||||
self.results[searchQuery]?.statuses.append(contentsOf: newPageResults.statuses)
|
self.results[searchQuery]?.statuses.append(contentsOf: newPageResults.statuses)
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {}
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ public struct Card: Codable, Identifiable, Equatable, Hashable {
|
||||||
public var id: String {
|
public var id: String {
|
||||||
url
|
url
|
||||||
}
|
}
|
||||||
|
|
||||||
public let name: String
|
public let name: String
|
||||||
public let url: String
|
public let url: String
|
||||||
public let account: Account?
|
public let account: Account?
|
||||||
|
|
|
@ -79,7 +79,7 @@ public final class Status: AnyStatus, Codable, Identifiable, Equatable, Hashable
|
||||||
}
|
}
|
||||||
|
|
||||||
public var asMediaStatus: [MediaStatus] {
|
public var asMediaStatus: [MediaStatus] {
|
||||||
mediaAttachments.map{ .init(status: self, attachment: $0)}
|
mediaAttachments.map { .init(status: self, attachment: $0) }
|
||||||
}
|
}
|
||||||
|
|
||||||
public init(id: String, content: HTMLString, account: Account, createdAt: ServerDate, editedAt: ServerDate?, reblog: ReblogStatus?, mediaAttachments: [MediaAttachment], mentions: [Mention], repliesCount: Int, reblogsCount: Int, favouritesCount: Int, card: Card?, favourited: Bool?, reblogged: Bool?, pinned: Bool?, bookmarked: Bool?, emojis: [Emoji], url: String?, application: Application?, inReplyToId: String?, inReplyToAccountId: String?, visibility: Visibility, poll: Poll?, spoilerText: HTMLString, filtered: [Filtered]?, sensitive: Bool, language: String?) {
|
public init(id: String, content: HTMLString, account: Account, createdAt: ServerDate, editedAt: ServerDate?, reblog: ReblogStatus?, mediaAttachments: [MediaAttachment], mentions: [Mention], repliesCount: Int, reblogsCount: Int, favouritesCount: Int, card: Card?, favourited: Bool?, reblogged: Bool?, pinned: Bool?, bookmarked: Bool?, emojis: [Emoji], url: String?, application: Application?, inReplyToId: String?, inReplyToAccountId: String?, visibility: Visibility, poll: Poll?, spoilerText: HTMLString, filtered: [Filtered]?, sensitive: Bool, language: String?) {
|
||||||
|
|
|
@ -4,7 +4,6 @@ public enum Profile: Endpoint {
|
||||||
case deleteAvatar
|
case deleteAvatar
|
||||||
case deleteHeader
|
case deleteHeader
|
||||||
|
|
||||||
|
|
||||||
public func path() -> String {
|
public func path() -> String {
|
||||||
switch self {
|
switch self {
|
||||||
case .deleteAvatar:
|
case .deleteAvatar:
|
||||||
|
|
|
@ -58,10 +58,10 @@ public extension StatusEditor {
|
||||||
}
|
}
|
||||||
|
|
||||||
public func compressImageForUpload(
|
public func compressImageForUpload(
|
||||||
_ image: UIImage,
|
_ image: UIImage,
|
||||||
maxSize: Int = 10 * 1024 * 1024,
|
maxSize: Int = 10 * 1024 * 1024,
|
||||||
maxHeight: Double = 5000,
|
maxHeight: Double = 5000,
|
||||||
maxWidth: Double = 5000
|
maxWidth: Double = 5000
|
||||||
) async throws -> Data {
|
) async throws -> Data {
|
||||||
var image = image
|
var image = image
|
||||||
|
|
||||||
|
|
|
@ -38,9 +38,9 @@ extension StatusEditor {
|
||||||
generateButton
|
generateButton
|
||||||
}
|
}
|
||||||
#if canImport(_Translation_SwiftUI)
|
#if canImport(_Translation_SwiftUI)
|
||||||
if #available(iOS 17.4, *), !imageDescription.isEmpty {
|
if #available(iOS 17.4, *), !imageDescription.isEmpty {
|
||||||
translateButton
|
translateButton
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
.listRowBackground(theme.primaryBackgroundColor)
|
.listRowBackground(theme.primaryBackgroundColor)
|
||||||
|
|
|
@ -194,7 +194,7 @@ extension StatusEditor {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private func makeErrorView(error: ServerError) -> some View {
|
private func makeErrorView(error _: ServerError) -> some View {
|
||||||
ZStack {
|
ZStack {
|
||||||
placeholderView
|
placeholderView
|
||||||
Text("status.editor.error.upload")
|
Text("status.editor.error.upload")
|
||||||
|
|
|
@ -155,8 +155,8 @@ import SwiftUI
|
||||||
.init(color: startColor.opacity(0.02), location: 0.15),
|
.init(color: startColor.opacity(0.02), location: 0.15),
|
||||||
.init(color: endColor, location: 0.25),
|
.init(color: endColor, location: 0.25),
|
||||||
],
|
],
|
||||||
startPoint: .topLeading,
|
startPoint: .topLeading,
|
||||||
endPoint: .bottomTrailing)
|
endPoint: .bottomTrailing)
|
||||||
}
|
}
|
||||||
|
|
||||||
public init(status: Status,
|
public init(status: Status,
|
||||||
|
@ -379,16 +379,18 @@ import SwiftUI
|
||||||
}
|
}
|
||||||
|
|
||||||
var hasShown = false
|
var hasShown = false
|
||||||
#if canImport(_Translation_SwiftUI)
|
#if canImport(_Translation_SwiftUI)
|
||||||
if translation == nil,
|
if translation == nil,
|
||||||
#available(iOS 17.4, *) {
|
#available(iOS 17.4, *)
|
||||||
showAppleTranslation = true
|
{
|
||||||
hasShown = true
|
showAppleTranslation = true
|
||||||
}
|
hasShown = true
|
||||||
#endif
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if !hasShown,
|
if !hasShown,
|
||||||
translation == nil {
|
translation == nil
|
||||||
|
{
|
||||||
if preferredTranslationType == .useDeepl {
|
if preferredTranslationType == .useDeepl {
|
||||||
deeplTranslationError = true
|
deeplTranslationError = true
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -95,9 +95,9 @@ struct StatusRowHeaderView: View {
|
||||||
|
|
||||||
private var dateView: some View {
|
private var dateView: some View {
|
||||||
Text("\(Image(systemName: viewModel.finalStatus.visibility.iconName)) ⸱ \(viewModel.finalStatus.createdAt.relativeFormatted)")
|
Text("\(Image(systemName: viewModel.finalStatus.visibility.iconName)) ⸱ \(viewModel.finalStatus.createdAt.relativeFormatted)")
|
||||||
.fixedSize(horizontal: false, vertical: true)
|
.fixedSize(horizontal: false, vertical: true)
|
||||||
.font(.scaledFootnote)
|
.font(.scaledFootnote)
|
||||||
.foregroundStyle(.secondary)
|
.foregroundStyle(.secondary)
|
||||||
.lineLimit(1)
|
.lineLimit(1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -280,32 +280,32 @@ struct AltTextButton: View {
|
||||||
.padding(EdgeInsets(top: 5, leading: 7, bottom: 5, trailing: 7))
|
.padding(EdgeInsets(top: 5, leading: 7, bottom: 5, trailing: 7))
|
||||||
.background(.thinMaterial)
|
.background(.thinMaterial)
|
||||||
#if canImport(_Translation_SwiftUI)
|
#if canImport(_Translation_SwiftUI)
|
||||||
.addTranslateView(isPresented: $isDisplayingTranslation, text: text)
|
.addTranslateView(isPresented: $isDisplayingTranslation, text: text)
|
||||||
#endif
|
#endif
|
||||||
#if os(visionOS)
|
#if os(visionOS)
|
||||||
.clipShape(Capsule())
|
.clipShape(Capsule())
|
||||||
#endif
|
#endif
|
||||||
.cornerRadius(4)
|
.cornerRadius(4)
|
||||||
.padding(theme.statusDisplayStyle == .compact ? 0 : 10)
|
.padding(theme.statusDisplayStyle == .compact ? 0 : 10)
|
||||||
.alert(
|
.alert(
|
||||||
"status.editor.media.image-description",
|
"status.editor.media.image-description",
|
||||||
isPresented: $isDisplayingAlert
|
isPresented: $isDisplayingAlert
|
||||||
) {
|
) {
|
||||||
Button("alert.button.ok", action: {})
|
Button("alert.button.ok", action: {})
|
||||||
Button("status.action.copy-text", action: { UIPasteboard.general.string = text })
|
Button("status.action.copy-text", action: { UIPasteboard.general.string = text })
|
||||||
#if canImport(_Translation_SwiftUI)
|
#if canImport(_Translation_SwiftUI)
|
||||||
if #available(iOS 17.4, *) {
|
if #available(iOS 17.4, *) {
|
||||||
Button("status.action.translate", action: { isDisplayingTranslation = true })
|
Button("status.action.translate", action: { isDisplayingTranslation = true })
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
} message: {
|
} message: {
|
||||||
Text(text)
|
Text(text)
|
||||||
}
|
}
|
||||||
.frame(
|
.frame(
|
||||||
maxWidth: .infinity,
|
maxWidth: .infinity,
|
||||||
maxHeight: .infinity,
|
maxHeight: .infinity,
|
||||||
alignment: .bottomTrailing
|
alignment: .bottomTrailing
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -313,7 +313,8 @@ extension TimelineViewModel: StatusesFetcher {
|
||||||
guard !newStatuses.isEmpty,
|
guard !newStatuses.isEmpty,
|
||||||
isTimelineVisible,
|
isTimelineVisible,
|
||||||
!Task.isCancelled,
|
!Task.isCancelled,
|
||||||
initialTimeline == timeline else {
|
initialTimeline == timeline
|
||||||
|
else {
|
||||||
canStreamEvents = true
|
canStreamEvents = true
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -347,7 +348,8 @@ extension TimelineViewModel: StatusesFetcher {
|
||||||
|
|
||||||
if let topStatus = topStatus,
|
if let topStatus = topStatus,
|
||||||
visibileStatuses.contains(where: { $0.id == topStatus.id }),
|
visibileStatuses.contains(where: { $0.id == topStatus.id }),
|
||||||
scrollToTopVisible {
|
scrollToTopVisible
|
||||||
|
{
|
||||||
updateTimelineWithScrollToTop(newStatuses: newStatuses, statuses: statuses, nextPageState: nextPageState)
|
updateTimelineWithScrollToTop(newStatuses: newStatuses, statuses: statuses, nextPageState: nextPageState)
|
||||||
} else {
|
} else {
|
||||||
updateTimelineWithAnimation(statuses: statuses, nextPageState: nextPageState)
|
updateTimelineWithAnimation(statuses: statuses, nextPageState: nextPageState)
|
||||||
|
@ -381,7 +383,7 @@ extension TimelineViewModel: StatusesFetcher {
|
||||||
var allStatuses: [Status] = []
|
var allStatuses: [Status] = []
|
||||||
var latestMinId = minId
|
var latestMinId = minId
|
||||||
do {
|
do {
|
||||||
for _ in 1...maxPages {
|
for _ in 1 ... maxPages {
|
||||||
if Task.isCancelled { break }
|
if Task.isCancelled { break }
|
||||||
|
|
||||||
let newStatuses: [Status] = try await client.get(endpoint: timeline.endpoint(
|
let newStatuses: [Status] = try await client.get(endpoint: timeline.endpoint(
|
||||||
|
|
Loading…
Reference in a new issue