Skip to content

Commit 2a03f47

Browse files
authored
Merge pull request #279 from TaskarCenterAtUW/task-rebranding-to-AVIV-ScoutRoute
Rebranding to AVIV scout route
2 parents 6f486c8 + e6e7e9d commit 2a03f47

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1679
-123
lines changed

GoInfoGame/GoInfoGame.xcodeproj/project.pbxproj

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,11 @@
158158
C75EAD362E042D4500F75969 /* SideWalkWidth.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4E711A12B57A3B400C9DE08 /* SideWalkWidth.swift */; };
159159
C75EAD372E042D4500F75969 /* SideWalkWidthForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973FC0132B4D353800878269 /* SideWalkWidthForm.swift */; };
160160
C76187DC2E0153D800150201 /* ClusterMap in Frameworks */ = {isa = PBXBuildFile; productRef = C76187DB2E0153D800150201 /* ClusterMap */; };
161+
C769AB552E431EFE00FA810A /* Strings+Generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = C769AB542E431EFE00FA810A /* Strings+Generated.swift */; };
161162
C76DA1A12DF0679F00451E63 /* LongFormModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA8C74C32C4FDE1000D28220 /* LongFormModel.swift */; };
162163
C77A4A262DF2AF3100DED8B0 /* SecureInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C77A4A252DF2AF3100DED8B0 /* SecureInputView.swift */; };
163164
C77EEBCF2DE59D3200494CB4 /* UndoMerge.swift in Sources */ = {isa = PBXBuildFile; fileRef = C77EEBCE2DE59D3200494CB4 /* UndoMerge.swift */; };
165+
C7927B552E42363000A7A34E /* XCAssets+Generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7927B532E42363000A7A34E /* XCAssets+Generated.swift */; };
164166
C7BA83542E3C9C3600755BA7 /* QuestSyncButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7BA83532E3C9C3600755BA7 /* QuestSyncButton.swift */; };
165167
C7ED070F2D70E2EC001FFFE2 /* TokenRefresher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7ED070E2D70E2EC001FFFE2 /* TokenRefresher.swift */; };
166168
CFECB318461BB876B1621890 /* Pods_osmapi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4F37DA661B22FA87DF8282F /* Pods_osmapi.framework */; };
@@ -498,8 +500,10 @@
498500
C75CC5D72E0D22F4008A94A0 /* SCLIO Seattle pins response.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "SCLIO Seattle pins response.json"; sourceTree = "<group>"; };
499501
C75CC5D82E0D22F4008A94A0 /* LongQuestsResponse.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = LongQuestsResponse.json; sourceTree = "<group>"; };
500502
C75E47732E151058006D903A /* Kondapur.gpx */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Kondapur.gpx; sourceTree = "<group>"; };
503+
C769AB542E431EFE00FA810A /* Strings+Generated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Strings+Generated.swift"; sourceTree = "<group>"; };
501504
C77A4A252DF2AF3100DED8B0 /* SecureInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureInputView.swift; sourceTree = "<group>"; };
502505
C77EEBCE2DE59D3200494CB4 /* UndoMerge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UndoMerge.swift; sourceTree = "<group>"; };
506+
C7927B532E42363000A7A34E /* XCAssets+Generated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCAssets+Generated.swift"; sourceTree = "<group>"; };
503507
C7BA83532E3C9C3600755BA7 /* QuestSyncButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = QuestSyncButton.swift; path = GoInfoGame/UI/Map/QuestSyncButton.swift; sourceTree = SOURCE_ROOT; };
504508
C7ED070E2D70E2EC001FFFE2 /* TokenRefresher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokenRefresher.swift; sourceTree = "<group>"; };
505509
C96303080D26026265099E0E /* Pods-GoInfoGame.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoInfoGame.release.xcconfig"; path = "Target Support Files/Pods-GoInfoGame/Pods-GoInfoGame.release.xcconfig"; sourceTree = "<group>"; };
@@ -657,6 +661,7 @@
657661
0536DD8A2B0BD2A900B04C4B /* Helpers */ = {
658662
isa = PBXGroup;
659663
children = (
664+
C7927B542E42363000A7A34E /* Generated */,
660665
C75CC5D52E0D22E0008A94A0 /* SampleResponses */,
661666
0536DD8B2B0BD2C200B04C4B /* Constants.swift */,
662667
972454142B14A49A0036B91A /* Extensions.swift */,
@@ -1316,6 +1321,15 @@
13161321
path = SampleResponses;
13171322
sourceTree = "<group>";
13181323
};
1324+
C7927B542E42363000A7A34E /* Generated */ = {
1325+
isa = PBXGroup;
1326+
children = (
1327+
C769AB542E431EFE00FA810A /* Strings+Generated.swift */,
1328+
C7927B532E42363000A7A34E /* XCAssets+Generated.swift */,
1329+
);
1330+
path = Generated;
1331+
sourceTree = "<group>";
1332+
};
13191333
FA18CADE2CC7CD46008247F2 /* Kartaview */ = {
13201334
isa = PBXGroup;
13211335
children = (
@@ -1735,6 +1749,7 @@
17351749
isa = PBXNativeTarget;
17361750
buildConfigurationList = FAD5C5192AFCBE720040C61A /* Build configuration list for PBXNativeTarget "GoInfoGame" */;
17371751
buildPhases = (
1752+
C7927B562E42364100A7A34E /* SwiftGen */,
17381753
3A8B389D639C310AE1E29BEB /* [CP] Check Pods Manifest.lock */,
17391754
FAD5C4EB2AFCBE700040C61A /* Sources */,
17401755
FAD5C4EC2AFCBE700040C61A /* Frameworks */,
@@ -2027,6 +2042,24 @@
20272042
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoInfoGame-GoInfoGameUITests/Pods-GoInfoGame-GoInfoGameUITests-frameworks.sh\"\n";
20282043
showEnvVarsInLog = 0;
20292044
};
2045+
C7927B562E42364100A7A34E /* SwiftGen */ = {
2046+
isa = PBXShellScriptBuildPhase;
2047+
buildActionMask = 2147483647;
2048+
files = (
2049+
);
2050+
inputFileListPaths = (
2051+
);
2052+
inputPaths = (
2053+
);
2054+
name = SwiftGen;
2055+
outputFileListPaths = (
2056+
);
2057+
outputPaths = (
2058+
);
2059+
runOnlyForDeploymentPostprocessing = 0;
2060+
shellPath = /bin/sh;
2061+
shellScript = "if [[ \"$(uname -m)\" == arm64 ]]\nthen\n export PATH=\"/opt/homebrew/bin:$PATH\"\nfi\n\nif command -v swiftgen >/dev/null 2>&1\nthen\n swiftgen\nelse\n echo \"warning: `swiftgen` command not found\"\nfi\n\n";
2062+
};
20302063
FF862D6335761A29040D8975 /* [CP] Check Pods Manifest.lock */ = {
20312064
isa = PBXShellScriptBuildPhase;
20322065
buildActionMask = 2147483647;
@@ -2259,13 +2292,15 @@
22592292
971902112B983EFC009B3270 /* CustomMap.swift in Sources */,
22602293
FA5071982D71F1B000CE9798 /* SyncLogger.swift in Sources */,
22612294
A48037362BBA8DDC007EE7E4 /* WorkspacesResponse.swift in Sources */,
2295+
C769AB552E431EFE00FA810A /* Strings+Generated.swift in Sources */,
22622296
0536DD992B0BDBFE00B04C4B /* OAuthManager.swift in Sources */,
22632297
A4E711A62B57BBCA00C9DE08 /* QuestProtocols.swift in Sources */,
22642298
FAFDA2122C6F64E800ECEAE9 /* UserProfileView.swift in Sources */,
22652299
973FBFFE2B46BB3800878269 /* Utils.swift in Sources */,
22662300
B0CCB98C2B8626AE00AA73DE /* ProfileView.swift in Sources */,
22672301
FAF44FBD2B3084EC004FE664 /* OnboardingView1.swift in Sources */,
22682302
973FC01D2B4FEE1B00878269 /* YesNoView.swift in Sources */,
2303+
C7927B552E42363000A7A34E /* XCAssets+Generated.swift in Sources */,
22692304
FAE481A62DDB22DB00149A48 /* BiometricToggleView.swift in Sources */,
22702305
);
22712306
runOnlyForDeploymentPostprocessing = 0;
@@ -2749,11 +2784,13 @@
27492784
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
27502785
CODE_SIGN_IDENTITY = "Apple Development";
27512786
CODE_SIGN_STYLE = Automatic;
2752-
CURRENT_PROJECT_VERSION = 39;
2787+
CURRENT_PROJECT_VERSION = 1;
27532788
DEVELOPMENT_TEAM = G8MQVE5WWW;
27542789
GENERATE_INFOPLIST_FILE = YES;
27552790
INFOPLIST_FILE = GoInfoGame/Info.plist;
2791+
INFOPLIST_KEY_CFBundleDisplayName = "AVIV ScoutRoute";
27562792
INFOPLIST_KEY_NSCameraUsageDescription = "This app requires access to your camera to upload images to Kartaview";
2793+
INFOPLIST_KEY_NSFaceIDUsageDescription = "Used to securely log in using Face ID";
27572794
INFOPLIST_KEY_NSFileProviderDomainUsageDescription = "";
27582795
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "We need your location";
27592796
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "We need your location";
@@ -2787,11 +2824,13 @@
27872824
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
27882825
CODE_SIGN_IDENTITY = "Apple Development";
27892826
CODE_SIGN_STYLE = Automatic;
2790-
CURRENT_PROJECT_VERSION = 39;
2827+
CURRENT_PROJECT_VERSION = 1;
27912828
DEVELOPMENT_TEAM = G8MQVE5WWW;
27922829
GENERATE_INFOPLIST_FILE = YES;
27932830
INFOPLIST_FILE = GoInfoGame/Info.plist;
2831+
INFOPLIST_KEY_CFBundleDisplayName = "AVIV ScoutRoute";
27942832
INFOPLIST_KEY_NSCameraUsageDescription = "This app requires access to your camera to upload images to Kartaview";
2833+
INFOPLIST_KEY_NSFaceIDUsageDescription = "Used to securely log in using Face ID";
27952834
INFOPLIST_KEY_NSFileProviderDomainUsageDescription = "";
27962835
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "We need your location";
27972836
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "We need your location";
@@ -2807,7 +2846,7 @@
28072846
"@executable_path/Frameworks",
28082847
);
28092848
MARKETING_VERSION = 1.0;
2810-
PRODUCT_BUNDLE_IDENTIFIER = com.uwtcat.gig;
2849+
PRODUCT_BUNDLE_IDENTIFIER = tech.opentoall.aviv.scoutroute;
28112850
PRODUCT_NAME = "$(TARGET_NAME)";
28122851
PROVISIONING_PROFILE_SPECIFIER = "";
28132852
SWIFT_EMIT_LOC_STRINGS = YES;
1.1 MB
Loading

GoInfoGame/GoInfoGame/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "logo.png",
4+
"filename" : "Choice3SquareHuskyPurp.png",
55
"idiom" : "universal",
66
"platform" : "ios",
77
"size" : "1024x1024"
-87.3 KB
Binary file not shown.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0xE3",
9+
"green" : "0xB4",
10+
"red" : "0xC5"
11+
}
12+
},
13+
"idiom" : "universal"
14+
}
15+
],
16+
"info" : {
17+
"author" : "xcode",
18+
"version" : 1
19+
}
20+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0xAC",
9+
"green" : "0x3C",
10+
"red" : "0xE9"
11+
}
12+
},
13+
"idiom" : "universal"
14+
}
15+
],
16+
"info" : {
17+
"author" : "xcode",
18+
"version" : 1
19+
}
20+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0x7A",
9+
"green" : "0xA5",
10+
"red" : "0xB7"
11+
}
12+
},
13+
"idiom" : "universal"
14+
}
15+
],
16+
"info" : {
17+
"author" : "xcode",
18+
"version" : 1
19+
}
20+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0x6E",
9+
"green" : "0x00",
10+
"red" : "0x32"
11+
}
12+
},
13+
"idiom" : "universal"
14+
}
15+
],
16+
"info" : {
17+
"author" : "xcode",
18+
"version" : 1
19+
}
20+
}
Binary file not shown.

GoInfoGame/GoInfoGame/Assets.xcassets/logo.imageset/Contents.json

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
{
22
"images" : [
33
{
4-
"idiom" : "universal",
5-
"scale" : "1x"
6-
},
7-
{
8-
"idiom" : "universal",
9-
"scale" : "2x"
10-
},
11-
{
12-
"idiom" : "universal",
13-
"scale" : "3x"
4+
"filename" : "Choice3SquareHuskyPurp.pdf",
5+
"idiom" : "universal"
146
}
157
],
168
"info" : {

0 commit comments

Comments
 (0)