Skip to content

Commit 9a76170

Browse files
authored
Merge pull request #905 from DimensionDev/ios/20250506
Ios/20250506
2 parents de52300 + d7cb6c0 commit 9a76170

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3518
-3882
lines changed

iosApp/iosApp.xcodeproj/project.pbxproj

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
642DED2D2DBF6965006B944C /* FontAwesomeSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 642DED2C2DBF6965006B944C /* FontAwesomeSwiftUI */; };
2525
644C84F82D535D0B00E92D0D /* JXPagingView in Frameworks */ = {isa = PBXBuildFile; productRef = 644C84F72D535D0B00E92D0D /* JXPagingView */; };
2626
64541A902DA3CE5A001208C7 /* Tiercel in Frameworks */ = {isa = PBXBuildFile; productRef = 64541A8F2DA3CE5A001208C7 /* Tiercel */; };
27+
645CC8672DC9FEF600B8CBF6 /* WishKit in Frameworks */ = {isa = PBXBuildFile; productRef = 645CC8662DC9FEF600B8CBF6 /* WishKit */; };
2728
64655C2D2CFD6CA000255488 /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 64655C2C2CFD6CA000255488 /* Debug.xcconfig */; };
2829
6467B2AE2DB109500045DA9A /* SFSymbolKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6467B2AD2DB109500045DA9A /* SFSymbolKit */; };
2930
646CABC52DAE876C00B9EA6F /* ExyteChat in Frameworks */ = {isa = PBXBuildFile; productRef = 646CABC42DAE876C00B9EA6F /* ExyteChat */; };
@@ -89,6 +90,7 @@
8990
0690507B2CAE634C007FC957 /* Awesome in Frameworks */,
9091
066AD0452B3ACDC1006F28F4 /* Collections in Frameworks */,
9192
067D89772AD25C1700F8F932 /* MarkdownUI in Frameworks */,
93+
645CC8672DC9FEF600B8CBF6 /* WishKit in Frameworks */,
9294
64E208742CF845C2001C64EF /* Kingfisher in Frameworks */,
9395
64FF2E132D2BC4E80046A32B /* Generated in Frameworks */,
9496
066AD0492B3ACDC1006F28F4 /* OrderedCollections in Frameworks */,
@@ -268,6 +270,7 @@
268270
646CABC42DAE876C00B9EA6F /* ExyteChat */,
269271
6467B2AD2DB109500045DA9A /* SFSymbolKit */,
270272
642DED2C2DBF6965006B944C /* FontAwesomeSwiftUI */,
273+
645CC8662DC9FEF600B8CBF6 /* WishKit */,
271274
);
272275
productName = iosApp;
273276
productReference = 7555FF7B242A565900829871 /* Flare.app */;
@@ -326,6 +329,7 @@
326329
646CABC32DAE876C00B9EA6F /* XCRemoteSwiftPackageReference "Chat" */,
327330
6467B2AC2DB109500045DA9A /* XCRemoteSwiftPackageReference "SFSymbolKit" */,
328331
642DED2B2DBF6965006B944C /* XCRemoteSwiftPackageReference "FontAwesomeSwiftUI" */,
332+
645CC8652DC9FEF600B8CBF6 /* XCRemoteSwiftPackageReference "wishkit-ios" */,
329333
);
330334
productRefGroup = 7555FF7C242A565900829871 /* Products */;
331335
projectDirPath = "";
@@ -747,6 +751,14 @@
747751
minimumVersion = 3.2.6;
748752
};
749753
};
754+
645CC8652DC9FEF600B8CBF6 /* XCRemoteSwiftPackageReference "wishkit-ios" */ = {
755+
isa = XCRemoteSwiftPackageReference;
756+
repositoryURL = "https://github.com/wishkit/wishkit-ios.git";
757+
requirement = {
758+
kind = upToNextMajorVersion;
759+
minimumVersion = 4.7.0;
760+
};
761+
};
750762
6467B2AC2DB109500045DA9A /* XCRemoteSwiftPackageReference "SFSymbolKit" */ = {
751763
isa = XCRemoteSwiftPackageReference;
752764
repositoryURL = "https://github.com/Sedlacek-Solutions/SFSymbolKit.git";
@@ -936,6 +948,11 @@
936948
package = 64541A8E2DA3CE5A001208C7 /* XCRemoteSwiftPackageReference "Tiercel" */;
937949
productName = Tiercel;
938950
};
951+
645CC8662DC9FEF600B8CBF6 /* WishKit */ = {
952+
isa = XCSwiftPackageProductDependency;
953+
package = 645CC8652DC9FEF600B8CBF6 /* XCRemoteSwiftPackageReference "wishkit-ios" */;
954+
productName = WishKit;
955+
};
939956
6467B2AD2DB109500045DA9A /* SFSymbolKit */ = {
940957
isa = XCSwiftPackageProductDependency;
941958
package = 6467B2AC2DB109500045DA9A /* XCRemoteSwiftPackageReference "SFSymbolKit" */;

iosApp/iosApp/AppDelegate.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import FirebaseCore
22
import SwiftUI
33
import Tiercel
4+
import WishKit
45

56
#if os(iOS)
67
typealias ApplicationDelegate = UIApplicationDelegate
@@ -20,6 +21,7 @@ class AppDelegate: NSObject, ApplicationDelegate {
2021
// FirebaseApp.configure()
2122
// DownloadManager初始化
2223
_ = DownloadManager.shared
24+
WishKit.configure(with: "8B16D016-FC6D-4DEB-8FC5-91E6A7C46A5C")
2325
return true
2426
}
2527

iosApp/iosApp/FlareApp.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import FontAwesomeSwiftUI
22
import shared
33
import SwiftUI
44

5+
56
@main
67
struct FlareApp: SwiftUI.App {
78
#if os(macOS)
@@ -31,13 +32,12 @@ struct FlareApp: SwiftUI.App {
3132

3233
var body: some Scene {
3334
WindowGroup {
34-
3535
ZStack(alignment: .bottom) {
3636
#if os(macOS)
3737
ProvideWindowSizeClass {
3838
FlareRootView()
3939
// .enableInjection()
40-
.preferredColorScheme(.light)
40+
.preferredColorScheme(.light)
4141
}
4242
.handlesExternalEvents(preferring: ["flare"], allowing: ["flare"])
4343
.onOpenURL { url in
@@ -46,18 +46,17 @@ struct FlareApp: SwiftUI.App {
4646
#else
4747
FlareRootView()
4848
// .enableInjection()
49-
// .preferredColorScheme(.light)
49+
// .preferredColorScheme(.light)
5050
.onOpenURL { url in
5151
router.handleDeepLink(url)
5252
}
5353
.environmentObject(router)
5454
#endif
5555

5656
// --- Global Floating Player Overlay ---
57-
if podcastManager.currentPodcast != nil {
57+
if podcastManager.currentPodcast != nil {
5858
DraggablePlayerOverlay().animation(.spring(), value: podcastManager.currentPodcast?.id)
5959
}
60-
6160
}
6261
}
6362
#if os(macOS)

0 commit comments

Comments
 (0)