Skip to content

Commit

Permalink
Merge branch 'feature/swift_ui_support' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	AnyFormatKit.xcodeproj/project.pbxproj
#	Documentation/AnyFormatKit 2.4.0 MigrationGuide.md
#	Example/Pods/Pods.xcodeproj/project.pbxproj
#	Example/UIKitExample/iOS Example.xcodeproj/xcshareddata/xcschemes/UIKitExample.xcscheme
#	Example/iOS Example.xcodeproj/xcshareddata/xcschemes/UIKitExample.xcscheme
#	Example/iOS Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme
#	README.md
#	Source/TextFormatter/TextFormatter/TextNumberFormatter.swift
  • Loading branch information
Oleksandr Orlov committed Feb 4, 2021
2 parents 3858247 + 1cfe9d8 commit 02e9ec0
Show file tree
Hide file tree
Showing 14 changed files with 362 additions and 242 deletions.
17 changes: 11 additions & 6 deletions AnyFormatKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
0210847925B5854900DE16E4 /* SumTextInputFormatterUnformatTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0210847825B5854900DE16E4 /* SumTextInputFormatterUnformatTests.swift */; };
022766DC25BF4DD500740DFE /* PlaceholderCaretPositionCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 022766DB25BF4DD500740DFE /* PlaceholderCaretPositionCalculator.swift */; };
02330C7125B2493500DE9EB8 /* DefaultTextInputFormatterPhoneEmojisInputTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02330C7025B2493500DE9EB8 /* DefaultTextInputFormatterPhoneEmojisInputTests.swift */; };
025AAB0F25C873B100CDA81D /* TextNumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 025AAB0E25C873B100CDA81D /* TextNumberFormatter.swift */; };
026A487525C1E0CB000A38C7 /* CaretPositioner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 026A487425C1E0CB000A38C7 /* CaretPositioner.swift */; };
026A487B25C1E11F000A38C7 /* TextFieldPlaceholderInputController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 026A487A25C1E11F000A38C7 /* TextFieldPlaceholderInputController.swift */; };
026A488C25C1E626000A38C7 /* TextViewPlaceholderInputController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 026A488B25C1E626000A38C7 /* TextViewPlaceholderInputController.swift */; };
026A487B25C1E11F000A38C7 /* TextFieldStartInputController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 026A487A25C1E11F000A38C7 /* TextFieldStartInputController.swift */; };
026A488C25C1E626000A38C7 /* TextViewStartInputController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 026A488B25C1E626000A38C7 /* TextViewStartInputController.swift */; };
02902B7F25B5E87F00E3BF25 /* TextNumberUnformatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02902B7E25B5E87F00E3BF25 /* TextNumberUnformatter.swift */; };
02902B8525B5E90D00E3BF25 /* SumTextInputFormatterNumberUnformatTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02902B8425B5E90D00E3BF25 /* SumTextInputFormatterNumberUnformatTests.swift */; };
02902B8E25B5F27100E3BF25 /* DefaultTextInputFormatterFormatTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02902B8D25B5F27100E3BF25 /* DefaultTextInputFormatterFormatTests.swift */; };
Expand Down Expand Up @@ -122,9 +123,11 @@
0210847825B5854900DE16E4 /* SumTextInputFormatterUnformatTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SumTextInputFormatterUnformatTests.swift; sourceTree = "<group>"; };
022766DB25BF4DD500740DFE /* PlaceholderCaretPositionCalculator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaceholderCaretPositionCalculator.swift; sourceTree = "<group>"; };
02330C7025B2493500DE9EB8 /* DefaultTextInputFormatterPhoneEmojisInputTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultTextInputFormatterPhoneEmojisInputTests.swift; sourceTree = "<group>"; };
024A797625C73D3400478A15 /* AnyFormatKit 2.4.0 MigrationGuide.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = "AnyFormatKit 2.4.0 MigrationGuide.md"; sourceTree = "<group>"; };
025AAB0E25C873B100CDA81D /* TextNumberFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextNumberFormatter.swift; sourceTree = "<group>"; };
026A487425C1E0CB000A38C7 /* CaretPositioner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CaretPositioner.swift; sourceTree = "<group>"; };
026A487A25C1E11F000A38C7 /* TextFieldPlaceholderInputController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldPlaceholderInputController.swift; sourceTree = "<group>"; };
026A488B25C1E626000A38C7 /* TextViewPlaceholderInputController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextViewPlaceholderInputController.swift; sourceTree = "<group>"; };
026A487A25C1E11F000A38C7 /* TextFieldStartInputController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldStartInputController.swift; sourceTree = "<group>"; };
026A488B25C1E626000A38C7 /* TextViewStartInputController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextViewStartInputController.swift; sourceTree = "<group>"; };
02902B7E25B5E87F00E3BF25 /* TextNumberUnformatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextNumberUnformatter.swift; sourceTree = "<group>"; };
02902B8425B5E90D00E3BF25 /* SumTextInputFormatterNumberUnformatTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SumTextInputFormatterNumberUnformatTests.swift; sourceTree = "<group>"; };
02902B8D25B5F27100E3BF25 /* DefaultTextInputFormatterFormatTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultTextInputFormatterFormatTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -459,6 +462,8 @@
307EA2191FAA1B5B00DE439D /* TextInputFormatter.swift */,
DB4EEED5255DB80700F02145 /* FormattedTextValue.swift */,
026A487425C1E0CB000A38C7 /* CaretPositioner.swift */,
02902B7E25B5E87F00E3BF25 /* TextNumberUnformatter.swift */,
025AAB0E25C873B100CDA81D /* TextNumberFormatter.swift */,
);
path = TextFormatter;
sourceTree = "<group>";
Expand Down Expand Up @@ -744,6 +749,7 @@
30D7EAAC229D56D20014E31B /* README.md */,
30D7EAAA229D55A20014E31B /* AnyFormatKit 0.2.0 MigrationGuide.md */,
30EB6CBB22BBA0A000447D5A /* AnyFormatKit 1.0.0 MigrationGuide.md */,
024A797625C73D3400478A15 /* AnyFormatKit 2.4.0 MigrationGuide.md */,
);
path = Documentation;
sourceTree = "<group>";
Expand Down Expand Up @@ -806,7 +812,6 @@
DB4EEEA8255D9F0200F02145 /* Helpers */ = {
isa = PBXGroup;
children = (
02902B7E25B5E87F00E3BF25 /* TextNumberUnformatter.swift */,
30EB6CB522BB870E00447D5A /* SumFormatParser.swift */,
30EB6CB622BB870E00447D5A /* SumTextInputFormatterCaretPositionCalculator.swift */,
);
Expand Down Expand Up @@ -1025,7 +1030,7 @@
30A308962072BA7300CFC062 /* CaretPositionCorrector.swift in Sources */,
3032CFC021D412E1008137EE /* DefaultTextFormatter.swift in Sources */,
30EB6CB822BB870E00447D5A /* SumFormatParser.swift in Sources */,
026A488C25C1E626000A38C7 /* TextViewPlaceholderInputController.swift in Sources */,
026A488C25C1E626000A38C7 /* TextViewStartInputController.swift in Sources */,
307EA2341FAA1B5B00DE439D /* TextFormatter.swift in Sources */,
0210845725B57BD300DE16E4 /* TextUnformatter.swift in Sources */,
02902B7F25B5E87F00E3BF25 /* TextNumberUnformatter.swift in Sources */,
Expand Down
6 changes: 6 additions & 0 deletions Documentation/AnyFormatKit 2.4.0 MigrationGuide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# AnyFormatKit 2.4.0 Migration Guide

## Breaking Changes

- `TextFieldPlaceholderInputController` was renamed to `TextFieldStartInputController`
- `TextViewPlaceholderInputController` was renamed to `TextViewStartInputController`
4 changes: 2 additions & 2 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- AnyFormatKit (2.2.1)
- AnyFormatKit (2.3.0)
- SnapKit (4.0.1)

DEPENDENCIES:
Expand All @@ -15,7 +15,7 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
AnyFormatKit: a433c9051897ec3af3aa77172c443d08660419ca
AnyFormatKit: c3c214deb03a53dee974bfd671f7fba9c568e3b7
SnapKit: 0de968a9fec17499afa29683b05d0c775b6d1c29

PODFILE CHECKSUM: 3b2233463479c8716321bdf1faf9974b8abd16c7
Expand Down
4 changes: 2 additions & 2 deletions Example/Pods/Local Podspecs/AnyFormatKit.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 02e9ec0

Please sign in to comment.