Skip to content

Commit 64cd97a

Browse files
rustamburger-mrustaarustamburger-mrustaa
committed
Merge branch 'origin'
# Conflicts: # Example/ButtonClickStyle.xcodeproj/project.pbxproj
2 parents e85eb52 + bcc1efb commit 64cd97a

File tree

4 files changed

+38
-91
lines changed

4 files changed

+38
-91
lines changed

‎ButtonClickStyle.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/ButtonClickStyle/**/*.{swift}'
35+
s.source_files = 'Sources/ButtonClickStyle/**/*.{swift}'
3636

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

‎Example/ButtonClickStyle.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -170,30 +170,7 @@
170170
4A85B5BD2803EBFD00DFD435 /* TableAdapterView+DataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TableAdapterView+DataSource.swift"; sourceTree = "<group>"; };
171171
4A85B5BE2803EBFD00DFD435 /* TableAdapterView+ScrollDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TableAdapterView+ScrollDelegate.swift"; sourceTree = "<group>"; };
172172
4A85B5BF2803EBFD00DFD435 /* TableAdapterView+AddRefresh.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TableAdapterView+AddRefresh.swift"; sourceTree = "<group>"; };
173-
4A9B5AAE280B484C0033761B /* ButtonClickStyle */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = ButtonClickStyle; path = ..; sourceTree = "<group>"; };
174-
4A9B5AB2280B48C80033761B /* ButtonClickStyleShort.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonClickStyleShort.swift; sourceTree = "<group>"; };
175-
4A9B5AB3280B48C80033761B /* ButtonClickStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonClickStyle.swift; sourceTree = "<group>"; };
176-
4A9B5AB4280B48C80033761B /* ButtonClickStyleBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonClickStyleBase.swift; sourceTree = "<group>"; };
177-
4A9B5AB5280B48C80033761B /* ButtonClickStyleEmoji.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonClickStyleEmoji.swift; sourceTree = "<group>"; };
178-
4A9B5AB6280B48C80033761B /* ButtonClickStyleAddViewsAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonClickStyleAddViewsAnimation.swift; sourceTree = "<group>"; };
179-
4A9B5AB7280B48C80033761B /* ButtonClickState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonClickState.swift; sourceTree = "<group>"; };
180-
4A9B5AB8280B48C80033761B /* ButtonClickStyleGestureRecognizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonClickStyleGestureRecognizer.swift; sourceTree = "<group>"; };
181-
4A9B5ABA280B48C80033761B /* ButtonClickStyleAnim+UIViewAlpha.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ButtonClickStyleAnim+UIViewAlpha.swift"; sourceTree = "<group>"; };
182-
4A9B5ABB280B48C80033761B /* ButtonClickStyleAnim+UIViewAndroidPulse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ButtonClickStyleAnim+UIViewAndroidPulse.swift"; sourceTree = "<group>"; };
183-
4A9B5ABC280B48C80033761B /* ButtonClickStyleAnim+UIViewShadow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ButtonClickStyleAnim+UIViewShadow.swift"; sourceTree = "<group>"; };
184-
4A9B5ABD280B48C80033761B /* ButtonClickStyleAnim+UIViewColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ButtonClickStyleAnim+UIViewColor.swift"; sourceTree = "<group>"; };
185-
4A9B5ABE280B48C80033761B /* ButtonClickStyleAnim+UIViewColorFlat.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ButtonClickStyleAnim+UIViewColorFlat.swift"; sourceTree = "<group>"; };
186-
4A9B5ABF280B48C80033761B /* ButtonClickStyleAnim+UIViewPulse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ButtonClickStyleAnim+UIViewPulse.swift"; sourceTree = "<group>"; };
187-
4A9B5AC0280B48C80033761B /* ButtonClickStyleAnim+UIViewSnake.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ButtonClickStyleAnim+UIViewSnake.swift"; sourceTree = "<group>"; };
188-
4A9B5AC1280B48C80033761B /* ButtonClickStyleAnim+UIViewFlash.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ButtonClickStyleAnim+UIViewFlash.swift"; sourceTree = "<group>"; };
189-
4A9B5AC2280B48C80033761B /* ButtonClickStyleAnim+UIViewPress.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ButtonClickStyleAnim+UIViewPress.swift"; sourceTree = "<group>"; };
190-
4A9B5AC3280B48C80033761B /* ButtonClickStyleAnim+UIViewPulsate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ButtonClickStyleAnim+UIViewPulsate.swift"; sourceTree = "<group>"; };
191-
4A9B5AC4280B48C80033761B /* ButtonClickStyleAnim+UIViewGlare.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ButtonClickStyleAnim+UIViewGlare.swift"; sourceTree = "<group>"; };
192-
4A9B5AC5280B48C80033761B /* ButtonClickStyleView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonClickStyleView.swift; sourceTree = "<group>"; };
193-
4A9B5AC6280B48C80033761B /* ButtonClick.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonClick.swift; sourceTree = "<group>"; };
194-
4A9B5AC7280B48C80033761B /* ButtonClicClosure.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonClicClosure.swift; sourceTree = "<group>"; };
195-
4A9B5ADE280B48E80033761B /* ButtonClickStyleDesignLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonClickStyleDesignLabel.swift; sourceTree = "<group>"; };
196-
4A9B5ADF280B48E80033761B /* ButtonClickStyleDesignView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonClickStyleDesignView.swift; sourceTree = "<group>"; };
173+
4A9B5AE4280B4E200033761B /* ButtonClickStyle */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ButtonClickStyle; path = ..; sourceTree = "<group>"; };
197174
4ADE26E22803837C00634B6C /* ExampleButtonsViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = ExampleButtonsViewController.storyboard; sourceTree = "<group>"; };
198175
4ADE26E32803837C00634B6C /* ExampleButtonsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExampleButtonsViewController.swift; sourceTree = "<group>"; };
199176
4ADE26E6280383DC00634B6C /* ButtonClickStyle+Buttons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ButtonClickStyle+Buttons.swift"; sourceTree = "<group>"; };
@@ -223,6 +200,31 @@
223200
/* End PBXFrameworksBuildPhase section */
224201

