Fix for visionOS + Remove shimmer

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

View File

@ -116,15 +116,6 @@
"revision" : "9e1cc02a65b22e09a8251261cccbccce02731fc5",
"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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -19,7 +19,6 @@ let package = Package(
dependencies: [
.package(name: "Models", path: "../Models"),
.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/divadretlaw/EmojiText", from: "3.2.1"),
],
@ -29,7 +28,6 @@ let package = Package(
dependencies: [
.product(name: "Models", package: "Models"),
.product(name: "Env", package: "Env"),
.product(name: "Shimmer", package: "SwiftUI-Shimmer"),
.product(name: "NukeUI", package: "Nuke"),
.product(name: "Nuke", package: "Nuke"),
.product(name: "EmojiText", package: "EmojiText"),

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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