mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2025-02-18 02:35:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for visionOS + Remove shimmer

Browse source
This commit is contained in:
Thomas Ricouard 2024-01-19 08:51:29 +01:00
parent bf7cdc3712
commit 709dd79e25
25 changed files with 2 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file

@ -116,15 +116,6 @@
"revision" : "9e1cc02a65b22e09a8251261cccbccce02731fc5", "revision" : "9e1cc02a65b22e09a8251261cccbccce02731fc5",
"version" : "1.1.1" "version" : "1.1.1"
} }
},
{
"identity" : "swiftui-shimmer",
"kind" : "remoteSourceControl",
"location" : "https://github.com/markiv/SwiftUI-Shimmer",
"state" : {
"revision" : "965a7cbcbf094cbcf22b9251a2323bdc3432e171",
"version" : "1.1.0"
}
} }
], ],
"version" : 2 "version" : 2

1
IceCubesApp/App/Tabs/ExploreTab.swift
View file

@ -4,7 +4,6 @@ import Env
import Explore import Explore
import Models import Models
import Network import Network
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor

1
IceCubesApp/App/Tabs/MessagesTab.swift
View file

@ -5,7 +5,6 @@ import DesignSystem
import Env import Env
import Models import Models
import Network import Network
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor

1
IceCubesApp/App/Tabs/ProfileTab.swift
View file

@ -5,7 +5,6 @@ import DesignSystem
import Env import Env
import Models import Models
import Network import Network
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor

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

@ -6,7 +6,6 @@ import Models
import Network import Network
import NukeUI import NukeUI
import SafariServices import SafariServices
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor
@ -265,7 +264,6 @@ struct AddAccountView: View {
} }
.redacted(reason: .placeholder) .redacted(reason: .placeholder)
.allowsHitTesting(false) .allowsHitTesting(false)
.shimmering()
#if !os(visionOS) #if !os(visionOS)
.listRowBackground(theme.primaryBackgroundColor) .listRowBackground(theme.primaryBackgroundColor)
#endif #endif

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

@ -1,7 +1,6 @@
import DesignSystem import DesignSystem
import Env import Env
import RevenueCat import RevenueCat
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor
@ -280,6 +279,5 @@ struct SupportAppView: View {
} }
.redacted(reason: .placeholder) .redacted(reason: .placeholder)
.allowsHitTesting(false) .allowsHitTesting(false)
.shimmering()
} }
} }

1
IceCubesApp/App/Tabs/TagGroup/EditTagGroupView.swift
View file

@ -5,7 +5,6 @@ import Models
import Network import Network
import NukeUI import NukeUI
import SFSafeSymbols import SFSafeSymbols
import Shimmer
import SwiftData import SwiftData
import SwiftUI import SwiftUI

1
IceCubesApp/App/Tabs/Timeline/AddRemoteTimelineView.swift
View file

@ -4,7 +4,6 @@ import Env
import Models import Models
import Network import Network
import NukeUI import NukeUI
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor

5
Packages/Account/Sources/Account/AccountDetailHeaderView.swift
View file

