mirrors
/
ProHUD
mirror of https://github.com/xaoxuu/ProHUD
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

代码优化

This commit is contained in:
xaoxuu 2023-08-07 13:19:31 +08:00
parent b53a09ad75
commit 1d4465b496
3 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
PHDemo/PHDemo.xcodeproj/project.pbxproj
View File

@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 60; objectVersion = 55;
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
@ -12,6 +12,7 @@
CD6537C328C35E6200A5981B /* ToastVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6537C228C35E6200A5981B /* ToastVC.swift */; }; CD6537C328C35E6200A5981B /* ToastVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6537C228C35E6200A5981B /* ToastVC.swift */; };
CD6537C528C35F2C00A5981B /* SheetVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6537C428C35F2C00A5981B /* SheetVC.swift */; }; CD6537C528C35F2C00A5981B /* SheetVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6537C428C35F2C00A5981B /* SheetVC.swift */; };
CD6AE8A32A7CC1BA0044E53D /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = CD6AE8A22A7CC1BA0044E53D /* SnapKit */; }; CD6AE8A32A7CC1BA0044E53D /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = CD6AE8A22A7CC1BA0044E53D /* SnapKit */; };
CD891BCD2A80B58E00848BBC /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = CD891BCC2A80B58E00848BBC /* SnapKit */; };
CD8EEF3B28BC5C7200E660EA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD8EEF3A28BC5C7200E660EA /* AppDelegate.swift */; }; CD8EEF3B28BC5C7200E660EA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD8EEF3A28BC5C7200E660EA /* AppDelegate.swift */; };
CD8EEF3D28BC5C7200E660EA /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD8EEF3C28BC5C7200E660EA /* SceneDelegate.swift */; }; CD8EEF3D28BC5C7200E660EA /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD8EEF3C28BC5C7200E660EA /* SceneDelegate.swift */; };
CD8EEF4228BC5C7200E660EA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CD8EEF4028BC5C7200E660EA /* Main.storyboard */; }; CD8EEF4228BC5C7200E660EA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CD8EEF4028BC5C7200E660EA /* Main.storyboard */; };
@ -46,6 +47,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
CD891BCD2A80B58E00848BBC /* SnapKit in Frameworks */,
CDB6A2A228BC5F4600DEC80D /* ProHUD in Frameworks */, CDB6A2A228BC5F4600DEC80D /* ProHUD in Frameworks */,
CD6AE8A32A7CC1BA0044E53D /* SnapKit in Frameworks */, CD6AE8A32A7CC1BA0044E53D /* SnapKit in Frameworks */,
); );
@ -126,6 +128,7 @@
packageProductDependencies = ( packageProductDependencies = (
CDB6A2A128BC5F4600DEC80D /* ProHUD */, CDB6A2A128BC5F4600DEC80D /* ProHUD */,
CD6AE8A22A7CC1BA0044E53D /* SnapKit */, CD6AE8A22A7CC1BA0044E53D /* SnapKit */,
CD891BCC2A80B58E00848BBC /* SnapKit */,
); );
productName = PHDemo; productName = PHDemo;
productReference = CD8EEF3728BC5C7200E660EA /* PHDemo.app */; productReference = CD8EEF3728BC5C7200E660EA /* PHDemo.app */;
@ -156,7 +159,7 @@
); );
mainGroup = CD8EEF2E28BC5C7200E660EA; mainGroup = CD8EEF2E28BC5C7200E660EA;
packageReferences = ( packageReferences = (
CD6AE8A12A7CC1BA0044E53D /* XCLocalSwiftPackageReference "../../SnapKit" */, CD891BCB2A80B58E00848BBC /* XCRemoteSwiftPackageReference "SnapKit" */,
); );
productRefGroup = CD8EEF3828BC5C7200E660EA /* Products */; productRefGroup = CD8EEF3828BC5C7200E660EA /* Products */;
projectDirPath = ""; projectDirPath = "";
@ -414,18 +417,27 @@
}; };
/* End XCConfigurationList section */ /* End XCConfigurationList section */
/* Begin XCLocalSwiftPackageReference section */ /* Begin XCRemoteSwiftPackageReference section */
CD6AE8A12A7CC1BA0044E53D /* XCLocalSwiftPackageReference "../../SnapKit" */ = { CD891BCB2A80B58E00848BBC /* XCRemoteSwiftPackageReference "SnapKit" */ = {
isa = XCLocalSwiftPackageReference; isa = XCRemoteSwiftPackageReference;
relativePath = ../../SnapKit; repositoryURL = "https://git.xaox.cc/mirrors/SnapKit.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 5.6.0;
}; };
/* End XCLocalSwiftPackageReference section */ };
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */ /* Begin XCSwiftPackageProductDependency section */
CD6AE8A22A7CC1BA0044E53D /* SnapKit */ = { CD6AE8A22A7CC1BA0044E53D /* SnapKit */ = {
isa = XCSwiftPackageProductDependency; isa = XCSwiftPackageProductDependency;
productName = SnapKit; productName = SnapKit;
}; };
CD891BCC2A80B58E00848BBC /* SnapKit */ = {
isa = XCSwiftPackageProductDependency;
package = CD891BCB2A80B58E00848BBC /* XCRemoteSwiftPackageReference "SnapKit" */;
productName = SnapKit;
};
CDB6A2A128BC5F4600DEC80D /* ProHUD */ = { CDB6A2A128BC5F4600DEC80D /* ProHUD */ = {
isa = XCSwiftPackageProductDependency; isa = XCSwiftPackageProductDependency;
productName = ProHUD; productName = ProHUD;

14
PHDemo/PHDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved Normal file
View File

@ -0,0 +1,14 @@
{
"pins" : [
{
"identity" : "snapkit",
"kind" : "remoteSourceControl",
"location" : "https://git.xaox.cc/mirrors/SnapKit.git",
"state" : {
"revision" : "f222cbdf325885926566172f6f5f06af95473158",
"version" : "5.6.0"
}
}
],
"version" : 2
}

2
Sources/ProHUD/Toast/ToastWindow.swift
View File

@ -128,7 +128,7 @@ fileprivate extension ToastWindow {
let config = window.toast.config let config = window.toast.config
var y = window.frame.origin.y var y = window.frame.origin.y
if i == 0 { if i == 0 {
y = max(AppContext.appWindow?.layoutMargins.top ?? config.margin, config.margin) y = max(AppContext.appWindow?.safeAreaInsets.top ?? config.margin, config.margin)
} else { } else {
if i - 1 < windows.count && i > 0 { if i - 1 < windows.count && i > 0 {
y = config.margin + windows[i-1].frame.maxY y = config.margin + windows[i-1].frame.maxY