Realm Migration

presto95 · Mar 13, 2019 · 9ea427a · 9ea427a
1 parent deda29a
commit 9ea427a
Show file tree

Hide file tree

Showing 8 changed files with 144 additions and 149 deletions.
diff --git a/...U/Resources/Assets.xcassets/colors/mission/technika3/crewChallenge.colorset/Contents.json b/...U/Resources/Assets.xcassets/colors/mission/technika3/crewChallenge.colorset/Contents.json
@@ -9,10 +9,10 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "1.000",
+          "red" : "118",
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000"
+          "blue" : "164",
+          "green" : "117"
         }
       }
     }

diff --git a/RespectU/Resources/Assets.xcassets/colors/mission/technika3/popMixing.colorset/Contents.json b/RespectU/Resources/Assets.xcassets/colors/mission/technika3/popMixing.colorset/Contents.json
@@ -9,10 +9,10 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "1.000",
+          "red" : "107",
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000"
+          "blue" : "138",
+          "green" : "124"
         }
       }
     }

diff --git a/...s/colors/portable1.colorset/Contents.json → ...s/series/portable1.colorset/Contents.json b/...s/colors/portable1.colorset/Contents.json → ...s/series/portable1.colorset/Contents.json
@@ -9,10 +9,10 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "0x1D",
+          "red" : "0.114",
           "alpha" : "1.000",
-          "blue" : "0xD2",
-          "green" : "0xB4"
+          "blue" : "0.824",
+          "green" : "0.706"
         }
       }
     }

diff --git a/RespectU/Resources/Assets.xcassets/colors/series/technika3.colorset/Contents.json b/RespectU/Resources/Assets.xcassets/colors/series/technika3.colorset/Contents.json
@@ -9,10 +9,10 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "1.000",
+          "red" : "36",
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000"
+          "blue" : "102",
+          "green" : "66"
         }
       }
     }

diff --git a/RespectU/Resources/SwiftGen/Assets.swift b/RespectU/Resources/SwiftGen/Assets.swift
@@ -48,9 +48,9 @@ internal enum Asset {
   internal static let popMixing = ColorAsset(name: "popMixing")
   internal static let rSide = ColorAsset(name: "rSide")
   internal static let tSide = ColorAsset(name: "tSide")
-  internal static let portable1 = ColorAsset(name: "portable1")
   internal static let bs = ColorAsset(name: "bs")
   internal static let ce = ColorAsset(name: "ce")
+  internal static let portable1 = ColorAsset(name: "portable1")
   internal static let portable2 = ColorAsset(name: "portable2")
   internal static let respect = ColorAsset(name: "respect")
   internal static let technika1 = ColorAsset(name: "technika1")

diff --git a/RespectU/Sources/AppDelegate.swift b/RespectU/Sources/AppDelegate.swift
@@ -23,7 +23,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
       config.fileURL = fileURL.deletingLastPathComponent().appendingPathComponent("new.realm")
       config.schemaVersion = 1
       config.migrationBlock = { migration, oldSchemaVersion in
-        if oldSchemaVersion < 1 {
+        if oldSchemaVersion < 2 {
 
         }
       }

diff --git a/RespectU/Sources/Utils/Utils.swift b/RespectU/Sources/Utils/Utils.swift
@@ -104,6 +104,7 @@ final class Utils {
       return (totalSkillPoint, highestSeries)
     case .button5:
       let sorted = results.sorted(byKeyPath: "button5.skillPoint", ascending: false)
+      print(sorted)
       let totalSkillPoint = sorted[0..<50].map { $0.button5?.skillPoint ?? 0 }.reduce(0, +)
       let highestSeries = Series(rawValue: sorted.first?.series ?? "")
       UserDefaults.standard.do {

diff --git a/RespectU/Sources/ViewControllers/InitViewController.swift b/RespectU/Sources/ViewControllers/InitViewController.swift