Skip to content
This repository was archived by the owner on May 23, 2024. It is now read-only.

Story about page #61

Open
misteu wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

Story about page #61

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a423ea0
added about screen+tabbar icon
Oct 2, 2019
0ef673d
merged in develop
Oct 4, 2019
180ff37
Merge branch 'develop' into StoryAboutPage
Oct 4, 2019
e2ec6f4
merged in develop
Oct 4, 2019
a0266ea
added icon to sketch-file, added dummy json+labels
Oct 4, 2019
68decb3
updated PR to requested changes
misteu Oct 6, 2019
c1e0106
added acitivity indicator, tested new endpoint
misteu Oct 6, 2019
68184ed
moved tab icons back, refactored DataManager
misteu Oct 7, 2019
545fae6
merged in develop
misteu Oct 7, 2019
526bd9b
fixed broken Storyboard after merge
misteu Oct 7, 2019
3858840
merged in develop, solved merge conflicts
misteu Oct 30, 2019
983bb7d
fixed project-file
misteu Nov 30, 2019
261c8bd
added missing files to project
misteu Nov 30, 2019
ba6acb7
updated test
misteu Nov 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 38 additions & 10 deletions SwiftIsland.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
239DCB9B2343763D00F0CD95 /* UIViewExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 239DCB9A2343763D00F0CD95 /* UIViewExtensionsTests.swift */; };
239DCB9F2344874C00F0CD95 /* Timeline.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 239DCB9E2344874C00F0CD95 /* Timeline.storyboard */; };
239DCBA12344895600F0CD95 /* Map.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 239DCBA02344895600F0CD95 /* Map.storyboard */; };
239DCBA32344A3D100F0CD95 /* ActivityDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 239DCBA22344A3D100F0CD95 /* ActivityDetailsViewController.swift */; };
239DCBA52344AB8200F0CD95 /* DateFormatter+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = 239DCBA42344AB8200F0CD95 /* DateFormatter+Convenience.swift */; };
2A0C8FBE226B9F6A003F8937 /* Schedule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0C8FBD226B9F6A003F8937 /* Schedule.swift */; };
2A0C8FC1226BA17B003F8937 /* DataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0C8FC0226BA17B003F8937 /* DataManager.swift */; };
2A0C8FC3226BA210003F8937 /* APIManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0C8FC2226BA210003F8937 /* APIManager.swift */; };
Expand Down Expand Up @@ -68,6 +66,13 @@
2ADD086B22ADB01400A90D1E /* TestDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ADD086A22ADB01400A90D1E /* TestDataManager.swift */; };
2AF63104226DE96D00509053 /* MapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF63103226DE96D00509053 /* MapViewController.swift */; };
2AF63107226E5CA300509053 /* Area.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF63106226E5CA300509053 /* Area.swift */; };
CE84EA252343D63400C9C82E /* About.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE84EA242343D63400C9C82E /* About.swift */; };
CE84EA282343DA9A00C9C82E /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE84EA272343DA9A00C9C82E /* AboutViewController.swift */; };
CE84EA2A234783DF00C9C82E /* About_valid.json in Resources */ = {isa = PBXBuildFile; fileRef = CE84EA29234783DF00C9C82E /* About_valid.json */; };
Copy link
Collaborator

@ppeelen ppeelen Oct 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file should not be added to the SwiftIsland target, only the test target.

CE84EA2C2347843E00C9C82E /* AboutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE84EA2B2347843E00C9C82E /* AboutTests.swift */; };
CE84EA3123478C9400C9C82E /* About.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CE84EA3023478C9400C9C82E /* About.storyboard */; };
CE902FBA234BA3A200E67551 /* ActivityDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE902FB9234BA3A200E67551 /* ActivityDetailsViewController.swift */; };
CE902FBC234BA47000E67551 /* DateFormatter+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE902FBB234BA47000E67551 /* DateFormatter+Convenience.swift */; };
ED8C140122C2063900E6DE6E /* Mentor.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ED8C140022C2063900E6DE6E /* Mentor.storyboard */; };
/* End PBXBuildFile section */

