Skip to content

Commit 7482156

Browse files
matusklasovitymatusklasovity
authored
Merge pull request #18 from GoodRequest/feature/button-accessibility
feat: GRButton accessbility
2 parents 3588fb7 + e591edd commit 7482156

File tree

9 files changed

+550
-324
lines changed

9 files changed

+550
-324
lines changed

‎GoodSwiftUI-Sample/GoodSwiftUI-Sample.xcodeproj/project.pbxproj‎

Lines changed: 148 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,55 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 56;
6+
objectVersion = 70;
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
09794E3A2C295F4600023CD1 /* InputFieldViewConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09794E392C295F4600023CD1 /* InputFieldViewConfiguration.swift */; };
11-
09794E3C2C2ADAFE00023CD1 /* InputFieldSampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09794E3B2C2ADAFE00023CD1 /* InputFieldSampleView.swift */; };
12-
09B493CD2C986F1800C66743 /* ReadableContentWidthView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09B493CC2C986F1400C66743 /* ReadableContentWidthView.swift */; };
13-
3F9F28442A3AEC6000D92CA2 /* SamplesListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F9F28432A3AEC6000D92CA2 /* SamplesListView.swift */; };
14-
3F9F28462A3AEC8B00D92CA2 /* GRAsyncImageSampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F9F28452A3AEC8B00D92CA2 /* GRAsyncImageSampleView.swift */; };
1510
3F9F28482A3AECC700D92CA2 /* GRAsyncImage in Frameworks */ = {isa = PBXBuildFile; productRef = 3F9F28472A3AECC700D92CA2 /* GRAsyncImage */; };
16-
5D740EAD29B0BE0100975B8C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D740EAC29B0BE0100975B8C /* AppDelegate.swift */; };
17-
5D740EB829B0BE0200975B8C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5D740EB729B0BE0200975B8C /* Assets.xcassets */; };
18-
5D740EBB29B0BE0200975B8C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5D740EB929B0BE0200975B8C /* LaunchScreen.storyboard */; };
1911
5D740EC629B0BE7300975B8C /* GoodSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 5D740EC529B0BE7300975B8C /* GoodSwiftUI */; };
20-
78B2DC2D2CF70B710053DF97 /* GRToggleSampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B2DC2C2CF70B680053DF97 /* GRToggleSampleView.swift */; };
21-
78062C8E2CEDD3D000281C04 /* GRButtonSampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78062C8D2CEDD3BE00281C04 /* GRButtonSampleView.swift */; };
2212
/* End PBXBuildFile section */
2313

14+
/* Begin PBXContainerItemProxy section */
15+
3FBFD65D2D41194000E6E35A /* PBXContainerItemProxy */ = {
16+
isa = PBXContainerItemProxy;
17+
containerPortal = 5D740EA129B0BE0100975B8C /* Project object */;
18+
proxyType = 1;
19+
remoteGlobalIDString = 5D740EA829B0BE0100975B8C;
20+
remoteInfo = "GoodSwiftUI-Sample";
21+
};
22+
/* End PBXContainerItemProxy section */
23+
2424
/* Begin PBXFileReference section */
25-
09794E392C295F4600023CD1 /* InputFieldViewConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputFieldViewConfiguration.swift; sourceTree = "<group>"; };
26-
09794E3B2C2ADAFE00023CD1 /* InputFieldSampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputFieldSampleView.swift; sourceTree = "<group>"; };
27-
09B493CC2C986F1400C66743 /* ReadableContentWidthView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadableContentWidthView.swift; sourceTree = "<group>"; };
28-
3F9F28432A3AEC6000D92CA2 /* SamplesListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SamplesListView.swift; sourceTree = "<group>"; };
29-
3F9F28452A3AEC8B00D92CA2 /* GRAsyncImageSampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GRAsyncImageSampleView.swift; sourceTree = "<group>"; };
25+
3FBFD6572D41194000E6E35A /* sourcery_iOSUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = sourcery_iOSUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
3026
5D740EA929B0BE0100975B8C /* GoodSwiftUI-Sample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "GoodSwiftUI-Sample.app"; sourceTree = BUILT_PRODUCTS_DIR; };
31-
5D740EAC29B0BE0100975B8C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
32-
5D740EB729B0BE0200975B8C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
33-
5D740EBA29B0BE0200975B8C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
34-
5D740EBC29B0BE0200975B8C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3527
5D740EC329B0BE5F00975B8C /* GoodSwiftUI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = GoodSwiftUI; path = ..; sourceTree = "<group>"; };
36-
78B2DC2C2CF70B680053DF97 /* GRToggleSampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GRToggleSampleView.swift; sourceTree = "<group>"; };
3728
78062C8D2CEDD3BE00281C04 /* GRButtonSampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GRButtonSampleView.swift; sourceTree = "<group>"; };
29+
78B2DC2C2CF70B680053DF97 /* GRToggleSampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GRToggleSampleView.swift; sourceTree = "<group>"; };
3830
/* End PBXFileReference section */
3931

