Skip to content

Commit b24e38d

Browse files
xnth97xnth97
committed
group view
1 parent 85f3ffc commit b24e38d

21 files changed

+337
-204
lines changed

‎AccessoryKit.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'AccessoryKit'
3-
s.version = '1.0.1'
3+
s.version = '2.0.0'
44
s.summary = 'A customizable, expandable, and easy-to-use input accessory view component for iOS.'
55

66
s.description = <<-DESC
@@ -13,7 +13,7 @@ A customizable, expandable, and easy-to-use input accessory view component for i
1313
s.source = { :git => 'https://github.com/xnth97/AccessoryKit.git', :tag => s.version.to_s }
1414

1515
s.ios.deployment_target = '14.0'
16-
s.swift_version = '5.5'
16+
s.swift_version = '5.7'
1717

1818
s.source_files = 'Sources/AccessoryKit/**/*'
1919

‎Example/AccessoryKit.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,9 @@
223223
};
224224
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "AccessoryKit" */;
225225
compatibilityVersion = "Xcode 3.2";
226-
developmentRegion = English;
226+
developmentRegion = en;
227227
hasScannedForEncodings = 0;
228228
knownRegions = (
229-
English,
230229
en,
231230
Base,
232231
);

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

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,8 +40,16 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
language = ""
4443
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
48+
BuildableName = "AccessoryKit_Example.app"
49+
BlueprintName = "AccessoryKit_Example"
50+
ReferencedContainer = "container:AccessoryKit.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
4553
<Testables>
4654
<TestableReference
4755
skipped = "NO">
@@ -54,23 +62,11 @@
5462
</BuildableReference>
5563
</TestableReference>
5664
</Testables>
57-
<MacroExpansion>
58-
<BuildableReference
59-
BuildableIdentifier = "primary"
60-
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
61-
BuildableName = "AccessoryKit_Example.app"
62-
BlueprintName = "AccessoryKit_Example"
63-
ReferencedContainer = "container:AccessoryKit.xcodeproj">
64-
</BuildableReference>
65-
</MacroExpansion>
66-
<AdditionalOptions>
67-
</AdditionalOptions>
6865
</TestAction>
6966
<LaunchAction
7067
buildConfiguration = "Debug"
7168
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7269
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73-
language = ""
7470
launchStyle = "0"
7571
useCustomWorkingDirectory = "NO"
7672
ignoresPersistentStateOnLaunch = "NO"
@@ -87,8 +83,6 @@
8783
ReferencedContainer = "container:AccessoryKit.xcodeproj">
8884
</BuildableReference>
8985
</BuildableProductRunnable>
90-
<AdditionalOptions>
91-
</AdditionalOptions>
9286
</LaunchAction>
9387
<ProfileAction
9488
buildConfiguration = "Release"

‎Example/AccessoryKit/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
6-
<string>en</string>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>

‎Example/AccessoryKit/ViewController.swift‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,37 @@ class ViewController: UIViewController {
1313

1414
@IBOutlet weak var textView: UITextView!
1515

16-
private lazy var keyButtons: [KeyboardAccessoryButton] = [
17-
KeyboardAccessoryButton(type: .tab, position: .trailing),
18-
KeyboardAccessoryButton(type: .undo, position: .leading) { [weak self] in
19-
self?.undo()
20-
},
21-
KeyboardAccessoryButton(type: .redo, position: .leading) { [weak self] in
22-
self?.redo()
23-
},
24-
KeyboardAccessoryButton(type: .header),
25-
KeyboardAccessoryButton(type: .bold),
26-
KeyboardAccessoryButton(type: .italic),
27-
KeyboardAccessoryButton(type: .code),
28-
KeyboardAccessoryButton(type: .delete),
29-
KeyboardAccessoryButton(type: .item),
30-
KeyboardAccessoryButton(type: .quote),
31-
KeyboardAccessoryButton(type: .link, menu: createInsertMenu()),
32-
KeyboardAccessoryButton(type: .image),
33-
KeyboardAccessoryButton(title: "Esc", image: UIImage(systemName: "escape")),
16+
private lazy var keyButtonGroups: [KeyboardAccessoryButtonGroup] = [
17+
[
18+
KeyboardAccessoryButton(type: .tab, position: .trailing),
19+
],
20+
[
21+
KeyboardAccessoryButton(type: .undo, position: .leading) { [weak self] in
22+
self?.undo()
23+
},
24+
KeyboardAccessoryButton(type: .redo, position: .leading) { [weak self] in
25+
self?.redo()
26+
},
27+
],
28+
[
29+
30+
KeyboardAccessoryButton(type: .bold),
31+
KeyboardAccessoryButton(type: .italic),
32+
KeyboardAccessoryButton(type: .delete),
33+
],
34+
[
35+
KeyboardAccessoryButton(type: .link, menu: createInsertMenu()),
36+
KeyboardAccessoryButton(type: .image),
37+
KeyboardAccessoryButton(title: "Esc"),
38+
],
39+
[
40+
KeyboardAccessoryButton(type: .header),
41+
KeyboardAccessoryButton(type: .code),
42+
KeyboardAccessoryButton(type: .item),
43+
KeyboardAccessoryButton(type: .quote),
44+
],
3445
]
35-
private lazy var accessoryManager = KeyboardAccessoryManager(keyButtons: keyButtons, delegate: self)
46+
private lazy var accessoryManager = KeyboardAccessoryManager(keyButtonGroups: keyButtonGroups, delegate: self)
3647

3748
override func viewDidLoad() {
3849
super.viewDidLoad()

‎Example/Podfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- AccessoryKit (1.0)
2+
- AccessoryKit (2.0.0)
33

44
DEPENDENCIES:
55
- AccessoryKit (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
99
:path: "../"
1010

1111
SPEC CHECKSUMS:
12-
AccessoryKit: 102ecd920670beb963659b9549e920bba5f0a82c
12+
AccessoryKit: 3bccba03d7a73822cbb692729078760314a45cc7
1313

1414
PODFILE CHECKSUM: 71ba08049996c0cee05530889ad335543ac96aac
1515

16-
COCOAPODS: 1.11.3
16+
COCOAPODS: 1.12.1

‎Example/Pods/Local Podspecs/AccessoryKit.podspec.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Manifest.lock‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)