Fix for visionOS + Remove shimmer

2024-12-23 05:19:42 +01:00 · 2024-01-19 08:51:29 +01:00 · 2024-01-19 08:51:29 +01:00 · 709dd79e25
commit 709dd79e25
parent bf7cdc3712
25 changed files with 2 additions and 43 deletions
--- a/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@ -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
--- a/IceCubesApp/App/Tabs/ExploreTab.swift
+++ b/IceCubesApp/App/Tabs/ExploreTab.swift
@ -4,7 +4,6 @@ import Env
 import Explore
 import Models
 import Network
-import Shimmer
 import SwiftUI

@MainActor
--- a/IceCubesApp/App/Tabs/MessagesTab.swift
+++ b/IceCubesApp/App/Tabs/MessagesTab.swift
@ -5,7 +5,6 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Shimmer
 import SwiftUI

@MainActor
--- a/IceCubesApp/App/Tabs/ProfileTab.swift
+++ b/IceCubesApp/App/Tabs/ProfileTab.swift
@ -5,7 +5,6 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Shimmer
 import SwiftUI

@MainActor
--- a/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift
+++ b/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift
@ -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
--- a/IceCubesApp/App/Tabs/Settings/SupportAppView.swift
+++ b/IceCubesApp/App/Tabs/Settings/SupportAppView.swift
@ -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()
  }
 }
--- a/IceCubesApp/App/Tabs/TagGroup/EditTagGroupView.swift
+++ b/IceCubesApp/App/Tabs/TagGroup/EditTagGroupView.swift
@ -5,7 +5,6 @@ import Models
 import Network
 import NukeUI
 import SFSafeSymbols
-import Shimmer
 import SwiftData
 import SwiftUI

--- a/IceCubesApp/App/Tabs/Timeline/AddRemoteTimelineView.swift
+++ b/IceCubesApp/App/Tabs/Timeline/AddRemoteTimelineView.swift
@ -4,7 +4,6 @@ import Env
 import Models
 import Network
 import NukeUI
-import Shimmer
 import SwiftUI

@MainActor
--- a/Packages/Account/Sources/Account/AccountDetailHeaderView.swift
+++ b/Packages/Account/Sources/Account/AccountDetailHeaderView.swift
@ -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)
--- a/Packages/Account/Sources/Account/AccountDetailView.swift
+++ b/Packages/Account/Sources/Account/AccountDetailView.swift
@ -3,7 +3,6 @@ import EmojiText
 import Env
 import Models
 import Network
-import Shimmer
 import StatusKit
 import SwiftUI

--- a/Packages/Account/Sources/Account/AccountsList/AccountsListView.swift
+++ b/Packages/Account/Sources/Account/AccountsList/AccountsListView.swift
@ -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
--- a/Packages/Conversations/Sources/Conversations/List/ConversationsListView.swift
+++ b/Packages/Conversations/Sources/Conversations/List/ConversationsListView.swift
@ -2,7 +2,6 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Shimmer
 import SwiftUI

@MainActor
--- a/Packages/DesignSystem/Package.swift
+++ b/Packages/DesignSystem/Package.swift
@ -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"),
--- a/Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift
+++ b/Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift
@ -2,7 +2,6 @@ import Env
 import Models
 import Nuke
 import NukeUI
-import Shimmer
 import SwiftUI

 struct AccountPopoverView: View {
--- a/Packages/DesignSystem/Sources/DesignSystem/Views/AvatarView.swift
+++ b/Packages/DesignSystem/Sources/DesignSystem/Views/AvatarView.swift
@ -1,7 +1,6 @@
 import Models
 import Nuke
 import NukeUI
-import Shimmer
 import SwiftUI

@MainActor
--- a/Packages/Explore/Sources/Explore/ExploreView.swift
+++ b/Packages/Explore/Sources/Explore/ExploreView.swift
@ -3,7 +3,6 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Shimmer
 import StatusKit
 import SwiftUI

--- a/Packages/Notifications/Sources/Notifications/NotificationsListView.swift
+++ b/Packages/Notifications/Sources/Notifications/NotificationsListView.swift
@ -2,7 +2,6 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Shimmer
 import SwiftUI

@MainActor
--- a/Packages/StatusKit/Sources/StatusKit/Detail/StatusDetailView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Detail/StatusDetailView.swift
@ -2,7 +2,6 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Shimmer
 import SwiftUI

@MainActor
--- a/Packages/StatusKit/Sources/StatusKit/Editor/Components/AccessoryView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Editor/Components/AccessoryView.swift
@ -292,7 +292,6 @@ extension StatusEditor {
                        .fill(Color.gray)
                        .frame(width: 40, height: 40)
                        .accessibility(hidden: true)
-                        .shimmering()
                    }
                  }
                  .onTapGesture {
--- a/Packages/StatusKit/Sources/StatusKit/Editor/Components/MediaEditView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Editor/Components/MediaEditView.swift
@ -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()
                }
              )
            }
--- a/Packages/StatusKit/Sources/StatusKit/List/StatusesListView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/List/StatusesListView.swift
@ -2,7 +2,6 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Shimmer
 import SwiftUI

@MainActor
--- a/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
@ -4,7 +4,6 @@ import Env
 import Foundation
 import Models
 import Network
-import Shimmer
 import SwiftUI

@MainActor
--- a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowCardView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowCardView.swift
@ -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
--- a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowContentView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowContentView.swift
@ -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)
      }

--- a/Packages/Timeline/Sources/Timeline/View/TimelineView.swift
+++ b/Packages/Timeline/Sources/Timeline/View/TimelineView.swift
@ -3,7 +3,6 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Shimmer
 import StatusKit
 import SwiftData
 import SwiftUI