Skip to content

Commit d2536dc

Browse files
rustamburger-mrustaarustamburger-mrustaa
committed
Merge branch 'origin'
2 parents a55df27 + caa4fc1 commit d2536dc

43 files changed

Lines changed: 269 additions & 208 deletions

File tree

Some content is hidden

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

‎ButtonClickStyle.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'ButtonClickStyle'
11-
s.version = '1.1.0'
12-
s.summary = 'This is a customizable designable button view. Inside layer you can style button, create your own subviews. Choose 9 click animation styles'
11+
s.version = '1.1.1'
12+
s.summary = 'This is a customizable designable button view. Inside layer you can style button, create your own subviews. Choose 15 click animation styles'
1313

1414
# This description is used to generate tags and improve search results.
1515
# * Think: What does it do? Why did you write it? What is the focus?
@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
3232
# s.ios.deployment_target = '14.0'
3333
s.platform = :ios, "14.0"
3434

35-
s.source_files = 'Source/**/*.{swift}'
35+
s.source_files = 'Source/ButtonClickStyle/**/*.{swift}'
3636

3737
# s.resource_bundles = {
3838
# 'ButtonClickStyle' => ['ButtonClickStyle/Assets/*.png']

‎Example/ButtonClickStyle.xcodeproj/project.pbxproj‎

Lines changed: 53 additions & 77 deletions
Large diffs are not rendered by default.

‎Example/ButtonClickStyle.xcodeproj/xcshareddata/xcschemes/ButtonClickStyle-Example.xcscheme‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1320"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
18+
BuildableName = "ButtonClickStyle.app"
19+
BlueprintName = "ButtonClickStyle"
20+
ReferencedContainer = "container:ButtonClickStyle.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "YES"
26+
buildForProfiling = "NO"
27+
buildForArchiving = "NO"
28+
buildForAnalyzing = "YES">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "607FACE41AFB9204008FA782"
32+
BuildableName = "ButtonClickStyle_Tests.xctest"
33+
BlueprintName = "ButtonClickStyle_Tests"
34+
ReferencedContainer = "container:ButtonClickStyle.xcodeproj">
35+
</BuildableReference>
36+
</BuildActionEntry>
37+
</BuildActionEntries>
38+
</BuildAction>
39+
<TestAction
40+
buildConfiguration = "Debug"
41+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
42+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
48+
BuildableName = "ButtonClickStyle.app"
49+
BlueprintName = "ButtonClickStyle"
50+
ReferencedContainer = "container:ButtonClickStyle.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
53+
<Testables>
54+
<TestableReference
55+
skipped = "NO">
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "607FACE41AFB9204008FA782"
59+
BuildableName = "ButtonClickStyle_Tests.xctest"
60+
BlueprintName = "ButtonClickStyle_Tests"
61+
ReferencedContainer = "container:ButtonClickStyle.xcodeproj">
62+
</BuildableReference>
63+
</TestableReference>
64+
</Testables>
65+
</TestAction>
66+
<LaunchAction
67+
buildConfiguration = "Debug"
68+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
69+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
70+
launchStyle = "0"
71+
useCustomWorkingDirectory = "NO"
72+
ignoresPersistentStateOnLaunch = "NO"
73+
debugDocumentVersioning = "YES"
74+
debugServiceExtension = "internal"
75+
allowLocationSimulation = "YES">
76+
<BuildableProductRunnable
77+
runnableDebuggingMode = "0">
78+
<BuildableReference
79+
BuildableIdentifier = "primary"
80+
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
81+
BuildableName = "ButtonClickStyle.app"
82+
BlueprintName = "ButtonClickStyle"
83+
ReferencedContainer = "container:ButtonClickStyle.xcodeproj">
84+
</BuildableReference>
85+
</BuildableProductRunnable>
86+
</LaunchAction>
87+
<ProfileAction
88+
buildConfiguration = "Release"
89+
shouldUseLaunchSchemeArgsEnv = "YES"
90+
savedToolIdentifier = ""
91+
useCustomWorkingDirectory = "NO"
92+
debugDocumentVersioning = "YES">
93+
<BuildableProductRunnable
94+
runnableDebuggingMode = "0">
95+
<BuildableReference
96+
BuildableIdentifier = "primary"
97+
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
98+
BuildableName = "ButtonClickStyle.app"
99+
BlueprintName = "ButtonClickStyle"
100+
ReferencedContainer = "container:ButtonClickStyle.xcodeproj">
101+
</BuildableReference>
102+
</BuildableProductRunnable>
103+
</ProfileAction>
104+
<AnalyzeAction
105+
buildConfiguration = "Debug">
106+
</AnalyzeAction>
107+
<ArchiveAction
108+
buildConfiguration = "Release"
109+
revealArchiveInOrganizer = "YES">
110+
</ArchiveAction>
111+
</Scheme>

