Skip to content

Commit

Permalink
Merge branch 'release/14'
Browse files Browse the repository at this point in the history
  • Loading branch information
RishabhTayal committed Jun 27, 2017
2 parents c04cbb9 + 88855cd commit 75ed5a9
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 13 deletions.
4 changes: 4 additions & 0 deletions GHReleases.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
693113401F02C58300475318 /* Repository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6931133F1F02C58300475318 /* Repository.swift */; };
693113421F02C64900475318 /* AddRepositoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693113411F02C64900475318 /* AddRepositoryViewController.swift */; };
69421B901F01B3A7008588FB /* ReleasesTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69421B8F1F01B3A7008588FB /* ReleasesTableViewCell.swift */; };
6968A4A41F030C830062EB44 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6968A4A31F030C830062EB44 /* Constants.swift */; };
69A2084C1F02B5050085598C /* RepositoriesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69A2084B1F02B5050085598C /* RepositoriesViewController.swift */; };
69A208511F02B65C0085598C /* R.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69A208501F02B5EB0085598C /* R.generated.swift */; };
69AF48251F017B1900829B29 /* ServiceCaller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69AF48241F017B1900829B29 /* ServiceCaller.swift */; };
Expand All @@ -30,6 +31,7 @@
6931133F1F02C58300475318 /* Repository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Repository.swift; sourceTree = "<group>"; };
693113411F02C64900475318 /* AddRepositoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddRepositoryViewController.swift; sourceTree = "<group>"; };
69421B8F1F01B3A7008588FB /* ReleasesTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReleasesTableViewCell.swift; sourceTree = "<group>"; };
6968A4A31F030C830062EB44 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
69A2084B1F02B5050085598C /* RepositoriesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepositoriesViewController.swift; sourceTree = "<group>"; };
69A208501F02B5EB0085598C /* R.generated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = R.generated.swift; sourceTree = "<group>"; };
69AF48231F017ACF00829B29 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
Expand Down Expand Up @@ -108,6 +110,7 @@
children = (
69EC2F1A1F017AAF004B9D96 /* AppDelegate.swift */,
6931133C1F02BC0F00475318 /* AppHelper.swift */,
6968A4A31F030C830062EB44 /* Constants.swift */,
6931133E1F02C57800475318 /* Models */,
69A2084B1F02B5050085598C /* RepositoriesViewController.swift */,
693113411F02C64900475318 /* AddRepositoryViewController.swift */,
Expand Down Expand Up @@ -276,6 +279,7 @@
69421B901F01B3A7008588FB /* ReleasesTableViewCell.swift in Sources */,
693113401F02C58300475318 /* Repository.swift in Sources */,
693113421F02C64900475318 /* AddRepositoryViewController.swift in Sources */,
6968A4A41F030C830062EB44 /* Constants.swift in Sources */,
69EC2F1B1F017AAF004B9D96 /* AppDelegate.swift in Sources */,
6931133D1F02BC0F00475318 /* AppHelper.swift in Sources */,
69AF48251F017B1900829B29 /* ServiceCaller.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion GHReleases/AddRepositoryViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class AddRepositoryViewController: UIViewController {
}

@IBAction func addTapped(_ sender: Any) {
let repo = Repository(dict: ["owner": ownerNameTF.text, "name": repoNameTF.text])
let repo = Repository.instance(dict: ["owner": ownerNameTF.text, "name": repoNameTF.text])
if let delegate = delegate {
delegate.addRepositoryVCDidAddRepo(repo: repo)
}
Expand Down
2 changes: 1 addition & 1 deletion GHReleases/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}

func application(_ application: UIApplication, performFetchWithCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
let repo = Repository.init(dict: ["owner": "fastlane", "name": "fastlane"])
let repo = Repository.instance(dict: ["owner": "fastlane", "name": "fastlane"])
fetchData(repository: repo) { (d, e) in
DispatchQueue.main.async {
self.triggerLocalNotification()
Expand Down
13 changes: 13 additions & 0 deletions GHReleases/Constants.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// Constants.swift
// GHReleases
//
// Created by Tayal, Rishabh on 6/27/17.
// Copyright © 2017 Tayal, Rishabh. All rights reserved.
//

import Foundation

struct UserDefaultsKey {
static let Repositories = "repositories"
}
23 changes: 17 additions & 6 deletions GHReleases/RepositoriesViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,21 @@ class RepositoriesViewController: UIViewController {

override func viewDidLoad() {
super.viewDidLoad()
//
// var repo = Repository.instance(dict: ["owner": "fastlane", "name": "fastlane"])
// repositories.append(repo)
// repo = Repository.instance(dict: ["owner": "danger", "name": "danger"])
// repositories.append(repo)
// repo = Repository.instance(dict: ["owner": "RishabhTayal", "name": "GHReleases"])
// repositories.append(repo)

if let repos = UserDefaults.standard.array(forKey: UserDefaultsKey.Repositories) {
for repoObj in repos {
let repo = Repository.instance(dict: repoObj as! [String : Any])
repositories.append(repo)
}
}

var repo = Repository.init(dict: ["owner": "fastlane", "name": "fastlane"])
repositories.append(repo)
repo = Repository.init(dict: ["owner": "danger", "name": "danger"])
repositories.append(repo)
repo = Repository.init(dict: ["owner": "RishabhTayal", "name": "GHReleases"])
repositories.append(repo)
}

override func viewDidAppear(_ animated: Bool) {
Expand Down Expand Up @@ -73,6 +81,9 @@ extension RepositoriesViewController: UITableViewDataSource, UITableViewDelegate
extension RepositoriesViewController: AddRepositoryVCDelegate {
func addRepositoryVCDidAddRepo(repo: Repository) {
self.repositories.append(repo)
var repos = UserDefaults.standard.array(forKey: UserDefaultsKey.Repositories) ?? []
repos.append(repo.toJSON())
UserDefaults.standard.set(repos, forKey: UserDefaultsKey.Repositories)
self.tableView.reloadData()
}
}
17 changes: 13 additions & 4 deletions GHReleases/Repository.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,23 @@
//

import Foundation
import ObjectMapper

class Repository {
class Repository: Mappable {

var owner: String!
var name: String!

init(dict: [String: Any]) {
self.owner = dict["owner"] as! String
self.name = dict["name"] as! String
required init?(map: Map) {

}

func mapping(map: Map) {
self.owner <- map["owner"]
self.name <- map["name"]
}

class func instance(dict: [String: Any]) -> Repository {
return Mapper<Repository>().map(JSON: dict)!
}
}
3 changes: 3 additions & 0 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '10.0'
use_frameworks!

inhibit_all_warnings!

target :GHReleases do
pod 'MWFeedParser'
pod 'R.swift'
pod 'ObjectMapper'
end
5 changes: 4 additions & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,22 @@ PODS:
- MWFeedParser/NSString+HTML
- MWFeedParser/NSDate+InternetDateTime (1.0.1)
- MWFeedParser/NSString+HTML (1.0.1)
- ObjectMapper (2.2.7)
- R.swift (3.3.0):
- R.swift.Library (~> 3.0.2)
- R.swift.Library (3.0.2)

DEPENDENCIES:
- MWFeedParser
- ObjectMapper
- R.swift

SPEC CHECKSUMS:
MWFeedParser: 2cf646014c1baf6ad1b08c480b40a08180079247
ObjectMapper: 65abcfd9a61cf7396cbd14a4fb22fddfcc46577e
R.swift: bde9704d50ff36820f49e266bc88ef545e1e9b36
R.swift.Library: fbdec16c9802ad104fc1ba53415dc190e6ec5c73

PODFILE CHECKSUM: a176ad53e3eb99217ada985bb632afe644ead60b
PODFILE CHECKSUM: c0ba69497fa0d2e021327d71ba94f3e0d42eb4bf

COCOAPODS: 1.2.1

0 comments on commit 75ed5a9

Please sign in to comment.