celian-m

#Merge using strategie
git checkout --ours ( --theirs ) filename

#Restart merge
git checkout -m FILE

celian-m

Adopting Clean Swift : http://clean-swift.com/clean-swift-ios-architecture/

Adopting RxSwift : https://github.com/ReactiveX/RxSwift

Marble RX Diagrams : http://rxmarbles.com/

Swift Package Manager iOS : https://gist.github.com/nathanborror/4ecb16bcb1ae0bd11e7eed043c6cd8bd [ Not tested ]

celian-m

//
//  Style.swift
//  Mouce
//
//  Created by Célian MOUTAFIS on 22/07/2016.
//  Copyright © 2016 mouce. All rights reserved.
//  mouce.fr

import Foundation
import UIKit

celian-m

import Foundation

public struct IdentityAndTrust {
    public var identityRef:SecIdentity
    public var trust:SecTrust
    public var certArray:NSArray
}

public func extractIdentity(certData:NSData, certPassword:String) -> IdentityAndTrust {
    

celian-m

import PlaygroundSupport


PlaygroundPage.current.needsIndefiniteExecution = true
PlaygroundPage.current.finishExecution()

celian-m

class CustomLayout : UICollectionViewFlowLayout {
    
    
    required init?(coder aDecoder: NSCoder) {
        super.init(coder: aDecoder)
        self.itemSize = CGSize(width: itemWidth, height: itemWidth)
        self.scrollDirection = .horizontal
        self.minimumLineSpacing = 0
        

celian-m

import UIKit

struct ImageCache {
    
    
    private var cache : [URL : Data] = [:]
    static var worker : ImageCache = {
            return ImageCache()
    }()
    static func addToCache(url : URL, data : Data) {

celian-m

    private func saveToFile(string : String, url : String, method : String) {
        guard let dir = NSFileManager.defaultManager().URLsForDirectory(NSSearchPathDirectory.DocumentDirectory, inDomains: NSSearchPathDomainMask.UserDomainMask).last else { return }
        guard let fileurl =  dir.URLByAppendingPathComponent("log.txt") else { return }
        
        let dateFormatter = NSDateFormatter()
        dateFormatter.dateFormat = "yyyy-MM-dd' 'HH:mm:ssZZZZZ"
        let string = dateFormatter.stringFromDate(NSDate()) + " [" + method + "] " + url + "\n" + string + "\n"
        let data = string.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
        
        if NSFileManager.defaultManager().fileExistsAtPath(fileurl.path!) {

celian-m

//
//  SuperViewController.swift
//  Mouce
//
//  Created by Célian MOUTAFIS on 15/06/2016.
//  Copyright © 2016 Célian MOUTAFIS. All rights reserved.
//

import Foundation
import UIKit

celian-m

//
//  CoreDataController.swift
//
//
//  Created by Célian MOUTAFIS on 26/04/2016.
//  Copyright © 2016 mouce. All rights reserved.
//

import Foundation