‎Example/ButtonClickStyle/ButtonClickStyle+Buttons.swift‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -176,22 +176,6 @@ extension ButtonClick {
176176
]
177177

178178
public static var shortNames: [String] = ButtonClick.Buttons.allCases.map { $0.rawValue }
179-
// public static var shortCases: [ButtonClick.Buttons] = [
180-
// .JustPink,
181-
// .NoShadow,
182-
// .Blue,
183-
// .BuyNow,
184-
// .Download,
185-
// .Delete,
186-
// .Search,
187-
// .Subscribe,
188-
// .Firefox,
189-
// .Google,
190-
// .GrButton,
191-
// .Neomorphism,
192-
// .TestButton,
193-
// .Green,
194-
// ]
195179
}
196180
}
197181

‎Example/ButtonClickStyle/UI/Button/Blue/BlueButtonView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class BlueButtonView: BtnView {
3535
viewAn.widthAnchor.constraint(equalToConstant: fr.width).isActive = true
3636
viewAn.heightAnchor.constraint(equalToConstant: fr.height).isActive = true
3737

38-
self.animation?.removeFromSuperview()
39-
self.animation = viewAn
38+
self.btnClickStyleView?.removeFromSuperview()
39+
self.btnClickStyleView = viewAn
4040

4141

4242
var frr = mainView.frame;frr.origin = .zero;mainView.frame = frr

‎Example/ButtonClickStyle/UI/Button/BorderGreenDark/BorderGreenDarkButtonView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ class BorderGreenDarkButtonView: BtnView {
4646
viewAn.widthAnchor.constraint(equalToConstant: fr.width).isActive = true
4747
viewAn.heightAnchor.constraint(equalToConstant: fr.height).isActive = true
4848

49-
self.animation?.removeFromSuperview()
50-
self.animation = viewAn
49+
self.btnClickStyleView?.removeFromSuperview()
50+
self.btnClickStyleView = viewAn
5151
var frr = mainView.frame;frr.origin = .zero;mainView.frame = frr
5252
}
5353

‎Example/ButtonClickStyle/UI/Button/BuyNow/BuyNowButtonView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ class BuyNowButtonView: BtnView {
3939
viewAn.widthAnchor.constraint(equalToConstant: fr.width).isActive = true
4040
viewAn.heightAnchor.constraint(equalToConstant: fr.height).isActive = true
4141

42-
self.animation?.removeFromSuperview()
43-
self.animation = viewAn
42+
self.btnClickStyleView?.removeFromSuperview()
43+
self.btnClickStyleView = viewAn
4444
var frr = mainView.frame;frr.origin = .zero;mainView.frame = frr
4545
}
4646

‎Example/ButtonClickStyle/UI/Button/Delete/DeleteButtonView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class DeleteButtonView: BtnView {
3535
viewAn.widthAnchor.constraint(equalToConstant: fr.width).isActive = true
3636
viewAn.heightAnchor.constraint(equalToConstant: fr.height).isActive = true
3737

38-
self.animation?.removeFromSuperview()
39-
self.animation = viewAn
38+
self.btnClickStyleView?.removeFromSuperview()
39+
self.btnClickStyleView = viewAn
4040
var frr = mainView.frame;frr.origin = .zero;mainView.frame = frr
4141
}
4242
// firstImageView?.image = state.firstImage

‎Example/ButtonClickStyle/UI/Button/Download/DownloadButtonView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ class DownloadButtonView: BtnView {
5757
viewAn.widthAnchor.constraint(equalToConstant: fr.width).isActive = true
5858
viewAn.heightAnchor.constraint(equalToConstant: fr.height).isActive = true
5959

60-
self.animation?.removeFromSuperview()
61-
self.animation = viewAn
60+
self.btnClickStyleView?.removeFromSuperview()
61+
self.btnClickStyleView = viewAn
6262
var frr = mainView.frame;frr.origin = .zero;mainView.frame = frr
6363
}
6464
mainTitleLabel?.text = state.titleText

‎Example/ButtonClickStyle/UI/Button/Firefox/FirefoxButtonView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ class FirefoxButtonView: BtnView {
4949
viewAn.widthAnchor.constraint(equalToConstant: fr.width).isActive = true
5050
viewAn.heightAnchor.constraint(equalToConstant: fr.height).isActive = true
5151

52-
self.animation?.removeFromSuperview()
53-
self.animation = viewAn
52+
self.btnClickStyleView?.removeFromSuperview()
53+
self.btnClickStyleView = viewAn
5454
var frr = mainView.frame;frr.origin = .zero;mainView.frame = frr
5555
}
5656
titleLabel?.text = state.titleText

0 commit comments

Comments
 (0)