225202
/* Begin PBXGroup section */
203+
4A14CBC12803437C00DA8A68 /* Sources */ = {
204+
isa = PBXGroup;
205+
children = (
206+
4A14CBC22803437C00DA8A68 /* ButtonClickStyle */,
207+
);
208+
name = Sources;
209+
path = ../Sources;
210+
sourceTree = "<group>";
211+
};
212+
4A14CBC22803437C00DA8A68 /* ButtonClickStyle */ = {
213+
isa = PBXGroup;
214+
children = (
215+
4A477AC9280AEE280004156A /* Animations */,
216+
4A477ACA280AEE3D0004156A /* UIDesignable */,
217+
4A477ACB280AEE610004156A /* Style */,
218+
4A14CBCE2803437C00DA8A68 /* ButtonClickStyleAddViewsAnimation.swift */,
219+
4A14CBDA2803437C00DA8A68 /* ButtonClickStyleView.swift */,
220+
4A14CBCC2803437C00DA8A68 /* ButtonClick.swift */,
221+
4A14CBCB2803437C00DA8A68 /* ButtonClickState.swift */,
222+
4A14CBCD2803437C00DA8A68 /* ButtonClicClosure.swift */,
223+
4A14CBC92803437C00DA8A68 /* ButtonClickStyleGestureRecognizer.swift */,
224+
);
225+
path = ButtonClickStyle;
226+
sourceTree = "<group>";
227+
};
226228
4A4545C22806C7570041D039 /* ButtonTableList */ = {
227229
isa = PBXGroup;
228230
children = (
@@ -547,77 +549,14 @@
547549
path = ScreenIPad;
548550
sourceTree = "<group>";
549551
};
550-
4A9B5AAD280B484C0033761B /* Packages */ = {
552+
4A9B5AE3280B4E200033761B /* Packages */ = {
551553
isa = PBXGroup;
552554
children = (
553-
4A9B5AAE280B484C0033761B /* ButtonClickStyle */,
555+
4A9B5AE4280B4E200033761B /* ButtonClickStyle */,
554556
);
555557
name = Packages;
556558
sourceTree = "<group>";
557559
};
558-
4A9B5AAF280B48C80033761B /* Sources */ = {
559-
isa = PBXGroup;
560-
children = (
561-
4A9B5AB0280B48C80033761B /* ButtonClickStyle */,
562-
);
563-
name = Sources;
564-
path = ../Sources;
565-
sourceTree = "<group>";
566-
};
567-
4A9B5AB0280B48C80033761B /* ButtonClickStyle */ = {
568-
isa = PBXGroup;
569-
children = (
570-
4A9B5AB9280B48C80033761B /* Animations */,
571-
4A9B5ADD280B48E80033761B /* UIDesignable */,
572-
4A9B5AB1280B48C80033761B /* Style */,
573-
4A9B5AB6280B48C80033761B /* ButtonClickStyleAddViewsAnimation.swift */,
574-
4A9B5AB7280B48C80033761B /* ButtonClickState.swift */,
575-
4A9B5AB8280B48C80033761B /* ButtonClickStyleGestureRecognizer.swift */,
576-
4A9B5AC5280B48C80033761B /* ButtonClickStyleView.swift */,
577-
4A9B5AC6280B48C80033761B /* ButtonClick.swift */,
578-
4A9B5AC7280B48C80033761B /* ButtonClicClosure.swift */,
579-
);
580-
path = ButtonClickStyle;
581-
sourceTree = "<group>";
582-
};
583-
4A9B5AB1280B48C80033761B /* Style */ = {
584-
isa = PBXGroup;
585-
children = (
586-
4A9B5AB2280B48C80033761B /* ButtonClickStyleShort.swift */,
587-
4A9B5AB3280B48C80033761B /* ButtonClickStyle.swift */,
588-
4A9B5AB4280B48C80033761B /* ButtonClickStyleBase.swift */,
589-
4A9B5AB5280B48C80033761B /* ButtonClickStyleEmoji.swift */,
590-
);
591-
path = Style;
592-
sourceTree = "<group>";
593-
};
594-
4A9B5AB9280B48C80033761B /* Animations */ = {
595-
isa = PBXGroup;
596-
children = (
597-
4A9B5ABA280B48C80033761B /* ButtonClickStyleAnim+UIViewAlpha.swift */,
598-
4A9B5ABB280B48C80033761B /* ButtonClickStyleAnim+UIViewAndroidPulse.swift */,
599-
4A9B5ABC280B48C80033761B /* ButtonClickStyleAnim+UIViewShadow.swift */,
600-
4A9B5ABD280B48C80033761B /* ButtonClickStyleAnim+UIViewColor.swift */,
601-
4A9B5ABE280B48C80033761B /* ButtonClickStyleAnim+UIViewColorFlat.swift */,
602-
4A9B5ABF280B48C80033761B /* ButtonClickStyleAnim+UIViewPulse.swift */,
603-
4A9B5AC0280B48C80033761B /* ButtonClickStyleAnim+UIViewSnake.swift */,
604-
4A9B5AC1280B48C80033761B /* ButtonClickStyleAnim+UIViewFlash.swift */,
605-
4A9B5AC2280B48C80033761B /* ButtonClickStyleAnim+UIViewPress.swift */,
606-
4A9B5AC3280B48C80033761B /* ButtonClickStyleAnim+UIViewPulsate.swift */,
607-
4A9B5AC4280B48C80033761B /* ButtonClickStyleAnim+UIViewGlare.swift */,
608-
);
609-
path = Animations;
610-
sourceTree = "<group>";
611-
};
612-
4A9B5ADD280B48E80033761B /* UIDesignable */ = {
613-
isa = PBXGroup;
614-
children = (
615-
4A9B5ADE280B48E80033761B /* ButtonClickStyleDesignLabel.swift */,
616-
4A9B5ADF280B48E80033761B /* ButtonClickStyleDesignView.swift */,
617-
);
618-
path = UIDesignable;
619-
sourceTree = "<group>";
620-
};
621560
4ADE26E12803837C00634B6C /* ExampleButtons */ = {
622561
isa = PBXGroup;
623562
children = (
@@ -630,6 +569,8 @@
630569
607FACC71AFB9204008FA782 = {
631570
isa = PBXGroup;
632571
children = (
572+
4A9B5AE3280B4E200033761B /* Packages */,
573+
4A14CBC12803437C00DA8A68 /* Sources */,
633574
607FACF51AFB993E008FA782 /* Podspec Metadata */,
634575
4A9B5AAF280B48C80033761B /* Sources */,
635576
4A9B5AAD280B484C0033761B /* Packages */,

‎Example/Pods/Pods.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Sources/ButtonClickStyle/ButtonClickStyle.swift‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
public struct ButtonClickStyle {
2+
public private(set) var text = "Hello, World!"
3+
4+
public init() {
5+
}
6+
}

0 commit comments

Comments
 (0)