32+
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
33+
3F19A5E92D41278600C91600 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
34+
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
35+
membershipExceptions = (
36+
Info.plist,
37+
);
38+
target = 5D740EA829B0BE0100975B8C /* GoodSwiftUI-Sample */;
39+
};
40+
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
41+
42+
/* Begin PBXFileSystemSynchronizedRootGroup section */
43+
3F19A5DC2D41278600C91600 /* GoodSwiftUI-Sample */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (3F19A5E92D41278600C91600 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = "GoodSwiftUI-Sample"; sourceTree = "<group>"; };
44+
3FBFD6582D41194000E6E35A /* sample_iOSUITests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = sample_iOSUITests; sourceTree = "<group>"; };
45+
/* End PBXFileSystemSynchronizedRootGroup section */
46+
4047
/* Begin PBXFrameworksBuildPhase section */
48+
3FBFD6542D41194000E6E35A /* Frameworks */ = {
49+
isa = PBXFrameworksBuildPhase;
50+
buildActionMask = 2147483647;
51+
files = (
52+
);
53+
runOnlyForDeploymentPostprocessing = 0;
54+
};
4155
5D740EA629B0BE0100975B8C /* Frameworks */ = {
4256
isa = PBXFrameworksBuildPhase;
4357
buildActionMask = 2147483647;
@@ -50,58 +64,35 @@
5064
/* End PBXFrameworksBuildPhase section */
5165

5266
/* Begin PBXGroup section */
53-
09794E382C295F3F00023CD1 /* Extensions */ = {
67+
3FA663A22D6F164F00269137 /* Recovered References */ = {
5468
isa = PBXGroup;
5569
children = (
56-
09794E392C295F4600023CD1 /* InputFieldViewConfiguration.swift */,
57-
);
58-
path = Extensions;
59-
sourceTree = "<group>";
60-
};
61-
3F9F28422A3AEC5200D92CA2 /* Screens */ = {
62-
isa = PBXGroup;
63-
children = (
64-
78B2DC2C2CF70B680053DF97 /* GRToggleSampleView.swift */,
6570
78062C8D2CEDD3BE00281C04 /* GRButtonSampleView.swift */,
66-
09B493CC2C986F1400C66743 /* ReadableContentWidthView.swift */,
67-
3F9F28432A3AEC6000D92CA2 /* SamplesListView.swift */,
68-
3F9F28452A3AEC8B00D92CA2 /* GRAsyncImageSampleView.swift */,
69-
09794E3B2C2ADAFE00023CD1 /* InputFieldSampleView.swift */,
71+
78B2DC2C2CF70B680053DF97 /* GRToggleSampleView.swift */,
7072
);
71-
path = Screens;
73+
name = "Recovered References";
7274
sourceTree = "<group>";
7375
};
7476
5D740EA029B0BE0100975B8C = {
7577
isa = PBXGroup;
7678
children = (
7779
5D740EC229B0BE5F00975B8C /* Packages */,
78-
5D740EAB29B0BE0100975B8C /* GoodSwiftUI-Sample */,
80+
3F19A5DC2D41278600C91600 /* GoodSwiftUI-Sample */,
81+
3FBFD6582D41194000E6E35A /* sample_iOSUITests */,
7982
5D740EAA29B0BE0100975B8C /* Products */,
80-
5D740EC429B0BE7300975B8C /* Frameworks */,
83+
3FA663A22D6F164F00269137 /* Recovered References */,
8184
);
8285
sourceTree = "<group>";
8386
};
8487
5D740EAA29B0BE0100975B8C /* Products */ = {
8588
isa = PBXGroup;
8689
children = (
8790
5D740EA929B0BE0100975B8C /* GoodSwiftUI-Sample.app */,
91+
3FBFD6572D41194000E6E35A /* sourcery_iOSUITests.xctest */,
8892
);
8993
name = Products;
9094
sourceTree = "<group>";
9195
};
92-
5D740EAB29B0BE0100975B8C /* GoodSwiftUI-Sample */ = {
93-
isa = PBXGroup;
94-
children = (
95-
09794E382C295F3F00023CD1 /* Extensions */,
96-
3F9F28422A3AEC5200D92CA2 /* Screens */,
97-
5D740EAC29B0BE0100975B8C /* AppDelegate.swift */,
98-
5D740EB729B0BE0200975B8C /* Assets.xcassets */,
99-
5D740EB929B0BE0200975B8C /* LaunchScreen.storyboard */,
100-
5D740EBC29B0BE0200975B8C /* Info.plist */,
101-
);
102-
path = "GoodSwiftUI-Sample";
103-
sourceTree = "<group>";
104-
};
10596
5D740EC229B0BE5F00975B8C /* Packages */ = {
10697
isa = PBXGroup;
10798
children = (
@@ -110,16 +101,32 @@
110101
name = Packages;
111102
sourceTree = "<group>";
112103
};
113-
5D740EC429B0BE7300975B8C /* Frameworks */ = {
114-
isa = PBXGroup;
115-
children = (
116-
);
117-
name = Frameworks;
118-
sourceTree = "<group>";
119-
};
120104
/* End PBXGroup section */
121105

122106
/* Begin PBXNativeTarget section */
107+
3FBFD6562D41194000E6E35A /* sourcery_iOSUITests */ = {
108+
isa = PBXNativeTarget;
109+
buildConfigurationList = 3FBFD65F2D41194000E6E35A /* Build configuration list for PBXNativeTarget "sourcery_iOSUITests" */;
110+
buildPhases = (
111+
3FBFD6532D41194000E6E35A /* Sources */,
112+
3FBFD6542D41194000E6E35A /* Frameworks */,
113+
3FBFD6552D41194000E6E35A /* Resources */,
114+
);
115+
buildRules = (
116+
);
117+
dependencies = (
118+
3FBFD65E2D41194000E6E35A /* PBXTargetDependency */,
119+
);
120+
fileSystemSynchronizedGroups = (
121+
3FBFD6582D41194000E6E35A /* sample_iOSUITests */,
122+
);
123+
name = sourcery_iOSUITests;
124+
packageProductDependencies = (
125+
);
126+
productName = sourcery_iOSUITests;
127+
productReference = 3FBFD6572D41194000E6E35A /* sourcery_iOSUITests.xctest */;
128+
productType = "com.apple.product-type.bundle.ui-testing";
129+
};
123130
5D740EA829B0BE0100975B8C /* GoodSwiftUI-Sample */ = {
124131
isa = PBXNativeTarget;
125132
buildConfigurationList = 5D740EBF29B0BE0200975B8C /* Build configuration list for PBXNativeTarget "GoodSwiftUI-Sample" */;
@@ -132,6 +139,9 @@
132139
);
133140
dependencies = (
134141
);
142+
fileSystemSynchronizedGroups = (
143+
3F19A5DC2D41278600C91600 /* GoodSwiftUI-Sample */,
144+
);
135145
name = "GoodSwiftUI-Sample";
136146
packageProductDependencies = (
137147
5D740EC529B0BE7300975B8C /* GoodSwiftUI */,
@@ -148,9 +158,13 @@
148158
isa = PBXProject;
149159
attributes = {
150160
BuildIndependentTargetsInParallel = 1;
151-
LastSwiftUpdateCheck = 1420;
161+
LastSwiftUpdateCheck = 1600;
152162
LastUpgradeCheck = 1420;
153163
TargetAttributes = {
164+
3FBFD6562D41194000E6E35A = {
165+
CreatedOnToolsVersion = 16.0;
166+
TestTargetID = 5D740EA829B0BE0100975B8C;
167+
};
154168
5D740EA829B0BE0100975B8C = {
155169
CreatedOnToolsVersion = 14.2;
156170
};
@@ -170,52 +184,99 @@
170184
projectRoot = "";
171185
targets = (
172186
5D740EA829B0BE0100975B8C /* GoodSwiftUI-Sample */,
187+
3FBFD6562D41194000E6E35A /* sourcery_iOSUITests */,
173188
);
174189
};
175190
/* End PBXProject section */
176191

177192
/* Begin PBXResourcesBuildPhase section */
193+
3FBFD6552D41194000E6E35A /* Resources */ = {
194+
isa = PBXResourcesBuildPhase;
195+
buildActionMask = 2147483647;
196+
files = (
197+
);
198+
runOnlyForDeploymentPostprocessing = 0;
199+
};
178200
5D740EA729B0BE0100975B8C /* Resources */ = {
179201
isa = PBXResourcesBuildPhase;
180202
buildActionMask = 2147483647;
181203
files = (
182-
5D740EBB29B0BE0200975B8C /* LaunchScreen.storyboard in Resources */,
183-
5D740EB829B0BE0200975B8C /* Assets.xcassets in Resources */,
184204
);
185205
runOnlyForDeploymentPostprocessing = 0;
186206
};
187207
/* End PBXResourcesBuildPhase section */
188208

189209
/* Begin PBXSourcesBuildPhase section */
210+
3FBFD6532D41194000E6E35A /* Sources */ = {
211+
isa = PBXSourcesBuildPhase;
212+
buildActionMask = 2147483647;
213+
files = (
214+
);
215+
runOnlyForDeploymentPostprocessing = 0;
216+
};
190217
5D740EA529B0BE0100975B8C /* Sources */ = {
191218
isa = PBXSourcesBuildPhase;
192219
buildActionMask = 2147483647;
193220
files = (
194-
78062C8E2CEDD3D000281C04 /* GRButtonSampleView.swift in Sources */,
195-
09B493CD2C986F1800C66743 /* ReadableContentWidthView.swift in Sources */,
196-
5D740EAD29B0BE0100975B8C /* AppDelegate.swift in Sources */,
197-
09794E3A2C295F4600023CD1 /* InputFieldViewConfiguration.swift in Sources */,
198-
78B2DC2D2CF70B710053DF97 /* GRToggleSampleView.swift in Sources */,
199-
3F9F28462A3AEC8B00D92CA2 /* GRAsyncImageSampleView.swift in Sources */,
200-
3F9F28442A3AEC6000D92CA2 /* SamplesListView.swift in Sources */,
201-
09794E3C2C2ADAFE00023CD1 /* InputFieldSampleView.swift in Sources */,
202221
);
203222
runOnlyForDeploymentPostprocessing = 0;
204223
};
205224
/* End PBXSourcesBuildPhase section */
206225

207-
/* Begin PBXVariantGroup section */
208-
5D740EB929B0BE0200975B8C /* LaunchScreen.storyboard */ = {
209-
isa = PBXVariantGroup;
210-
children = (
211-
5D740EBA29B0BE0200975B8C /* Base */,
212-
);
213-
name = LaunchScreen.storyboard;
214-
sourceTree = "<group>";
226+
/* Begin PBXTargetDependency section */
227+
3FBFD65E2D41194000E6E35A /* PBXTargetDependency */ = {
228+
isa = PBXTargetDependency;
229+
target = 5D740EA829B0BE0100975B8C /* GoodSwiftUI-Sample */;
230+
targetProxy = 3FBFD65D2D41194000E6E35A /* PBXContainerItemProxy */;
215231
};
216-
/* End PBXVariantGroup section */
232+
/* End PBXTargetDependency section */
217233

218234
/* Begin XCBuildConfiguration section */
235+
3FBFD6602D41194000E6E35A /* Debug */ = {
236+
isa = XCBuildConfiguration;
237+
buildSettings = {
238+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
239+
CODE_SIGN_STYLE = Automatic;
240+
CURRENT_PROJECT_VERSION = 1;
241+
DEVELOPMENT_TEAM = P9F25DCA84;
242+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
243+
GCC_C_LANGUAGE_STANDARD = gnu17;
244+
GENERATE_INFOPLIST_FILE = YES;
245+
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
246+
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
247+
MARKETING_VERSION = 1.0;
248+
PRODUCT_BUNDLE_IDENTIFIER = "com.goodrequest.sourcery-iOSUITests";
249+
PRODUCT_NAME = "$(TARGET_NAME)";
250+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
251+
SWIFT_EMIT_LOC_STRINGS = NO;
252+
SWIFT_VERSION = 5.0;
253+
TARGETED_DEVICE_FAMILY = "1,2";
254+
TEST_TARGET_NAME = "GoodSwiftUI-Sample";
255+
};
256+
name = Debug;
257+
};
258+
3FBFD6612D41194000E6E35A /* Release */ = {
259+
isa = XCBuildConfiguration;
260+
buildSettings = {
261+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
262+
CODE_SIGN_STYLE = Automatic;
263+
CURRENT_PROJECT_VERSION = 1;
264+
DEVELOPMENT_TEAM = P9F25DCA84;
265+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
266+
GCC_C_LANGUAGE_STANDARD = gnu17;
267+
GENERATE_INFOPLIST_FILE = YES;
268+
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
269+
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
270+
MARKETING_VERSION = 1.0;
271+
PRODUCT_BUNDLE_IDENTIFIER = "com.goodrequest.sourcery-iOSUITests";
272+
PRODUCT_NAME = "$(TARGET_NAME)";
273+
SWIFT_EMIT_LOC_STRINGS = NO;
274+
SWIFT_VERSION = 5.0;
275+
TARGETED_DEVICE_FAMILY = "1,2";
276+
TEST_TARGET_NAME = "GoodSwiftUI-Sample";
277+
};
278+
name = Release;
279+
};
219280
5D740EBD29B0BE0200975B8C /* Debug */ = {
220281
isa = XCBuildConfiguration;
221282
buildSettings = {
@@ -391,6 +452,15 @@
391452
/* End XCBuildConfiguration section */
392453

393454
/* Begin XCConfigurationList section */
455+
3FBFD65F2D41194000E6E35A /* Build configuration list for PBXNativeTarget "sourcery_iOSUITests" */ = {
456+
isa = XCConfigurationList;
457+
buildConfigurations = (
458+
3FBFD6602D41194000E6E35A /* Debug */,
459+
3FBFD6612D41194000E6E35A /* Release */,
460+
);
461+
defaultConfigurationIsVisible = 0;
462+
defaultConfigurationName = Release;
463+
};
394464
5D740EA429B0BE0100975B8C /* Build configuration list for PBXProject "GoodSwiftUI-Sample" */ = {
395465
isa = XCConfigurationList;
396466
buildConfigurations = (

0 commit comments

Comments
 (0)