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

update

This commit is contained in:
xaoxuu 2019-08-05 20:13:17 +08:00
parent d7d4e7d6ee
commit d182b5fede
13 changed files with 141 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Example/Example/ViewController.swift
View File

@ -33,8 +33,8 @@ class ViewController: UIViewController {
// testUpdateAction()
// testGuard()
fastGuard()
testGuard()
// fastGuard()
}
func testDelete() {
@ -86,7 +86,7 @@ class ViewController: UIViewController {
g.add(action: .destructive, title: "测试删除弹窗", action: { [weak self] in
self?.testDelete()
})
g.add(action: .cancel, title: "我知道了")
g.add(action: .cancel, title: "我知道了", action: nil)
g.push(to: self)
debugPrint("test: ", g)
@ -103,9 +103,15 @@ class ViewController: UIViewController {
}
func fastGuard() {
ProHUD.push(guard: self, title: "测试", message: "测试测试").add(action: .cancel, title: "OK", action: {
let g = ProHUD.push(guard: self, title: "测试", message: "测试测试")
g.add(action: .default, title: "默认按钮", action: {
})
g.add(action: .cancel, title: "取消", action: nil)
g.view.backgroundColor = .clear
// g.contentView.backgroundColor = UIColor.white
}

14
Podfile Normal file
View File

@ -0,0 +1,14 @@
platform :ios, '10.0'
use_frameworks!
target 'ProHUD' do
pod 'SnapKit', '4.2.0'
pod 'Inspire', :path => '../Inspire'
end
#pod install --verbose --no-repo-update #安装命令
#pod update --verbose --no-repo-update #更新命令

19
Podfile.lock Normal file
View File

@ -0,0 +1,19 @@
PODS:
- Inspire (1.0.5)
- SnapKit (4.2.0)
DEPENDENCIES:
- Inspire (from `../Inspire`)
- SnapKit (= 4.2.0)
EXTERNAL SOURCES:
Inspire:
:path: ../Inspire
SPEC CHECKSUMS:
Inspire: a213962fa02d0c4b8e27e389318ff4b47e4565ed
SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
PODFILE CHECKSUM: aacd299b22fe3d0cf28b81c1e2931b02b66a7963
COCOAPODS: 1.3.1

72
ProHUD.xcodeproj/project.pbxproj
View File

@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
1AE9C44ABAF3F797A5518CE8 /* Pods_ProHUD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2011798511AD590A613E54E /* Pods_ProHUD.framework */; };
CD16490B22EF09AB0077988C /* AlertModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD16490A22EF09AB0077988C /* AlertModel.swift */; };
CD16490D22EF09B40077988C /* AlertConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD16490C22EF09B40077988C /* AlertConfig.swift */; };
CD16490F22EF09D50077988C /* AlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD16490E22EF09D50077988C /* AlertView.swift */; };
@ -27,6 +28,8 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
3C95FD2F17A45D13E2AB9306 /* Pods-ProHUD.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ProHUD.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ProHUD/Pods-ProHUD.debug.xcconfig"; sourceTree = "<group>"; };
C2011798511AD590A613E54E /* Pods_ProHUD.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ProHUD.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CD16490A22EF09AB0077988C /* AlertModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertModel.swift; sourceTree = "<group>"; };
CD16490C22EF09B40077988C /* AlertConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertConfig.swift; sourceTree = "<group>"; };
CD16490E22EF09D50077988C /* AlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertView.swift; sourceTree = "<group>"; };
@ -47,6 +50,7 @@
CD95D26A22E72DB3007559A3 /* ProHUD.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProHUD.swift; sourceTree = "<group>"; };
CDB6A07A22EEF06500AF6CF0 /* HUDController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HUDController.swift; sourceTree = "<group>"; };
CDB6A07C22EEF19D00AF6CF0 /* HUDConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HUDConfig.swift; sourceTree = "<group>"; };
DC31EBFAC56868D6096A233A /* Pods-ProHUD.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ProHUD.release.xcconfig"; path = "Pods/Target Support Files/Pods-ProHUD/Pods-ProHUD.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -54,12 +58,30 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1AE9C44ABAF3F797A5518CE8 /* Pods_ProHUD.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
33E080A4BE17176DF10FFA89 /* Pods */ = {
isa = PBXGroup;
children = (
3C95FD2F17A45D13E2AB9306 /* Pods-ProHUD.debug.xcconfig */,
DC31EBFAC56868D6096A233A /* Pods-ProHUD.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
BA9A12AB2B7D4F5C9A8C773C /* Frameworks */ = {
isa = PBXGroup;
children = (
C2011798511AD590A613E54E /* Pods_ProHUD.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
CD16491022EF0A4B0077988C /* Alert */ = {
isa = PBXGroup;
children = (
@ -98,6 +120,8 @@
CD95D26722E72D68007559A3 /* ProHUD.podspec */,
CD95D21E22E72C4C007559A3 /* ProHUD */,
CD95D21D22E72C4C007559A3 /* Products */,
33E080A4BE17176DF10FFA89 /* Pods */,
BA9A12AB2B7D4F5C9A8C773C /* Frameworks */,
);
sourceTree = "<group>";
};
@ -144,10 +168,12 @@
isa = PBXNativeTarget;
buildConfigurationList = CD95D22422E72C4C007559A3 /* Build configuration list for PBXNativeTarget "ProHUD" */;
buildPhases = (
A54F2DB69A2889EF6E75A3EC /* [CP] Check Pods Manifest.lock */,
CD95D21722E72C4C007559A3 /* Headers */,
CD95D21822E72C4C007559A3 /* Sources */,
CD95D21922E72C4C007559A3 /* Frameworks */,
CD95D21A22E72C4C007559A3 /* Resources */,
8C88ED8CC1E8972268375748 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
@ -202,6 +228,50 @@
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
8C88ED8CC1E8972268375748 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ProHUD/Pods-ProHUD-resources.sh\"\n";
showEnvVarsInLog = 0;
};
A54F2DB69A2889EF6E75A3EC /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-ProHUD-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
CD95D21822E72C4C007559A3 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@ -350,6 +420,7 @@
};
CD95D22522E72C4C007559A3 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 3C95FD2F17A45D13E2AB9306 /* Pods-ProHUD.debug.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
@ -376,6 +447,7 @@
};
CD95D22622E72C4C007559A3 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC31EBFAC56868D6096A233A /* Pods-ProHUD.release.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;

10
ProHUD.xcworkspace/contents.xcworkspacedata generated Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "group:ProHUD.xcodeproj">
</FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
</Workspace>

8
ProHUD.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

2
ProHUD/Alert/AlertModel.swift
View File

@ -6,6 +6,8 @@
// Copyright © 2019 Titan Studio. All rights reserved.
//
import UIKit
public extension ProHUD.Alert {
enum Scene {
/// 默认场景

2
ProHUD/Guard/GuardController.swift
View File

@ -160,7 +160,7 @@ public extension ProHUD.Guard {
/// - Parameter style: 样式
/// - Parameter title: 标题
/// - Parameter action: 事件
@discardableResult func add(action style: UIAlertAction.Style, title: String?, action: (() -> Void)? = nil) -> UIButton {
@discardableResult func add(action style: UIAlertAction.Style, title: String?, action: (() -> Void)?) -> UIButton {
let btn = Button.actionButton(title: title)
btn.titleLabel?.font = cfg.guard.buttonFont
if actionStack.superview == nil {

1
ProHUD/HUDConfig.swift
View File

@ -67,6 +67,7 @@ public extension ProHUD {
}
}
/// 配置
internal var cfg = ProHUD.Configuration()
public extension ProHUD {

24
ProHUD/HUDView.swift
View File

@ -10,29 +10,6 @@ import UIKit
public extension ProHUD {
class ToastWindow: UIWindow {
var deviceOrientationDidChangeCallback: (() -> Void)?
public override init(frame: CGRect) {
super.init(frame: frame)
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
@objc func deviceOrientationDidChange(_ notification: Notification){
DispatchQueue.main.asyncAfter(deadline: .now()+0.5) {
self.deviceOrientationDidChangeCallback?()
}
}
}
class StackContainer: UIStackView {
public override init(frame: CGRect) {
@ -52,7 +29,6 @@ public extension ProHUD {
class BlurView: UIVisualEffectView {
init() {
if #available(iOS 13.0, *) {

1
ProHUD/ProHUD.swift
View File

@ -37,6 +37,7 @@ internal extension ProHUD {
}
return b
}
/// 获取Image
static func image(named: String) -> UIImage? {
return UIImage.init(named: named, in: bundle, compatibleWith: nil)

2
ProHUD/Toast/ToastController.swift
View File

@ -225,7 +225,7 @@ public extension ProHUD {
let config = cfg.toast
let isNew: Bool
if toast.window == nil {
let w = ToastWindow(frame: .zero)
let w = UIWindow(frame: .zero)
toast.window = w
w.windowLevel = UIWindow.Level(5000)
w.backgroundColor = .clear

2
ProHUD/Toast/ToastModel.swift
View File

@ -6,6 +6,8 @@
// Copyright © 2019 Titan Studio. All rights reserved.
//
import UIKit
public extension ProHUD.Toast {
enum Scene {
/// 默认场景