Skip to content

Commit e7dcc9f

Browse files
OmarrasheedOmarrasheed
authored
Merge pull request #204 from cuappdev/matt/v1.3
Matt/v1.3
2 parents eed9048 + 09793e5 commit e7dcc9f

37 files changed

Lines changed: 1023 additions & 392 deletions

‎Siri/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>XPC!</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.2.2</string>
20+
<string>1.3</string>
2121
<key>CFBundleVersion</key>
22-
<string>70</string>
22+
<string>73</string>
2323
<key>NSExtension</key>
2424
<dict>
2525
<key>NSExtensionAttributes</key>

‎TCAT.xcodeproj/project.pbxproj‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
BF18AE122083B9B8000C3D82 /* Phrases.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF18AE112083B9B8000C3D82 /* Phrases.swift */; };
3939
BF250D7F222FB12400E7F271 /* Endpoints.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF250D7E222FB12300E7F271 /* Endpoints.swift */; };
4040
BF316CB02096352B005A14EF /* PhraseLabelFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF316CAF2096352B005A14EF /* PhraseLabelFooterView.swift */; };
41+
BF40D7652230385B000ED7D8 /* WhatsNewCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF40D7642230385B000ED7D8 /* WhatsNewCard.swift */; };
4142
BF456E0320489990005C611D /* BusLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF456E0220489990005C611D /* BusLocation.swift */; };
4243
BF5C52A4207B96F0003C93B9 /* LiveIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5C52A3207B96F0003C93B9 /* LiveIndicator.swift */; };
4344
BF5CBAD11FCE6CCE00478C6F /* RouteDetail+DrawerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5CBAD01FCE6CCE00478C6F /* RouteDetail+DrawerViewController.swift */; };
@@ -62,6 +63,7 @@
6263
BFC367F421B66E9A00ABD9AC /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BFC367F621B66E9A00ABD9AC /* Intents.intentdefinition */; };
6364
BFCA712D206AC69000E4CCE5 /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFCA712C206AC69000E4CCE5 /* Keys.swift */; };
6465
BFD5B4E41FAADFAE00955C37 /* WalkPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFD5B4E31FAADFAE00955C37 /* WalkPath.swift */; };
66+
BFEDB85B2232F22100052D49 /* GeneralTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFEDB85A2232F22100052D49 /* GeneralTableViewCell.swift */; };
6567
BFF41EB2204365E800E0696B /* SummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF41EB1204365E800E0696B /* SummaryView.swift */; };
6668
CC27BD091FF6C91C00DAA7D5 /* Analytics.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC27BD081FF6C91C00DAA7D5 /* Analytics.swift */; };
6769
D183AA021E6CB092006A9A15 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D183AA011E6CB092006A9A15 /* Extensions.swift */; };
@@ -181,6 +183,7 @@
181183
BF18AE112083B9B8000C3D82 /* Phrases.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Phrases.swift; path = Utilities/Phrases.swift; sourceTree = "<group>"; };
182184
BF250D7E222FB12300E7F271 /* Endpoints.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Endpoints.swift; path = Utilities/Endpoints.swift; sourceTree = "<group>"; };
183185
BF316CAF2096352B005A14EF /* PhraseLabelFooterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PhraseLabelFooterView.swift; path = Views/PhraseLabelFooterView.swift; sourceTree = "<group>"; };
186+
BF40D7642230385B000ED7D8 /* WhatsNewCard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WhatsNewCard.swift; path = Model/WhatsNewCard.swift; sourceTree = "<group>"; };
184187
BF456E0220489990005C611D /* BusLocation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BusLocation.swift; path = Model/BusLocation.swift; sourceTree = "<group>"; };
185188
BF5C52A3207B96F0003C93B9 /* LiveIndicator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LiveIndicator.swift; path = Views/LiveIndicator.swift; sourceTree = "<group>"; };
186189
BF5CBAD01FCE6CCE00478C6F /* RouteDetail+DrawerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "RouteDetail+DrawerViewController.swift"; path = "Controllers/RouteDetail+DrawerViewController.swift"; sourceTree = "<group>"; };
@@ -205,6 +208,7 @@
205208
BFC367F521B66E9A00ABD9AC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = Base; path = Base.lproj/Intents.intentdefinition; sourceTree = "<group>"; };
206209
BFCA712C206AC69000E4CCE5 /* Keys.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Keys.swift; path = "Supporting Files/Keys.swift"; sourceTree = "<group>"; };
207210
BFD5B4E31FAADFAE00955C37 /* WalkPath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WalkPath.swift; path = Model/WalkPath.swift; sourceTree = "<group>"; };
211+
BFEDB85A2232F22100052D49 /* GeneralTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GeneralTableViewCell.swift; path = Cells/GeneralTableViewCell.swift; sourceTree = "<group>"; };
208212
BFF41EB1204365E800E0696B /* SummaryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SummaryView.swift; path = Views/SummaryView.swift; sourceTree = "<group>"; };
209213
C3AF9B9F85F235C20ED105CF /* Pods_TCATTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TCATTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
210214
CC27BD081FF6C91C00DAA7D5 /* Analytics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Analytics.swift; path = Utilities/Analytics.swift; sourceTree = "<group>"; };
@@ -442,6 +446,7 @@
442446
isa = PBXGroup;
443447
children = (
444448
DDB49C971E8857E000A99C35 /* BusStopTableViewCell.swift */,
449+
BFEDB85A2232F22100052D49 /* GeneralTableViewCell.swift */,
445450
DDB49C951E8857E000A99C35 /* LargeDetailTableViewCell.swift */,
446451
DDC83CA41E52B0D400D4EDDF /* RouteTableViewCell.swift */,
447452
2292486D21BB82180004279C /* ServiceAlertTableViewCell.swift */,
@@ -463,6 +468,7 @@
463468
DD2F989A1E50F99A0005F6BC /* Route.swift */,
464469
BFD5B4E31FAADFAE00955C37 /* WalkPath.swift */,
465470
DDB49C9C1E8857FC00A99C35 /* Waypoint.swift */,
471+
BF40D7642230385B000ED7D8 /* WhatsNewCard.swift */,
466472
);
467473
name = Model;
468474
sourceTree = "<group>";
@@ -565,6 +571,8 @@
565571
449A7C851D80D0E80019300C /* Sources */,
566572
449A7C861D80D0E80019300C /* Frameworks */,
567573
449A7C871D80D0E80019300C /* Resources */,
574+
95FD58E4B0B35A9955BD93B7 /* [CP] Embed Pods Frameworks */,
575+
755F369EEC2348457B6391B2 /* [CP] Copy Pods Resources */,
568576
);
569577
buildRules = (
570578
);
@@ -584,6 +592,8 @@
584592
449A7C901D80D0E80019300C /* Sources */,
585593
449A7C911D80D0E80019300C /* Frameworks */,
586594
449A7C921D80D0E80019300C /* Resources */,
595+
5D40E23D9EE63FF3BAE16D85 /* [CP] Embed Pods Frameworks */,
596+
3F7227CD26AFAD70B0DD5525 /* [CP] Copy Pods Resources */,
587597
);
588598
buildRules = (
589599
);
@@ -793,6 +803,51 @@
793803
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
794804
showEnvVarsInLog = 0;
795805
};
806+
3F7227CD26AFAD70B0DD5525 /* [CP] Copy Pods Resources */ = {
807+
isa = PBXShellScriptBuildPhase;
808+
buildActionMask = 2147483647;
809+
files = (
810+
);
811+
inputPaths = (
812+
);
813+
name = "[CP] Copy Pods Resources";
814+
outputPaths = (
815+
);
816+
runOnlyForDeploymentPostprocessing = 0;
817+
shellPath = /bin/sh;
818+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TCATUITests/Pods-TCATUITests-resources.sh\"\n";
819+
showEnvVarsInLog = 0;
820+
};
821+
5D40E23D9EE63FF3BAE16D85 /* [CP] Embed Pods Frameworks */ = {
822+
isa = PBXShellScriptBuildPhase;
823+
buildActionMask = 2147483647;
824+
files = (
825+
);
826+
inputPaths = (
827+
);
828+
name = "[CP] Embed Pods Frameworks";
829+
outputPaths = (
830+
);
831+
runOnlyForDeploymentPostprocessing = 0;
832+
shellPath = /bin/sh;
833+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TCATUITests/Pods-TCATUITests-frameworks.sh\"\n";
834+
showEnvVarsInLog = 0;
835+
};
836+
755F369EEC2348457B6391B2 /* [CP] Copy Pods Resources */ = {
837+
isa = PBXShellScriptBuildPhase;
838+
buildActionMask = 2147483647;
839+
files = (
840+
);
841+
inputPaths = (
842+
);
843+
name = "[CP] Copy Pods Resources";
844+
outputPaths = (
845+
);
846+
runOnlyForDeploymentPostprocessing = 0;
847+
shellPath = /bin/sh;
848+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TCATTests/Pods-TCATTests-resources.sh\"\n";
849+
showEnvVarsInLog = 0;
850+
};
796851
7C01627F386C89E7F1995831 /* [CP] Embed Pods Frameworks */ = {
797852
isa = PBXShellScriptBuildPhase;
798853
buildActionMask = 2147483647;
@@ -855,6 +910,21 @@
855910
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
856911
showEnvVarsInLog = 0;
857912
};
913+
95FD58E4B0B35A9955BD93B7 /* [CP] Embed Pods Frameworks */ = {
914+
isa = PBXShellScriptBuildPhase;
915+
buildActionMask = 2147483647;
916+
files = (
917+
);
918+
inputPaths = (
919+
);
920+
name = "[CP] Embed Pods Frameworks";
921+
outputPaths = (
922+
);
923+
runOnlyForDeploymentPostprocessing = 0;
924+
shellPath = /bin/sh;
925+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TCATTests/Pods-TCATTests-frameworks.sh\"\n";
926+
showEnvVarsInLog = 0;
927+
};
858928
E3FCA3C71FAA5AFB0069BD0F /* Fabric Configuration */ = {
859929
isa = PBXShellScriptBuildPhase;
860930
buildActionMask = 12;
@@ -881,6 +951,7 @@
881951
502D8F5F1E55161D005280F1 /* SearchBarView.swift in Sources */,
882952
5006F7BA1EC0F59A005ACAF2 /* SearchTableViewHelpers.swift in Sources */,
883953
BFCA712D206AC69000E4CCE5 /* Keys.swift in Sources */,
954+
BF40D7652230385B000ED7D8 /* WhatsNewCard.swift in Sources */,
884955
DDB49C9D1E8857FC00A99C35 /* BusPath.swift in Sources */,
885956
DD659C8A20508E1B00506BAC /* WalkWithDistanceIcon.swift in Sources */,
886957
BF8AF5F32206BBF60091AB8C /* Utilities.swift in Sources */,
@@ -889,6 +960,7 @@
889960
DDB49CA21E88584B00A99C35 /* DetailIconView.swift in Sources */,
890961
224EB5A5214F2F01008232C2 /* AppShortcuts.swift in Sources */,
891962
BF0002221FB37D0A00773109 /* LoadingIndicator.swift in Sources */,
963+
BFEDB85B2232F22100052D49 /* GeneralTableViewCell.swift in Sources */,
892964
DDA134451EC6A8CB00460B18 /* RouteLine.swift in Sources */,
893965
BFA53FEE1FD45D7000E770DF /* RouteDetailViewController.swift in Sources */,
894966
DD16B8E71E7046390089B7B2 /* BusIcon.swift in Sources */,

‎TCAT/AppDelegate.swift‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2525
let userDataInits: [(key: String, defaultValue: Any)] = [
2626
(key: Constants.UserDefaults.onboardingShown, defaultValue: false),
2727
(key: Constants.UserDefaults.recentSearch, defaultValue: [Any]()),
28-
(key: Constants.UserDefaults.favorites, defaultValue: [Any]()),
29-
(key: Constants.UserDefaults.whatsNewDismissed, defaultValue: false)
28+
(key: Constants.UserDefaults.favorites, defaultValue: [Any]())
3029
]
3130

3231
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
@@ -70,7 +69,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
7069
let navigationController = showOnboarding ? OnboardingNavigationController(rootViewController: rootVC) :
7170
CustomNavigationController(rootViewController: rootVC)
7271

73-
// v1.2.2 Data Migration
72+
// v1.3 Data Migration
7473
if
7574
VersionStore.shared.savedAppVersion <= WhatsNew.Version(major: 1, minor: 2, patch: 1),
7675
let homeViewController = rootVC as? HomeViewController

‎TCAT/Assets.xcassets/Pins/Contents.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}

‎TCAT/Assets.xcassets/Pins/bus-pin.imageset/Bus Stop Pin.png‎

560 Bytes
Loading

‎TCAT/Assets.xcassets/Pins/bus-pin.imageset/Bus Stop Pin@2x.png‎

971 Bytes
Loading

‎TCAT/Assets.xcassets/Pins/bus-pin.imageset/Bus Stop Pin@3x.png‎

1.4 KB
Loading

‎TCAT/Assets.xcassets/Pins/bus-pin.imageset/Contents.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "Bus Stop Pin.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "Bus Stop Pin@2x.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "Bus Stop Pin@3x.png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

TCAT/Assets.xcassets/pin.imageset/Contents.json renamed to TCAT/Assets.xcassets/Pins/pin.imageset/Contents.json

File renamed without changes.

TCAT/Assets.xcassets/pin.imageset/Destination icon.png renamed to TCAT/Assets.xcassets/Pins/pin.imageset/Destination icon.png

File renamed without changes.

0 commit comments

Comments
 (0)