Conversation
misteu
commented
Oct 4, 2019
- Prepared the about page UI
- included a separate storyboard file + model for the about page
- drawed a simple icon in sketch and included it in the sketch file from Replaces tab bar items with funkier versions! #59
- included dummy json for UI rendering (read from the valid_json for the unit test)

Generated by 🚫 Danger |
ppeelen
left a comment
There was a problem hiding this comment.
Great work! I have some comments and believe some things were not yet finished. I hope you have the possibility to sort those out! :)
| XCTAssertEqual(aboutContent?.contributors.count, 5) | ||
|
|
||
| } | ||
|
|
|
The API is pushed so the new endpoint you made is now available at http://swiftisland.apptrix.se/about |
|
ok I implemented the actual request and tested it with the new endpoint. The two funcs (getSchedule and getAbout) are very similar. I added a todo-comment for refactoring. |
ppeelen
left a comment
There was a problem hiding this comment.
Great update, unfortunately I still have some minor thoughts.
| } | ||
| } | ||
|
|
||
| // Todo: Refactor together with get schedule |
There was a problem hiding this comment.
Would it be a good idea to merge this with get<T: Listable>(ofType:completion:)? Resolving this now will lead to not having to create a new issue while resolving this issue.
There was a problem hiding this comment.
so I did refactor it to two functions, one for array types (e.g. [Schedule] or [Area]) and one for non-array types (About). I am not fully satisfied, because I wanted to merge both to one single function, but I had no idea how to handle a generic result type that can be an array type or a non array type.
I still have to learn more about the use of generics. Maybe somebody else can merge both functions ;)
There was a problem hiding this comment.
@SpacyRicochet Could you have a look at that? I am unfortunately swamped at the moment.
| 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 */; }; |
There was a problem hiding this comment.
This file should not be added to the SwiftIsland target, only the test target.
|
Something small I noticed; in the screenshot the tab bar items for 'Map' and 'Mentors' have changed positions relative to the original. Was that on purpose? |
Ah you are right, I must have dragged it around accidentally 👍 Will fix that, too |
Codecov Report
@@ Coverage Diff @@
## develop #61 +/- ##
============================================
- Coverage 56.03% 35.59% -20.45%
============================================
Files 24 25 +1
Lines 787 840 +53
============================================
- Hits 441 299 -142
- Misses 346 541 +195 |
|
@misteu can this be merged or are there things that need fixing? |
|
So I think this can be merged now. I merged in the current develop branch that was updated 2 days ago and solved the new conflicts. I did not look for some days into the project and remarked that I also changed some colors to dynamic colors for dark mode. Although that goes beyond the ticket... 🙈 I hope that it is okay :) |
|
There still seem to be merge conflicts committed to this branch: https://github.com/SwiftIsland/island-app/pull/61/files#diff-b20005bfff36d00426bb74486330cf8fR69 |
Codecov Report
@@ Coverage Diff @@
## develop #61 +/- ##
===========================================
+ Coverage 39.13% 48.48% +9.34%
===========================================
Files 27 27
Lines 948 924 -24
===========================================
+ Hits 371 448 +77
+ Misses 577 476 -101 |
|
hey it should work now. I merged develop into that branch and fixed the broken project file. |