Skip to content

Commit dcbb1aa

Browse files
Merge branch 'dev' into feature-profileScreen
2 parents d1216cd + 90964ab commit dcbb1aa

File tree

21 files changed

+439
-37
lines changed

21 files changed

+439
-37
lines changed

GoInfoGame/GoInfoGame.xcodeproj/project.pbxproj

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
05DBBB662B17209600B6F110 /* RealmOPMeta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05DBBB652B17209600B6F110 /* RealmOPMeta.swift */; };
2525
188843AD2B5FA2DF0008DCF8 /* TactilePavingStepsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 188843AC2B5FA2DF0008DCF8 /* TactilePavingStepsTests.swift */; };
2626
188843AF2B5FB32D0008DCF8 /* WayLitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 188843AE2B5FB32D0008DCF8 /* WayLitTests.swift */; };
27+
18EC425C2B84987200DE05D7 /* TactilePavingCrosswalkForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18EC425B2B84987200DE05D7 /* TactilePavingCrosswalkForm.swift */; };
28+
18EC425E2B849FE000DE05D7 /* TactilePavingCrosswalk.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18EC425D2B849FE000DE05D7 /* TactilePavingCrosswalk.swift */; };
2729
342561966FC217124BD9CFE7 /* Pods_GoInfoGame_GoInfoGameUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D539E22EFF6636F8CBA035A /* Pods_GoInfoGame_GoInfoGameUITests.framework */; };
2830
74D8E739AE340D54DEF2E74C /* Pods_GoInfoGameTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 066F85ADCDCE7357368131F8 /* Pods_GoInfoGameTests.framework */; };
2931
970D5BD12B62B61300C20BE7 /* MapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970D5BD02B62B61300C20BE7 /* MapViewController.swift */; };
@@ -33,6 +35,8 @@
3335
971575192B5FFE910044797C /* LocationManagerCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 971575182B5FFE910044797C /* LocationManagerCoordinator.swift */; };
3436
971F9FDF2B847349005397CC /* CrossingIslandForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 971F9FDE2B847349005397CC /* CrossingIslandForm.swift */; };
3537
971F9FE12B847358005397CC /* CrossingIsland.swift in Sources */ = {isa = PBXBuildFile; fileRef = 971F9FE02B847358005397CC /* CrossingIsland.swift */; };
38+
971F9FE42B84CDBF005397CC /* CrossingType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 971F9FE32B84CDBF005397CC /* CrossingType.swift */; };
39+
971F9FE62B84CDCE005397CC /* CrossingTypeForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 971F9FE52B84CDCE005397CC /* CrossingTypeForm.swift */; };
3640
972454152B14A49A0036B91A /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 972454142B14A49A0036B91A /* Extensions.swift */; };
3741
973FBFFE2B46BB3800878269 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973FBFFD2B46BB3800878269 /* Utils.swift */; };
3842
973FC0012B46CD5D00878269 /* QuestsListUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973FC0002B46CD5D00878269 /* QuestsListUIView.swift */; };
@@ -276,6 +280,8 @@
276280
066F85ADCDCE7357368131F8 /* Pods_GoInfoGameTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GoInfoGameTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
277281
188843AC2B5FA2DF0008DCF8 /* TactilePavingStepsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TactilePavingStepsTests.swift; sourceTree = "<group>"; };
278282
188843AE2B5FB32D0008DCF8 /* WayLitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WayLitTests.swift; sourceTree = "<group>"; };
283+
18EC425B2B84987200DE05D7 /* TactilePavingCrosswalkForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TactilePavingCrosswalkForm.swift; sourceTree = "<group>"; };
284+
18EC425D2B849FE000DE05D7 /* TactilePavingCrosswalk.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TactilePavingCrosswalk.swift; sourceTree = "<group>"; };
279285
2D539E22EFF6636F8CBA035A /* Pods_GoInfoGame_GoInfoGameUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GoInfoGame_GoInfoGameUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
280286
3D797A45474D6135AFA24613 /* Pods-GoInfoGameTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoInfoGameTests.debug.xcconfig"; path = "Target Support Files/Pods-GoInfoGameTests/Pods-GoInfoGameTests.debug.xcconfig"; sourceTree = "<group>"; };
281287
66BED441AF03CC04539E8D4A /* Pods_GoInfoGame.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GoInfoGame.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -287,6 +293,8 @@
287293
971575182B5FFE910044797C /* LocationManagerCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationManagerCoordinator.swift; sourceTree = "<group>"; };
288294
971F9FDE2B847349005397CC /* CrossingIslandForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrossingIslandForm.swift; sourceTree = "<group>"; };
289295
971F9FE02B847358005397CC /* CrossingIsland.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrossingIsland.swift; sourceTree = "<group>"; };
296+
971F9FE32B84CDBF005397CC /* CrossingType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrossingType.swift; sourceTree = "<group>"; };
297+
971F9FE52B84CDCE005397CC /* CrossingTypeForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrossingTypeForm.swift; sourceTree = "<group>"; };
290298
972454142B14A49A0036B91A /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
291299
973FBFFD2B46BB3800878269 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
292300
973FC0002B46CD5D00878269 /* QuestsListUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuestsListUIView.swift; sourceTree = "<group>"; };
@@ -622,6 +630,15 @@
622630
path = quests;
623631
sourceTree = "<group>";
624632
};
633+
18EC425A2B8497F200DE05D7 /* TactilePavingCrosswalk */ = {
634+
isa = PBXGroup;
635+
children = (
636+
18EC425D2B849FE000DE05D7 /* TactilePavingCrosswalk.swift */,
637+
18EC425B2B84987200DE05D7 /* TactilePavingCrosswalkForm.swift */,
638+
);
639+
path = TactilePavingCrosswalk;
640+
sourceTree = "<group>";
641+
};
625642
416A9A4590B07971607790B0 /* Frameworks */ = {
626643
isa = PBXGroup;
627644
children = (
@@ -666,6 +683,15 @@
666683
path = CrossingIsland;
667684
sourceTree = "<group>";
668685
};
686+
971F9FE22B84ABA6005397CC /* CrossingType */ = {
687+
isa = PBXGroup;
688+
children = (
689+
971F9FE32B84CDBF005397CC /* CrossingType.swift */,
690+
971F9FE52B84CDCE005397CC /* CrossingTypeForm.swift */,
691+
);
692+
path = CrossingType;
693+
sourceTree = "<group>";
694+
};
669695
973FBFFF2B46CD4100878269 /* QuestsList */ = {
670696
isa = PBXGroup;
671697
children = (
@@ -988,7 +1014,9 @@
9881014
A4E7119C2B57A22300C9DE08 /* quests */ = {
9891015
isa = PBXGroup;
9901016
children = (
1017+
971F9FE22B84ABA6005397CC /* CrossingType */,
9911018
971F9FDD2B847318005397CC /* CrossingIsland */,
1019+
18EC425A2B8497F200DE05D7 /* TactilePavingCrosswalk */,
9921020
97AC1C1F2B726A9F004F0BF4 /* TactilePavingKerb */,
9931021
97AC1C0D2B70CED0004F0BF4 /* SidewalkSurface */,
9941022
97AC1C042B6A44C1004F0BF4 /* SideWalkValidation */,
@@ -1623,6 +1651,7 @@
16231651
FAC9E6112B06811300E2C608 /* LocationManager.swift in Sources */,
16241652
A4834A3F2B67737500D4F0AA /* StoredChangeset.swift in Sources */,
16251653
973FC02F2B58F81F00878269 /* StepsRamp.swift in Sources */,
1654+
971F9FE62B84CDCE005397CC /* CrossingTypeForm.swift in Sources */,
16261655
A4E711AA2B58F6FB00C9DE08 /* HandRail.swift in Sources */,
16271656
973FC02D2B58F79B00878269 /* StepsRampForm.swift in Sources */,
16281657
059D47312B2C81A9000987FA /* Style.swift in Sources */,
@@ -1636,13 +1665,16 @@
16361665
97AC1C212B726AC9004F0BF4 /* TactilePavingKerb.swift in Sources */,
16371666
A4E711A22B57A3B400C9DE08 /* SideWalkWidth.swift in Sources */,
16381667
05CB71E02B0FAFD200DED821 /* GenericUIViewControllerRepresentable.swift in Sources */,
1668+
971F9FE42B84CDBF005397CC /* CrossingType.swift in Sources */,
16391669
97AC1C062B6A45B0004F0BF4 /* SideWalkValidation.swift in Sources */,
16401670
FAD5C4F32AFCBE700040C61A /* AppDelegate.swift in Sources */,
1671+
18EC425C2B84987200DE05D7 /* TactilePavingCrosswalkForm.swift in Sources */,
16411672
05DBBB622B164D9A00B6F110 /* RealOPElement.swift in Sources */,
16421673
973FC0422B59467A00878269 /* BusStopLit.swift in Sources */,
16431674
97AC1C0A2B6B7F10004F0BF4 /* CustomVerticalButtonsList.swift in Sources */,
16441675
973FC0352B592C0F00878269 /* StairNumberForm.swift in Sources */,
16451676
FAC9E60F2B04F9C800E2C608 /* OverpassRequestManager.swift in Sources */,
1677+
18EC425E2B849FE000DE05D7 /* TactilePavingCrosswalk.swift in Sources */,
16461678
FABF3CF82B822F120080EAC9 /* CustomSureAlert.swift in Sources */,
16471679
973FC0482B5A477E00878269 /* CrossMarking.swift in Sources */,
16481680
05DBBB642B17204300B6F110 /* RealmOPGeometry.swift in Sources */,
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "crossing_type_signals.pdf",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "crossing_type_unmarked.pdf",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "crossing_type_zebra.pdf",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}
Binary file not shown.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "pedestrian_crossing.pdf",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}
Binary file not shown.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "blind_pedestrian_crossing.pdf",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

0 commit comments

Comments
 (0)