Expand All @@ -85,8 +90,6 @@
239DCB9A2343763D00F0CD95 /* UIViewExtensionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewExtensionsTests.swift; sourceTree = "<group>"; };
239DCB9E2344874C00F0CD95 /* Timeline.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Timeline.storyboard; sourceTree = "<group>"; };
239DCBA02344895600F0CD95 /* Map.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Map.storyboard; sourceTree = "<group>"; };
239DCBA22344A3D100F0CD95 /* ActivityDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityDetailsViewController.swift; sourceTree = "<group>"; };
239DCBA42344AB8200F0CD95 /* DateFormatter+Convenience.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DateFormatter+Convenience.swift"; sourceTree = "<group>"; };
2A0C8FBD226B9F6A003F8937 /* Schedule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Schedule.swift; sourceTree = "<group>"; };
2A0C8FC0226BA17B003F8937 /* DataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataManager.swift; sourceTree = "<group>"; };
2A0C8FC2226BA210003F8937 /* APIManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIManager.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -147,6 +150,13 @@
2ADD086A22ADB01400A90D1E /* TestDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestDataManager.swift; sourceTree = "<group>"; };
2AF63103226DE96D00509053 /* MapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapViewController.swift; sourceTree = "<group>"; };
2AF63106226E5CA300509053 /* Area.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Area.swift; sourceTree = "<group>"; };
CE84EA242343D63400C9C82E /* About.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = About.swift; sourceTree = "<group>"; };
CE84EA272343DA9A00C9C82E /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
CE84EA29234783DF00C9C82E /* About_valid.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = About_valid.json; sourceTree = "<group>"; };
CE84EA2B2347843E00C9C82E /* AboutTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutTests.swift; sourceTree = "<group>"; };
CE84EA3023478C9400C9C82E /* About.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = About.storyboard; sourceTree = "<group>"; };
CE902FB9234BA3A200E67551 /* ActivityDetailsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActivityDetailsViewController.swift; sourceTree = "<group>"; };
CE902FBB234BA47000E67551 /* DateFormatter+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DateFormatter+Convenience.swift"; sourceTree = "<group>"; };
ED8C140022C2063900E6DE6E /* Mentor.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Mentor.storyboard; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -181,6 +191,7 @@
children = (
2A0C8FBD226B9F6A003F8937 /* Schedule.swift */,
2AF63106226E5CA300509053 /* Area.swift */,
CE84EA242343D63400C9C82E /* About.swift */,
2A8F7CDC229D1C5A00874B09 /* Mentor.swift */,
);
path = Entities;
Expand All @@ -202,10 +213,10 @@
2A0C8FC6226BA738003F8937 /* Extensions */ = {
isa = PBXGroup;
children = (
CE902FBB234BA47000E67551 /* DateFormatter+Convenience.swift */,
2A0C8FC7226BA741003F8937 /* FileManaging.swift */,
2A0C8FD2226D1667003F8937 /* UIViewExtensions.swift */,
2ADD085E22ADABFA00A90D1E /* CollectionExtension.swift */,
239DCBA42344AB8200F0CD95 /* DateFormatter+Convenience.swift */,
);
path = Extensions;
sourceTree = "<group>";
Expand Down Expand Up @@ -354,6 +365,7 @@
2A0C8FBC226B9F5D003F8937 /* Entities */,
2A0C8FDC226DE00D003F8937 /* Map */,
2AA290E5225F1A0400B289BE /* Resources */,
CE84EA262343DA5200C9C82E /* About */,
2AD36FF3225E84D300AF7542 /* Timeline */,
2A8F7CE0229D3C6800874B09 /* Mentor */,
2A0C8FBF226BA16C003F8937 /* Utilities */,
Expand All @@ -371,8 +383,8 @@
2A9D2AC222A3E86500AC960D /* Cells */,
2AD36FF4225E84F400AF7542 /* TimelineViewController.swift */,
2ABEC0C122B996DE00C0C8A5 /* CountdownViewController.swift */,
239DCBA22344A3D100F0CD95 /* ActivityDetailsViewController.swift */,
239DCB9E2344874C00F0CD95 /* Timeline.storyboard */,
CE902FB9234BA3A200E67551 /* ActivityDetailsViewController.swift */,
);
path = Timeline;
sourceTree = "<group>";
Expand All @@ -389,6 +401,7 @@
isa = PBXGroup;
children = (
2ADD086522ADAF7400A90D1E /* AreaTests.swift */,
CE84EA2B2347843E00C9C82E /* AboutTests.swift */,
);
path = Entities;
sourceTree = "<group>";
Expand All @@ -397,11 +410,21 @@
isa = PBXGroup;
children = (
2ADD086822ADAFE100A90D1E /* Area_valid.json */,
CE84EA29234783DF00C9C82E /* About_valid.json */,
2ADD086A22ADB01400A90D1E /* TestDataManager.swift */,
);
path = Resources;
sourceTree = "<group>";
};
CE84EA262343DA5200C9C82E /* About */ = {
isa = PBXGroup;
children = (
CE84EA272343DA9A00C9C82E /* AboutViewController.swift */,
CE84EA3023478C9400C9C82E /* About.storyboard */,
);
path = About;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -484,6 +507,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
CE84EA2A234783DF00C9C82E /* About_valid.json in Resources */,
2ADD086922ADAFE100A90D1E /* Area_valid.json in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -497,6 +521,7 @@
2ABEC0BD22B9925400C0C8A5 /* OFL.txt in Resources */,
2ABEC0B822B9925400C0C8A5 /* WorkSans-Light.ttf in Resources */,
2ABEC0B922B9925400C0C8A5 /* WorkSans-ExtraBold.ttf in Resources */,
CE84EA3123478C9400C9C82E /* About.storyboard in Resources */,
2AD36FE8225E830A00AF7542 /* Assets.xcassets in Resources */,
2ABEC0BA22B9925400C0C8A5 /* WorkSans-ExtraLight.ttf in Resources */,
2ABEC0BC22B9925400C0C8A5 /* WorkSans-SemiBold.ttf in Resources */,
Expand Down Expand Up @@ -548,6 +573,7 @@
2ABBDD84226FA1C300D4212C /* SwiftIslandTests.swift in Sources */,
2AA81FDA22B6E708001F3A58 /* APIManagerTests.swift in Sources */,
2ABBDD90226FA2B600D4212C /* CacheManagerMock.swift in Sources */,
CE84EA2C2347843E00C9C82E /* AboutTests.swift in Sources */,
2AA81FDE22B83850001F3A58 /* APIManagerMock.swift in Sources */,
239DCB9B2343763D00F0CD95 /* UIViewExtensionsTests.swift in Sources */,
2AA81FDC22B6E74D001F3A58 /* URLSessionMock.swift in Sources */,
Expand All @@ -571,15 +597,16 @@
2A96CAFB22AAA26E004CED66 /* MapPolygon.swift in Sources */,
2A8863D122BBF06000B4CE86 /* Reachability.swift in Sources */,
2A0C8FDB226DD9C4003F8937 /* ScheduleFooterCell.swift in Sources */,
239DCBA52344AB8200F0CD95 /* DateFormatter+Convenience.swift in Sources */,
CE84EA252343D63400C9C82E /* About.swift in Sources */,
CE902FBA234BA3A200E67551 /* ActivityDetailsViewController.swift in Sources */,
2A0C8FD1226D13FE003F8937 /* ScheduleCell.swift in Sources */,
2A0C8FC8226BA741003F8937 /* FileManaging.swift in Sources */,
2ABEC08222B97A3300C0C8A5 /* DataWriter.swift in Sources */,
2ABEC0C222B996DE00C0C8A5 /* CountdownViewController.swift in Sources */,
2AF63104226DE96D00509053 /* MapViewController.swift in Sources */,
CE902FBC234BA47000E67551 /* DateFormatter+Convenience.swift in Sources */,
2A0C8FC3226BA210003F8937 /* APIManager.swift in Sources */,
2A5BE94B22BA8B270062D868 /* MentorCollectionView.swift in Sources */,
239DCBA32344A3D100F0CD95 /* ActivityDetailsViewController.swift in Sources */,
2AF63107226E5CA300509053 /* Area.swift in Sources */,
2ACB133B229BA44F0072BB1D /* MentorCardViewController.swift in Sources */,
2AD36FE1225E830800AF7542 /* AppDelegate.swift in Sources */,
Expand All @@ -589,6 +616,7 @@
2A5BE94D22BA8B890062D868 /* MentorCollectionViewCell.swift in Sources */,
2A8F7CE5229D3D1D00874B09 /* CardViewController.swift in Sources */,
2A0C8FD3226D1667003F8937 /* UIViewExtensions.swift in Sources */,
CE84EA282343DA9A00C9C82E /* AboutViewController.swift in Sources */,
2AD36FF5225E84F400AF7542 /* TimelineViewController.swift in Sources */,
2A0C8FD7226D1C97003F8937 /* ScheduleHeaderCell.swift in Sources */,
);
Expand Down Expand Up @@ -788,7 +816,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 6B3SHVL3L5;
DEVELOPMENT_TEAM = 6T68RPD4WZ;
INFOPLIST_FILE = SwiftIsland/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -806,7 +834,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 6B3SHVL3L5;
DEVELOPMENT_TEAM = 6T68RPD4WZ;
INFOPLIST_FILE = SwiftIsland/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down
Loading