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 intoSwiftIsland:developfrom
misteu:StoryAboutPage
Open

Story about page#61
misteu wants to merge 14 commits intoSwiftIsland:developfrom
misteu:StoryAboutPage

Conversation

@misteu
Copy link

@misteu 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)

grafik

@SwiftIslandBot
Copy link

1 Warning
⚠️ Big PR

Generated by 🚫 Danger

@ppeelen ppeelen added question Further information is requested hacktoberfest Hacktoberfest 2019 and removed question Further information is requested labels Oct 5, 2019
Copy link
Collaborator

@ppeelen ppeelen left a comment

Choose a reason for hiding this comment

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

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)

}

Copy link
Collaborator

Choose a reason for hiding this comment

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

Unneeded white spaces

@ppeelen
Copy link
Collaborator

ppeelen commented Oct 6, 2019

The API is pushed so the new endpoint you made is now available at http://swiftisland.apptrix.se/about

@misteu
Copy link
Author

misteu commented Oct 6, 2019

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.

Copy link
Collaborator

@ppeelen ppeelen left a comment

Choose a reason for hiding this comment

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

Great update, unfortunately I still have some minor thoughts.

}
}

// Todo: Refactor together with get schedule
Copy link
Collaborator

Choose a reason for hiding this comment

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

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.

Copy link
Author

@misteu misteu Oct 7, 2019

Choose a reason for hiding this comment

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

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 ;)

Copy link
Collaborator

Choose a reason for hiding this comment

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

@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 */; };
Copy link
Collaborator

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.

@SpacyRicochet
Copy link
Contributor

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?

@misteu
Copy link
Author

misteu commented Oct 7, 2019

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-io
Copy link

Codecov Report

Merging #61 into develop will decrease coverage by 20.44%.
The diff coverage is 0%.

@@             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

@funky-monkey
Copy link
Contributor

@misteu can this be merged or are there things that need fixing?

@misteu
Copy link
Author

misteu commented Oct 30, 2019

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 :)

@nvh
Copy link

nvh commented Nov 28, 2019

There still seem to be merge conflicts committed to this branch: https://github.com/SwiftIsland/island-app/pull/61/files#diff-b20005bfff36d00426bb74486330cf8fR69

@codecov-io
Copy link

Codecov Report

Merging #61 into develop will increase coverage by 9.34%.
The diff coverage is 23.43%.

@@             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

@misteu
Copy link
Author

misteu commented Nov 30, 2019

hey it should work now. I merged develop into that branch and fixed the broken project file.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

hacktoberfest Hacktoberfest 2019

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants