diff --git a/Assets/Icons.sketch b/Assets/Icons.sketch index 21b194f..06d2968 100644 Binary files a/Assets/Icons.sketch and b/Assets/Icons.sketch differ diff --git a/Example-Old/Example/Assets.xcassets/alert.buy.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/alert.buy.imageset/Contents.json index 50c90e6..2d05199 100644 --- a/Example-Old/Example/Assets.xcassets/alert.buy.imageset/Contents.json +++ b/Example-Old/Example/Assets.xcassets/alert.buy.imageset/Contents.json @@ -5,18 +5,18 @@ "scale" : "1x" }, { - "idiom" : "universal", "filename" : "ProHUDBuy@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "ProHUDBuy@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Example-Old/Example/Assets.xcassets/icloud.and.arrow.down.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/icloud.and.arrow.down.imageset/Contents.json index 289614e..858a480 100644 --- a/Example-Old/Example/Assets.xcassets/icloud.and.arrow.down.imageset/Contents.json +++ b/Example-Old/Example/Assets.xcassets/icloud.and.arrow.down.imageset/Contents.json @@ -5,21 +5,21 @@ "scale" : "1x" }, { - "idiom" : "universal", "filename" : "cloud download (2).png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "cloud download (3).png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Example-Old/Example/Assets.xcassets/prohud.candy.imageset/prohud.candy@2x.png b/Example-Old/Example/Assets.xcassets/prohud.candy.imageset/prohud.candy@2x.png deleted file mode 100644 index 5aaa172..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.candy.imageset/prohud.candy@2x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.candy.imageset/prohud.candy@3x.png b/Example-Old/Example/Assets.xcassets/prohud.candy.imageset/prohud.candy@3x.png deleted file mode 100644 index d73fcd4..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.candy.imageset/prohud.candy@3x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.candy.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/Contents.json similarity index 72% rename from Example-Old/Example/Assets.xcassets/prohud.candy.imageset/Contents.json rename to Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/Contents.json index a26cc9e..266990e 100644 --- a/Example-Old/Example/Assets.xcassets/prohud.candy.imageset/Contents.json +++ b/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "prohud.candy@2x.png", + "filename" : "prohud.rainbow.circle@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "prohud.candy@3x.png", + "filename" : "prohud.rainbow.circle@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@2x.png b/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@2x.png new file mode 100644 index 0000000..51fdd40 Binary files /dev/null and b/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@2x.png differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@3x.png b/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@3x.png new file mode 100644 index 0000000..d6d457b Binary files /dev/null and b/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@3x.png differ diff --git a/Example-Old/Example/Base.lproj/Main.storyboard b/Example-Old/Example/Base.lproj/Main.storyboard index bf313f0..777722c 100644 --- a/Example-Old/Example/Base.lproj/Main.storyboard +++ b/Example-Old/Example/Base.lproj/Main.storyboard @@ -15,13 +15,6 @@ - - - @@ -50,7 +43,4 @@ - - - diff --git a/Example-Old/Example/TestToastVC.swift b/Example-Old/Example/TestToastVC.swift index 5a78a12..736380d 100644 --- a/Example-Old/Example/TestToastVC.swift +++ b/Example-Old/Example/TestToastVC.swift @@ -30,7 +30,8 @@ class TestToastVC: BaseListVC { "测试较长的标题和内容", "测试特别长的标题和内容", "测试只有title", - "测试只有message"] + "测试只有message", + "自定义旋转的图片"] } override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { @@ -145,14 +146,27 @@ class TestToastVC: BaseListVC { } } } else if row == 12 { - Toast.push() { (a) in - a.update { (vm) in - vm.scene = .warning - vm.message = "正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过" - - } - } - } + Toast.push() { (a) in + a.update { (vm) in + vm.scene = .warning + vm.message = "正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过" + + } + } + } else if row == 13 { + + Toast.push(scene: .privacy, title: "正在授权", message: "请稍等片刻") { (t) in + t.identifier = "loading" + let imgv = UIImageView(image: UIImage(named: "prohud.rainbow.circle")) + t.imageView.addSubview(imgv) + imgv.snp.makeConstraints { (mk) in + mk.center.equalToSuperview() + mk.width.height.equalTo(18) + } + t.rotate(imgv.layer, speed: 4) + } + simulateSync() + } } func simulateSync() { diff --git a/Source/HUDController.swift b/Source/HUDController.swift index 2819f19..358d0fe 100644 --- a/Source/HUDController.swift +++ b/Source/HUDController.swift @@ -116,7 +116,7 @@ public protocol RotateAnimation: HUDController { public extension RotateAnimation { - func rotate(_ layer: CALayer? = nil, direction: ProHUD.RotateDirection = .clockwise, speed: CFTimeInterval = 1) { + func rotate(_ layer: CALayer? = nil, direction: ProHUD.RotateDirection = .clockwise, speed: CFTimeInterval = 2) { DispatchQueue.main.async { let l = layer ?? self.imageView.layer self.animateLayer = l diff --git a/Source/ProHUD.swift b/Source/ProHUD.swift index a47a974..ce983c8 100644 --- a/Source/ProHUD.swift +++ b/Source/ProHUD.swift @@ -53,7 +53,7 @@ public extension ProHUD.Scene { var scene = ProHUD.Scene.init(identifier: "loading") scene.alertDuration = 0 scene.toastDuration = 0 - scene.image = ProHUD.image(named: "prohud.candy") + scene.image = ProHUD.image(named: "prohud.rainbow.circle") return scene } static var success: ProHUD.Scene { diff --git a/Source/ProHUD.xcassets/prohud.candy.imageset/prohud.candy@2x.png b/Source/ProHUD.xcassets/prohud.candy.imageset/prohud.candy@2x.png deleted file mode 100644 index 5aaa172..0000000 Binary files a/Source/ProHUD.xcassets/prohud.candy.imageset/prohud.candy@2x.png and /dev/null differ diff --git a/Source/ProHUD.xcassets/prohud.candy.imageset/prohud.candy@3x.png b/Source/ProHUD.xcassets/prohud.candy.imageset/prohud.candy@3x.png deleted file mode 100644 index d73fcd4..0000000 Binary files a/Source/ProHUD.xcassets/prohud.candy.imageset/prohud.candy@3x.png and /dev/null differ diff --git a/Source/ProHUD.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@2x.png b/Source/ProHUD.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@2x.png index 58c2599..d84bf63 100644 Binary files a/Source/ProHUD.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@2x.png and b/Source/ProHUD.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@2x.png differ diff --git a/Source/ProHUD.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@3x.png b/Source/ProHUD.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@3x.png index 7b0f441..80e07cb 100644 Binary files a/Source/ProHUD.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@3x.png and b/Source/ProHUD.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@3x.png differ diff --git a/Source/ProHUD.xcassets/prohud.privacy.imageset/prohud.privacy@2x.png b/Source/ProHUD.xcassets/prohud.privacy.imageset/prohud.privacy@2x.png index 3222719..cbd1022 100644 Binary files a/Source/ProHUD.xcassets/prohud.privacy.imageset/prohud.privacy@2x.png and b/Source/ProHUD.xcassets/prohud.privacy.imageset/prohud.privacy@2x.png differ diff --git a/Source/ProHUD.xcassets/prohud.privacy.imageset/prohud.privacy@3x.png b/Source/ProHUD.xcassets/prohud.privacy.imageset/prohud.privacy@3x.png index 90d68e0..1b42f67 100644 Binary files a/Source/ProHUD.xcassets/prohud.privacy.imageset/prohud.privacy@3x.png and b/Source/ProHUD.xcassets/prohud.privacy.imageset/prohud.privacy@3x.png differ diff --git a/Source/ProHUD.xcassets/prohud.candy.imageset/Contents.json b/Source/ProHUD.xcassets/prohud.rainbow.circle.imageset/Contents.json similarity index 72% rename from Source/ProHUD.xcassets/prohud.candy.imageset/Contents.json rename to Source/ProHUD.xcassets/prohud.rainbow.circle.imageset/Contents.json index a26cc9e..266990e 100644 --- a/Source/ProHUD.xcassets/prohud.candy.imageset/Contents.json +++ b/Source/ProHUD.xcassets/prohud.rainbow.circle.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "prohud.candy@2x.png", + "filename" : "prohud.rainbow.circle@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "prohud.candy@3x.png", + "filename" : "prohud.rainbow.circle@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Source/ProHUD.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@2x.png b/Source/ProHUD.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@2x.png new file mode 100644 index 0000000..51fdd40 Binary files /dev/null and b/Source/ProHUD.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@2x.png differ diff --git a/Source/ProHUD.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@3x.png b/Source/ProHUD.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@3x.png new file mode 100644 index 0000000..d6d457b Binary files /dev/null and b/Source/ProHUD.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@3x.png differ diff --git a/Source/ProHUD.xcassets/prohud.trash.imageset/prohud.trash@2x.png b/Source/ProHUD.xcassets/prohud.trash.imageset/prohud.trash@2x.png index 076adfa..25fb085 100644 Binary files a/Source/ProHUD.xcassets/prohud.trash.imageset/prohud.trash@2x.png and b/Source/ProHUD.xcassets/prohud.trash.imageset/prohud.trash@2x.png differ diff --git a/Source/ProHUD.xcassets/prohud.trash.imageset/prohud.trash@3x.png b/Source/ProHUD.xcassets/prohud.trash.imageset/prohud.trash@3x.png index f63d8a2..1411e5e 100644 Binary files a/Source/ProHUD.xcassets/prohud.trash.imageset/prohud.trash@3x.png and b/Source/ProHUD.xcassets/prohud.trash.imageset/prohud.trash@3x.png differ