Fehler #2
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // | ||
| // Planet.swift | ||
| // APIClient | ||
| // | ||
| // Created by Kleimaier, Dennis on 23.05.16. | ||
| // Copyright © 2016 iOS Dev Kurs Universität Heidelberg. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| import Freddy | ||
|
|
||
| struct Planet: JSONDecodable { | ||
|
|
||
| let name: String | ||
|
|
||
| init(json: JSON) throws { | ||
| self.name = try json.string("name") | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| // | ||
| // PlanetAPI.swift | ||
| // APIClient | ||
| // | ||
| // Created by Kleimaier, Dennis on 23.05.16. | ||
| // Copyright © 2016 iOS Dev Kurs Universität Heidelberg. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| import Moya | ||
| import Freddy | ||
|
|
||
| enum PlanetAPI: Moya.TargetType{ | ||
| case planet(NamedResource<Planet>) | ||
|
|
||
|
Member
There was a problem hiding this comment. Du kannst hier auch eine |
||
| var baseURL: NSURL { return NSURL(string: "http://swapi.co/api")! } | ||
|
|
||
| var path: String { | ||
| switch self{ | ||
| case .planet(let namedResource): return "/planets/\(namedResource.name)" | ||
| } | ||
|
Member
There was a problem hiding this comment. Hier fehlt ein case .planet(let namedResource): return "/planets/\(namedResource.name)" |
||
| } | ||
|
|
||
| var method: Moya.Method { return .GET } | ||
|
|
||
| var parameters: [String : AnyObject]? { | ||
| switch self { | ||
| default: return nil | ||
| } | ||
| } | ||
|
|
||
| // TODO: Provide sample data for testing | ||
| var sampleData: NSData { | ||
| switch self { | ||
| case .planet(let namedResource): return "{\"planets\": \"\(namedResource.name)\",\"planets\":\"Tatooine\"}".dataUsingEncoding(NSUTF8StringEncoding)! | ||
| default: return "".dataUsingEncoding(NSUTF8StringEncoding)! | ||
| } | ||
| } | ||
| } | ||
|
|
||
| struct NamedResource<Resource: Freddy.JSONDecodable>: Freddy.JSONDecodable { | ||
|
|
||
| let name:String | ||
|
|
||
| init(name: String) { | ||
| self.name = name | ||
| } | ||
|
|
||
| init(json: JSON) throws { | ||
| self.name = try json.string("name") | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| // | ||
| // PlanetViewController.swift | ||
| // APIClient | ||
| // | ||
| // Created by Kleimaier, Dennis on 23.05.16. | ||
| // Copyright © 2016 iOS Dev Kurs Universität Heidelberg. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| import Moya | ||
| import Freddy | ||
|
|
||
| class PlanetViewController: UIViewController { | ||
|
|
||
|
|
||
| override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
| } | ||
|
|
||
| var planetAPI: MoyaProvider<PlanetAPI>! | ||
| var planet: Planet? { | ||
| didSet { | ||
| self.planetLab.text = planet?.name | ||
| } | ||
| } | ||
|
|
||
|
|
||
| @IBOutlet weak var searchField: UITextField! | ||
| @IBOutlet weak var planetLab: UILabel! | ||
|
|
||
|
|
||
| func loadPlanet(planet: NamedResource<Planet>){ | ||
| planetAPI.request(.planet(planet)){ result in | ||
| switch result { | ||
| case .Success(let response): | ||
| do { | ||
| try response.filterSuccessfulStatusCodes() | ||
| // Try to parse the response to JSON | ||
| let json = try JSON(data: response.data) | ||
| // Try to decode the JSON to the required type | ||
| let pokemonSpecies = try Planet(json: json) | ||
| // Configure view according to model | ||
| self.planet = pokemonSpecies | ||
| print(pokemonSpecies) | ||
| } catch { | ||
| print(error) | ||
| } | ||
| case .Failure(let error): | ||
| print(error) | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
| func textFieldShouldReturn(textField: UITextField) -> Bool { | ||
| guard let name = textField.text else { | ||
| return true | ||
| } | ||
| self.loadPlanet(NamedResource(name: name)) | ||
| return true | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dies sind Konflikt-Marker von Git nach einem Merge. Öffne das Storyboard in einem Texteditor und entferne die Marker und damit die Konflikte ;) https://githowto.com/resolving_conflicts