Skip to content

Commit

Permalink
Fixed compilation errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThibaultKlein
ThibaultKlein committed May 1, 2017
1 parent 297970c commit 353d6d5
Show file tree
Hide file tree
Showing 16 changed files with 280 additions and 289 deletions.
18 changes: 10 additions & 8 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,26 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (1.0.1)
cocoapods (1.1.1)
cocoapods (1.2.0)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.1, < 2.0)
cocoapods-core (= 1.1.1)
cocoapods-core (= 1.2.0)
cocoapods-deintegrate (>= 1.0.1, < 2.0)
cocoapods-downloader (>= 1.1.2, < 2.0)
cocoapods-downloader (>= 1.1.3, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.1.1, < 2.0)
cocoapods-trunk (>= 1.1.2, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored (~> 1.2)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
gh_inspector (~> 1.0)
molinillo (~> 0.5.1)
molinillo (~> 0.5.5)
nap (~> 1.0)
xcodeproj (>= 1.3.3, < 2.0)
cocoapods-core (1.1.1)
ruby-macho (~> 0.2.5)
xcodeproj (>= 1.4.1, < 2.0)
cocoapods-core (1.2.0)
activesupport (>= 4.0.2, < 5)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
Expand All @@ -52,6 +53,7 @@ GEM
nanaimo (0.2.3)
nap (1.1.0)
netrc (0.7.8)
ruby-macho (0.2.6)
thread_safe (0.3.6)
tzinfo (1.2.3)
thread_safe (~> 0.1)
Expand All @@ -65,7 +67,7 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (= 1.1.1)
cocoapods (= 1.2.0)

BUNDLED WITH
1.14.4
112 changes: 56 additions & 56 deletions Kumi/Core/Color/ColorTheme.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,133 +10,133 @@ import UIKit

/// Kumi color theme.
public struct ColorTheme {

/// Primary color.
var primary: UIColor?

/// Primary Muted color.
var primaryMuted: UIColor?

/// Primary Faded color.
var primaryFaded: UIColor?

/// Secondary color.
var secondary: UIColor?

/// Secondary Muted color.
var secondaryMuted: UIColor?

/// Secondary Faded color.
var secondaryFaded: UIColor?

/// Tertiary color.
var tertiary: UIColor?

/// Tertiary Muted color.
var tertiaryMuted: UIColor?

/// Tertiary Faded color.
var tertiaryFaded: UIColor?

/// Invert Primary color.
var invertPrimary: UIColor?

/// Invert Primary Muted color.
var invertPrimaryMuted: UIColor?

/// Invert Primary Faded color.
var invertPrimaryFaded: UIColor?

/// Invert Secondary color.
var invertSecondary: UIColor?

/// Invert Secondary Muted color.
var invertSecondaryMuted: UIColor?

/// Invert Secondary Faded color.
var invertSecondaryFaded: UIColor?

/// Invert Tertiary color.
var invertTertiary: UIColor?

/// Invert Tertiary Muted color.
var invertTertiaryMuted: UIColor?

/// Invert Tertiary Faded color.
var invertTertiaryFaded: UIColor?

/// Emphasis Primary color.
var emphasisPrimary: UIColor?

/// Emphasis Primary Muted color.
var emphasisPrimaryMuted: UIColor?

/// Emphasis Primary Faded color.
var emphasisPrimaryFaded: UIColor?

/// Emphasis Secondary color.
var emphasisSecondary: UIColor?

/// Emphasis Secondary Muted color.
var emphasisSecondaryMuted: UIColor?

/// Emphasis Secondary Faded color.
var emphasisSecondaryFaded: UIColor?

/// Emphasis Tertiary color.
var emphasisTertiary: UIColor?

/// Emphasis Tertiary Muted color.
var emphasisTertiaryMuted: UIColor?

/// Emphasis Tertiary Faded color.
var emphasisTertiaryFaded: UIColor?

/// Invert Emphasis Primary color.
var invertEmphasisPrimary: UIColor?

/// Invert Emphasis Primary Muted color.
var invertEmphasisPrimaryMuted: UIColor?

/// Invert Emphasis Primary Faded color.
var invertEmphasisPrimaryFaded: UIColor?

/// Invert Emphasis Secondary color.
var invertEmphasisSecondary: UIColor?

/// Invert Emphasis Secondary Muted color.
var invertEmphasisSecondaryMuted: UIColor?

/// Invert Emphasis Secondary Faded color.
var invertEmphasisSecondaryFaded: UIColor?

/// Invert Emphasis Tertiary color.
var invertEmphasisTertiary: UIColor?

/// Invert Emphasis Tertiary Muted color.
var invertEmphasisTertiaryMuted: UIColor?

/// Invert Emphasis Tertiary Faded color.
var invertEmphasisTertiaryFaded: UIColor?

/// Grayout color.
var grayout: UIColor?

/// Grayout Muted color.
var grayoutMuted: UIColor?

/// Grayout Faded color.
var grayoutFaded: UIColor?

/// Destructive color.
var destructive: UIColor?

/// Destructive Muted color.
var destructiveMuted: UIColor?

/// Destructive Faded color.
var destructiveFaded: UIColor?

public init?(json: JSON) {
if let primaryJSON = json["primary"] as? JSON {
if let normalJSON = primaryJSON["normal"] as? JSON {
Expand All @@ -149,7 +149,7 @@ public struct ColorTheme {
primaryFaded = UIColor(json: fadedJSON)
}
}

if let secondaryJSON = json["secondary"] as? JSON {
if let normalJSON = secondaryJSON["normal"] as? JSON {
secondary = UIColor(json: normalJSON)
Expand All @@ -161,7 +161,7 @@ public struct ColorTheme {
secondaryFaded = UIColor(json: fadedJSON)
}
}

if let tertiaryJSON = json["tertiary"] as? JSON {
if let normalJSON = tertiaryJSON["normal"] as? JSON {
tertiary = UIColor(json: normalJSON)
Expand All @@ -173,7 +173,7 @@ public struct ColorTheme {
tertiaryFaded = UIColor(json: fadedJSON)
}
}

if let invertPrimaryJSON = json["invertPrimary"] as? JSON {
if let normalJSON = invertPrimaryJSON["normal"] as? JSON {
invertPrimary = UIColor(json: normalJSON)
Expand All @@ -185,7 +185,7 @@ public struct ColorTheme {
invertPrimaryFaded = UIColor(json: fadedJSON)
}
}

if let invertSecondaryJSON = json["invertSecondary"] as? JSON {
if let normalJSON = invertSecondaryJSON["normal"] as? JSON {
invertSecondary = UIColor(json: normalJSON)
Expand All @@ -197,7 +197,7 @@ public struct ColorTheme {
invertSecondaryFaded = UIColor(json: fadedJSON)
}
}

if let invertTertiaryJSON = json["invertTertiary"] as? JSON {
if let normalJSON = invertTertiaryJSON["normal"] as? JSON {
invertTertiary = UIColor(json: normalJSON)
Expand All @@ -209,7 +209,7 @@ public struct ColorTheme {
invertTertiaryFaded = UIColor(json: fadedJSON)
}
}

if let emphasisPrimaryJSON = json["emphasisPrimary"] as? JSON {
if let normalJSON = emphasisPrimaryJSON["normal"] as? JSON {
emphasisPrimary = UIColor(json: normalJSON)
Expand All @@ -221,7 +221,7 @@ public struct ColorTheme {
emphasisPrimaryFaded = UIColor(json: fadedJSON)
}
}

if let emphasisSecondaryJSON = json["emphasisSecondary"] as? JSON {
if let normalJSON = emphasisSecondaryJSON["normal"] as? JSON {
emphasisSecondary = UIColor(json: normalJSON)
Expand All @@ -233,7 +233,7 @@ public struct ColorTheme {
emphasisSecondaryFaded = UIColor(json: fadedJSON)
}
}

if let emphasisTertiaryJSON = json["emphasisTertiary"] as? JSON {
if let normalJSON = emphasisTertiaryJSON["normal"] as? JSON {
emphasisTertiary = UIColor(json: normalJSON)
Expand All @@ -245,7 +245,7 @@ public struct ColorTheme {
emphasisTertiaryFaded = UIColor(json: fadedJSON)
}
}

if let invertEmphasisPrimaryJSON = json["invertEmphasisPrimary"] as? JSON {
if let normalJSON = invertEmphasisPrimaryJSON["normal"] as? JSON {
invertEmphasisPrimary = UIColor(json: normalJSON)
Expand All @@ -257,7 +257,7 @@ public struct ColorTheme {
invertEmphasisPrimaryFaded = UIColor(json: fadedJSON)
}
}

if let invertEmphasisSecondaryJSON = json["invertEmphasisSecondary"] as? JSON {
if let normalJSON = invertEmphasisSecondaryJSON["normal"] as? JSON {
invertEmphasisSecondary = UIColor(json: normalJSON)
Expand All @@ -269,7 +269,7 @@ public struct ColorTheme {
invertEmphasisSecondaryFaded = UIColor(json: fadedJSON)
}
}

if let invertEmphasisTertiaryJSON = json["invertEmphasisTertiary"] as? JSON {
if let normalJSON = invertEmphasisTertiaryJSON["normal"] as? JSON {
invertEmphasisTertiary = UIColor(json: normalJSON)
Expand All @@ -281,7 +281,7 @@ public struct ColorTheme {
invertEmphasisTertiaryFaded = UIColor(json: fadedJSON)
}
}

if let grayoutJSON = json["grayout"] as? JSON {
if let normalJSON = grayoutJSON["normal"] as? JSON {
grayout = UIColor(json: normalJSON)
Expand All @@ -293,7 +293,7 @@ public struct ColorTheme {
grayoutFaded = UIColor(json: fadedJSON)
}
}

if let destructiveJSON = json["destructive"] as? JSON {
if let normalJSON = destructiveJSON["normal"] as? JSON {
destructive = UIColor(json: normalJSON)
Expand Down
Loading

0 comments on commit 353d6d5

Please sign in to comment.