mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2025-09-03 08:33:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

format

Browse source
This commit is contained in:
Thomas Ricouard 2023-11-01 18:58:44 +01:00
parent 4c7a7986c5
commit 3e3c69c41c
30 changed files with 142 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
IceCubesApp/App/AppRegistry.swift
View file

@ -6,11 +6,11 @@ import Env
import Explore
import LinkPresentation
import Lists
import MediaUI
import Models
import Status
import SwiftUI
import Timeline
import MediaUI
@MainActor
extension View {

2
IceCubesApp/App/Main/IceCubesApp+Menu.swift
View file

@ -1,5 +1,5 @@
import SwiftUI
import Env
import SwiftUI
extension IceCubesApp {
@CommandsBuilder

11
IceCubesApp/App/Main/IceCubesApp+Scene.swift
View file

@ -1,7 +1,7 @@
import SwiftUI
import Env
import Status
import MediaUI
import Status
import SwiftUI
extension IceCubesApp {
var appScene: some Scene {
@ -26,9 +26,9 @@ extension IceCubesApp {
.sheet(item: $quickLook.selectedMediaAttachment) { selectedMediaAttachment in
MediaUIView(selectedAttachment: selectedMediaAttachment,
attachments: quickLook.mediaAttachments)
.presentationBackground(.ultraThinMaterial)
.presentationCornerRadius(16)
.withEnvironments()
.presentationBackground(.ultraThinMaterial)
.presentationCornerRadius(16)
.withEnvironments()
}
.onChange(of: pushNotificationsService.handledNotification) { _, newValue in
if newValue != nil {
@ -72,7 +72,6 @@ extension IceCubesApp {
}
}
var otherScenes: some Scene {
WindowGroup(for: WindowDestination.self) { destination in
Group {

3
IceCubesApp/App/Main/IceCubesApp+Sidebar.swift
View file

@ -1,5 +1,5 @@
import SwiftUI
import Env
import SwiftUI
extension IceCubesApp {
var sidebarView: some View {
@ -46,5 +46,4 @@ extension IceCubesApp {
.frame(maxWidth: .secondaryColumnWidth)
.id(appAccountsManager.currentAccount.id)
}
}

3
IceCubesApp/App/Main/IceCubesApp+Tabbar.swift
View file

@ -1,5 +1,5 @@
import SwiftUI
import Env
import SwiftUI
extension IceCubesApp {
var tabBarView: some View {
@ -46,7 +46,6 @@ extension IceCubesApp {
.id(appAccountsManager.currentClient.id)
}
private func badgeFor(tab: Tab) -> Int {
if tab == .notifications, selectedTab != tab,
let token = appAccountsManager.currentAccount.oauthToken

2
IceCubesApp/App/Main/IceCubesApp.swift
View file

@ -4,12 +4,12 @@ import AVFoundation
import DesignSystem
import Env
import KeychainSwift
import MediaUI
import Network
import RevenueCat
import Status
import SwiftUI
import Timeline
import MediaUI
@main
struct IceCubesApp: App {

2
IceCubesApp/App/Tabs/Settings/SettingsTab.swift
View file

@ -169,7 +169,7 @@ struct SettingsTabs: View {
private var otherSections: some View {
@Bindable var preferences = preferences
Section("settings.section.other") {
if !ProcessInfo.processInfo.isMacCatalystApp{
if !ProcessInfo.processInfo.isMacCatalystApp {
Picker(selection: $preferences.preferredBrowser) {
ForEach(PreferredBrowser.allCases, id: \.rawValue) { browser in
switch browser {

14
Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift
View file

@ -106,11 +106,10 @@ struct ConversationMessageView: View {
Button {
Task {
do {
let status: Status
if isLiked {
status = try await client.post(endpoint: Statuses.unfavorite(id: message.id))
let status: Status = if isLiked {
try await client.post(endpoint: Statuses.unfavorite(id: message.id))
} else {
status = try await client.post(endpoint: Statuses.favorite(id: message.id))
try await client.post(endpoint: Statuses.favorite(id: message.id))
}
withAnimation {
isLiked = status.favourited == true
@ -123,11 +122,10 @@ struct ConversationMessageView: View {
}
Button { Task {
do {
let status: Status
if isBookmarked {
status = try await client.post(endpoint: Statuses.unbookmark(id: message.id))
let status: Status = if isBookmarked {
try await client.post(endpoint: Statuses.unbookmark(id: message.id))
} else {
status = try await client.post(endpoint: Statuses.bookmark(id: message.id))
try await client.post(endpoint: Statuses.bookmark(id: message.id))
}
withAnimation {
isBookmarked = status.bookmarked == true

8
Packages/DesignSystem/Sources/DesignSystem/SceneDelegate.swift
View file

@ -16,10 +16,10 @@ import UIKit
window = windowScene.keyWindow
#if targetEnvironment(macCatalyst)
if let titlebar = windowScene.titlebar {
titlebar.titleVisibility = .hidden
titlebar.toolbar = nil
}
if let titlebar = windowScene.titlebar {
titlebar.titleVisibility = .hidden
titlebar.toolbar = nil
}
#endif
}
}

44
Packages/DesignSystem/Sources/DesignSystem/Views/LazyResizableImage.swift
View file

@ -12,31 +12,31 @@ import SwiftUI
/// A LazyImage (Nuke) with a geometry reader under the hood in order to use a Resize Processor to optimize performances on lists.
/// This views also allows smooth resizing of the images by debouncing the update of the ImageProcessor.
public struct LazyResizableImage<Content: View>: View {
public init(url: URL?, @ViewBuilder content: @escaping (LazyImageState, GeometryProxy) -> Content) {
self.imageURL = url
self.content = content
}
public init(url: URL?, @ViewBuilder content: @escaping (LazyImageState, GeometryProxy) -> Content) {
imageURL = url
self.content = content
}
let imageURL: URL?
@State private var resizeProcessor: ImageProcessors.Resize?
@State private var debouncedTask: Task<Void, Never>?
let imageURL: URL?
@State private var resizeProcessor: ImageProcessors.Resize?
@State private var debouncedTask: Task<Void, Never>?
@ViewBuilder
private var content: (LazyImageState, _ proxy: GeometryProxy) -> Content
@ViewBuilder
private var content: (LazyImageState, _ proxy: GeometryProxy) -> Content
public var body: some View {
GeometryReader { proxy in
LazyImage(url: imageURL) { state in
content(state, proxy)
}
.processors([resizeProcessor == nil ? .resize(size: proxy.size) : resizeProcessor!])
.onChange(of: proxy.size, initial: true) { oldValue, newValue in
debouncedTask?.cancel()
debouncedTask = Task {
do { try await Task.sleep(for: .milliseconds(200)) } catch { return }
resizeProcessor = .resize(size: newValue)
}
}
public var body: some View {
GeometryReader { proxy in
LazyImage(url: imageURL) { state in
content(state, proxy)
}
.processors([resizeProcessor == nil ? .resize(size: proxy.size) : resizeProcessor!])
.onChange(of: proxy.size, initial: true) { _, newValue in
debouncedTask?.cancel()
debouncedTask = Task {
do { try await Task.sleep(for: .milliseconds(200)) } catch { return }
resizeProcessor = .resize(size: newValue)
}
}
}
}
}

5
Packages/DesignSystem/Sources/DesignSystem/Views/StatusEditorToolbarItem.swift
View file

@ -4,8 +4,9 @@ import SwiftUI
@MainActor
public extension View {
func statusEditorToolbarItem(routerPath: RouterPath,
visibility: Models.Visibility) -> some ToolbarContent {
func statusEditorToolbarItem(routerPath _: RouterPath,
visibility: Models.Visibility) -> some ToolbarContent
{
StatusEditorToolbarItem(visibility: visibility)
}
}

28
Packages/Env/Sources/Env/UserPreferences.swift
View file

@ -88,20 +88,18 @@ import SwiftUI
}
public var pendingLocation: Alignment {
get {
let fromLeft = Locale.current.language.characterDirection == .leftToRight ? pendingShownLeft : !pendingShownLeft
if pendingShownAtBottom {
if fromLeft {
return .bottomLeading
} else {
return .bottomTrailing
}
let fromLeft = Locale.current.language.characterDirection == .leftToRight ? pendingShownLeft : !pendingShownLeft
if pendingShownAtBottom {
if fromLeft {
return .bottomLeading
} else {
if fromLeft {
return .topLeading
} else {
return .topTrailing
}
return .bottomTrailing
}
} else {
if fromLeft {
return .topLeading
} else {
return .topTrailing
}
}
}
@ -375,7 +373,7 @@ import SwiftUI
}
public var totalNotificationsCount: Int {
notificationsCount.compactMap{ $0.value }.reduce(0, +)
notificationsCount.compactMap(\.value).reduce(0, +)
}
public func reloadNotificationsCount(tokens: [OauthToken]) {
@ -456,6 +454,6 @@ import SwiftUI
collapseLongPosts = storage.collapseLongPosts
shareButtonBehavior = storage.shareButtonBehavior
pendingShownAtBottom = storage.pendingShownAtBottom
pendingShownLeft = storage.pendingShownLeft
pendingShownLeft = storage.pendingShownLeft
}
}

2
Packages/MediaUI/Sources/MediaUI/MediaUIAttachmentImageView.swift
View file

@ -1,6 +1,6 @@
import SwiftUI
import Models
import NukeUI
import SwiftUI
struct MediaUIAttachmentImageView: View {
let url: URL

2
Packages/MediaUI/Sources/MediaUI/MediaUIAttachmentVideoView.swift
View file

@ -67,7 +67,7 @@ public struct MediaUIAttachmentVideoView: View {
VideoPlayer(player: viewModel.player)
.accessibilityAddTraits(.startsMediaSession)
if !preferences.autoPlayVideo && !viewModel.forceAutoPlay {
if !preferences.autoPlayVideo, !viewModel.forceAutoPlay {
Image(systemName: "play.fill")
.font(isCompact ? .body : .largeTitle)
.foregroundColor(theme.tintColor)

2
Packages/MediaUI/Sources/MediaUI/MediaUITransferableImage.swift
View file

@ -1,6 +1,6 @@
import CoreTransferable
import SwiftUI
import UIKit
import CoreTransferable
struct MediaUIImageTransferable: Codable, Transferable {
let url: URL

30
Packages/MediaUI/Sources/MediaUI/MediaUIView.swift
View file

@ -1,7 +1,7 @@
import Nuke
import SwiftUI
import Models
import Nuke
import QuickLook
import SwiftUI
public struct MediaUIView: View, @unchecked Sendable {
private let data: [DisplayData]
@ -36,8 +36,8 @@ public struct MediaUIView: View, @unchecked Sendable {
}
public init(selectedAttachment: MediaAttachment, attachments: [MediaAttachment]) {
self.data = attachments.compactMap { DisplayData(from: $0) }
self.initialItem = DisplayData(from: selectedAttachment)
data = attachments.compactMap { DisplayData(from: $0) }
initialItem = DisplayData(from: selectedAttachment)
}
}
@ -45,9 +45,9 @@ private struct MediaToolBar: ToolbarContent {
let data: DisplayData
var body: some ToolbarContent {
#if !targetEnvironment(macCatalyst)
DismissToolbarItem()
#endif
#if !targetEnvironment(macCatalyst)
DismissToolbarItem()
#endif
QuickLookToolbarItem(itemUrl: data.url)
AltTextToolbarItem(alt: data.description)
SavePhotoToolbarItem(url: data.url, type: data.type)
@ -75,15 +75,15 @@ private struct AltTextToolbarItem: ToolbarContent {
var body: some ToolbarContent {
ToolbarItem(placement: .topBarTrailing) {
if let alt = alt {
if let alt {
Button {
isAlertDisplayed = true
} label: {
Text("status.image.alt-text.abbreviation")
}
.alert("status.editor.media.image-description",
isPresented: $isAlertDisplayed
) {
isPresented: $isAlertDisplayed)
{
Button("alert.button.ok", action: {})
} message: {
Text(alt)
@ -118,8 +118,8 @@ private struct SavePhotoToolbarItem: ToolbarContent, @unchecked Sendable {
} label: {
switch state {
case .unsaved: Image(systemName: "arrow.down.circle")
case .saving : ProgressView()
case .saved : Image(systemName: "checkmark.circle.fill")
case .saving: ProgressView()
case .saved: Image(systemName: "checkmark.circle.fill")
}
}
} else {
@ -205,7 +205,7 @@ private struct QuickLookToolbarItem: ToolbarContent, @unchecked Sendable {
in: .userDomainMask,
appropriateFor: nil,
create: false)
.appending(component: "quicklook")
.appending(component: "quicklook")
}
}
@ -236,9 +236,9 @@ private struct DisplayData: Identifiable, Hashable {
guard let url = attachment.url else { return nil }
guard let type = attachment.supportedType else { return nil }
self.id = attachment.id
id = attachment.id
self.url = url
self.description = attachment.description
description = attachment.description
self.type = DisplayType(from: type)
}
}

10
Packages/MediaUI/Sources/MediaUI/MediaUIZoomableContainer.swift
View file

@ -3,7 +3,7 @@ import UIKit
// ref: https://stackoverflow.com/questions/74238414/is-there-an-easy-way-to-pinch-to-zoom-and-drag-any-view-in-swiftui
fileprivate let maxAllowedScale = 4.0
private let maxAllowedScale = 4.0
@MainActor
struct MediaUIZoomableContainer<Content: View>: View {
@ -61,7 +61,7 @@ struct MediaUIZoomableContainer<Content: View>: View {
}
func makeCoordinator() -> Coordinator {
return Coordinator(hostingController: UIHostingController(rootView: content), scale: $currentScale)
Coordinator(hostingController: UIHostingController(rootView: content), scale: $currentScale)
}
func updateUIView(_ uiView: UIScrollView, context: Context) {
@ -95,11 +95,11 @@ struct MediaUIZoomableContainer<Content: View>: View {
_currentScale = scale
}
func viewForZooming(in scrollView: UIScrollView) -> UIView? {
return hostingController.view
func viewForZooming(in _: UIScrollView) -> UIView? {
hostingController.view
}
func scrollViewDidEndZooming(_ scrollView: UIScrollView, with view: UIView?, atScale scale: CGFloat) {
func scrollViewDidEndZooming(_: UIScrollView, with _: UIView?, atScale scale: CGFloat) {
currentScale = scale
}
}

14
Packages/Models/Sources/Models/MediaAttachement.swift
View file

@ -45,13 +45,13 @@ public struct MediaAttachment: Codable, Identifiable, Hashable, Equatable {
public let description: String?
public let meta: MetaContainer?
public static func imageWith(url: URL) -> MediaAttachment{
return .init(id: UUID().uuidString,
type: "image",
url: url,
previewUrl: url,
description: nil,
meta: nil)
public static func imageWith(url: URL) -> MediaAttachment {
.init(id: UUID().uuidString,
type: "image",
url: url,
previewUrl: url,
description: nil,
meta: nil)
}
}

2
Packages/Models/Sources/Models/SwiftData/Draft.swift
View file

@ -4,7 +4,7 @@ import SwiftUI
@Model public class Draft {
public var content: String = ""
public var creationDate: Date = Date()
public var creationDate: Date = .init()
public init(content: String) {
self.content = content

2
Packages/Models/Sources/Models/SwiftData/LocalTimeline.swift
View file

@ -4,7 +4,7 @@ import SwiftUI
@Model public class LocalTimeline {
public var instance: String = ""
public var creationDate: Date = Date()
public var creationDate: Date = .init()
public init(instance: String) {
self.instance = instance

2
Packages/Models/Sources/Models/SwiftData/TagGroup.swift
View file

@ -6,7 +6,7 @@ import SwiftUI
public var title: String = ""
public var symbolName: String = ""
public var tags: [String] = []
public var creationDate: Date = Date()
public var creationDate: Date = .init()
public init(title: String, symbolName: String, tags: [String]) {
self.title = title

5
Packages/Network/Sources/Network/Client.swift
View file

@ -93,7 +93,8 @@ import SwiftUI
private func makeURL(scheme: String = "https",
endpoint: Endpoint,
forceVersion: Version? = nil,
forceServer: String? = nil) throws -> URL {
forceServer: String? = nil) throws -> URL
{
var components = URLComponents()
components.scheme = scheme
components.host = forceServer ?? server
@ -140,7 +141,7 @@ import SwiftUI
}
public func getWithLink<Entity: Decodable>(endpoint: Endpoint) async throws -> (Entity, LinkHandler?) {
let (data, httpResponse) = try await urlSession.data(for: try makeGet(endpoint: endpoint))
let (data, httpResponse) = try await urlSession.data(for: makeGet(endpoint: endpoint))
var linkHandler: LinkHandler?
if let response = httpResponse as? HTTPURLResponse,
let link = response.allHeaderFields["Link"] as? String

2
Packages/Status/Sources/Status/Row/StatusRowView.swift
View file

@ -211,7 +211,7 @@ public struct StatusRowView: View {
let attachments = viewModel.finalStatus.mediaAttachments
if ProcessInfo.processInfo.isMacCatalystApp {
openWindow(value: WindowDestination.mediaViewer(attachments: attachments,
selectedAttachment: attachments[0]))
selectedAttachment: attachments[0]))
} else {
quickLook.prepareFor(selectedMediaAttachment: attachments[0], mediaAttachments: attachments)
}

4
Packages/Status/Sources/Status/Row/Subviews/StatusRowMediaPreviewView.swift
View file

@ -1,10 +1,10 @@
import DesignSystem
import Env
import MediaUI
import Models
import Nuke
import NukeUI
import SwiftUI
import MediaUI
@MainActor
public struct StatusRowMediaPreviewView: View {
@ -29,7 +29,7 @@ public struct StatusRowMediaPreviewView: View {
var availableWidth: CGFloat {
if UIDevice.current.userInterfaceIdiom == .phone &&
(UIDevice.current.orientation == .landscapeLeft || UIDevice.current.orientation == .landscapeRight) || theme.statusDisplayStyle == .medium
(UIDevice.current.orientation == .landscapeLeft || UIDevice.current.orientation == .landscapeRight) || theme.statusDisplayStyle == .medium
{
return sceneDelegate.windowWidth * 0.80
}

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

@ -4,9 +4,9 @@ import Models
import Network
import Shimmer
import Status
import SwiftData
import SwiftUI
import SwiftUIIntrospect
import SwiftData
@MainActor
public struct TimelineView: View {