@ -3,7 +3,6 @@ import EmojiText
import Env import Env
import Models import Models
import NukeUI import NukeUI
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor
@ -62,10 +61,6 @@ struct AccountDetailHeaderView: View {
.overlay(account.haveHeader ? .black.opacity(0.50) : .clear) .overlay(account.haveHeader ? .black.opacity(0.50) : .clear)
.frame(height: Constants.headerHeight) .frame(height: Constants.headerHeight)
.clipped() .clipped()
} else if state.isLoading {
theme.secondaryBackgroundColor
.frame(height: Constants.headerHeight)
.shimmering()
} else { } else {
theme.secondaryBackgroundColor theme.secondaryBackgroundColor
.frame(height: Constants.headerHeight) .frame(height: Constants.headerHeight)

1
Packages/Account/Sources/Account/AccountDetailView.swift
View file

@ -3,7 +3,6 @@ import EmojiText
import Env import Env
import Models import Models
import Network import Network
import Shimmer
import StatusKit import StatusKit
import SwiftUI import SwiftUI

2
Packages/Account/Sources/Account/AccountsList/AccountsListView.swift
View file

@ -2,7 +2,6 @@ import DesignSystem
import Env import Env
import Models import Models
import Network import Network
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor
@ -90,7 +89,6 @@ public struct AccountsListView: View {
AccountsListRow(viewModel: .init(account: .placeholder(), relationShip: .placeholder())) AccountsListRow(viewModel: .init(account: .placeholder(), relationShip: .placeholder()))
.redacted(reason: .placeholder) .redacted(reason: .placeholder)
.allowsHitTesting(false) .allowsHitTesting(false)
.shimmering()
#if !os(visionOS) #if !os(visionOS)
.listRowBackground(theme.primaryBackgroundColor) .listRowBackground(theme.primaryBackgroundColor)
#endif #endif

1
Packages/Conversations/Sources/Conversations/List/ConversationsListView.swift
View file

@ -2,7 +2,6 @@ import DesignSystem
import Env import Env
import Models import Models
import Network import Network
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor

2
Packages/DesignSystem/Package.swift
View file

@ -19,7 +19,6 @@ let package = Package(
dependencies: [ dependencies: [
.package(name: "Models", path: "../Models"), .package(name: "Models", path: "../Models"),
.package(name: "Env", path: "../Env"), .package(name: "Env", path: "../Env"),
.package(url: "https://github.com/markiv/SwiftUI-Shimmer", exact: "1.1.0"),
.package(url: "https://github.com/kean/Nuke", from: "12.0.0"), .package(url: "https://github.com/kean/Nuke", from: "12.0.0"),
.package(url: "https://github.com/divadretlaw/EmojiText", from: "3.2.1"), .package(url: "https://github.com/divadretlaw/EmojiText", from: "3.2.1"),
], ],
@ -29,7 +28,6 @@ let package = Package(
dependencies: [ dependencies: [
.product(name: "Models", package: "Models"), .product(name: "Models", package: "Models"),
.product(name: "Env", package: "Env"), .product(name: "Env", package: "Env"),
.product(name: "Shimmer", package: "SwiftUI-Shimmer"),
.product(name: "NukeUI", package: "Nuke"), .product(name: "NukeUI", package: "Nuke"),
.product(name: "Nuke", package: "Nuke"), .product(name: "Nuke", package: "Nuke"),
.product(name: "EmojiText", package: "EmojiText"), .product(name: "EmojiText", package: "EmojiText"),

1
Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift
View file

@ -2,7 +2,6 @@ import Env
import Models import Models
import Nuke import Nuke
import NukeUI import NukeUI
import Shimmer
import SwiftUI import SwiftUI
struct AccountPopoverView: View { struct AccountPopoverView: View {

1
Packages/DesignSystem/Sources/DesignSystem/Views/AvatarView.swift
View file

@ -1,7 +1,6 @@
import Models import Models
import Nuke import Nuke
import NukeUI import NukeUI
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor

1
Packages/Explore/Sources/Explore/ExploreView.swift
View file

@ -3,7 +3,6 @@ import DesignSystem
import Env import Env
import Models import Models
import Network import Network
import Shimmer
import StatusKit import StatusKit
import SwiftUI import SwiftUI

1
Packages/Notifications/Sources/Notifications/NotificationsListView.swift
View file

@ -2,7 +2,6 @@ import DesignSystem
import Env import Env
import Models import Models
import Network import Network
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor

1
Packages/StatusKit/Sources/StatusKit/Detail/StatusDetailView.swift
View file

@ -2,7 +2,6 @@ import DesignSystem
import Env import Env
import Models import Models
import Network import Network
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor

1
Packages/StatusKit/Sources/StatusKit/Editor/Components/AccessoryView.swift
View file

@ -292,7 +292,6 @@ extension StatusEditor {
.fill(Color.gray) .fill(Color.gray)
.frame(width: 40, height: 40) .frame(width: 40, height: 40)
.accessibility(hidden: true) .accessibility(hidden: true)
.shimmering()
} }
} }
.onTapGesture { .onTapGesture {

2
Packages/StatusKit/Sources/StatusKit/Editor/Components/MediaEditView.swift
View file

@ -2,7 +2,6 @@ import DesignSystem
import Env import Env
import Models import Models
import Network import Network
import Shimmer
import SwiftUI import SwiftUI
extension StatusEditor { extension StatusEditor {
@ -54,7 +53,6 @@ extension StatusEditor {
RoundedRectangle(cornerRadius: 8) RoundedRectangle(cornerRadius: 8)
.fill(Color.gray) .fill(Color.gray)
.frame(height: 200) .frame(height: 200)
.shimmering()
} }
) )
} }

1
Packages/StatusKit/Sources/StatusKit/List/StatusesListView.swift
View file

@ -2,7 +2,6 @@ import DesignSystem
import Env import Env
import Models import Models
import Network import Network
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor

1
Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
View file

@ -4,7 +4,6 @@ import Env
import Foundation import Foundation
import Models import Models
import Network import Network
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor

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

@ -2,7 +2,6 @@ import DesignSystem
import Models import Models
import Nuke import Nuke
import NukeUI import NukeUI
import Shimmer
import SwiftUI import SwiftUI
@MainActor @MainActor
@ -60,7 +59,8 @@ public struct StatusRowCardView: View {
.frame(maxWidth: maxWidth) .frame(maxWidth: maxWidth)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
#if os(visionOS) #if os(visionOS)
.background(Material.thick) .background(.background)
.hoverEffect()
#else #else
.background(theme.secondaryBackgroundColor) .background(theme.secondaryBackgroundColor)
#endif #endif

1
Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowContentView.swift
View file

@ -36,7 +36,6 @@ struct StatusRowContentView: View {
routerPath: viewModel.routerPath) routerPath: viewModel.routerPath)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.redacted(reason: viewModel.isEmbedLoading ? .placeholder : []) .redacted(reason: viewModel.isEmbedLoading ? .placeholder : [])
.shimmering(active: viewModel.isEmbedLoading)
.transition(.opacity) .transition(.opacity)
} }

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

@ -3,7 +3,6 @@ import DesignSystem
import Env import Env
import Models import Models
import Network import Network
import Shimmer
import StatusKit import StatusKit
import SwiftData import SwiftData
import SwiftUI import SwiftUI