refactor: Use new icons in app

2021-03-21 12:36:22 +01:00
parent 10eaee71f8
commit b52e050dd6
433 changed files with 1150 additions and 2287 deletions
@@ -41,9 +41,9 @@ class EQNMapAnnotationPastquake: NSObject, MKAnnotation {
    
    private static func image(for intensity: Int) -> UIImage? {
        switch intensity {
-        case 0: return UIImage(named: "star_white")
-        case 1: return UIImage(named: "star_lightblue")
-        case 2: return UIImage(named: "star_blue")
+        case 0: return UIImage(named: "star_realtime_white")
+        case 1: return UIImage(named: "star_realtime_lightblue")
+        case 2: return UIImage(named: "star_realtime_blue")
        default: return nil
        }
    }
@@ -73,6 +73,6 @@ class EQNMapAnnotationSeismic: NSObject, MKAnnotation {
        default: icon = ""
        }
        
-        return UIImage(named: "\(icon)_\(color)2")
+        return UIImage(named: "\(icon)_\(color)")
    }
 }
@@ -41,9 +41,9 @@ class EQNMapAnnotationUserReport: NSObject, MKAnnotation {
    
    private static func image(for magnitute: Int) -> UIImage? {
        switch magnitute {
-        case 1: return UIImage(named: "star_green")
-        case 2: return UIImage(named: "star_yellow")
-        case 3: return UIImage(named: "star_red")
+        case 1: return UIImage(named: "star_report_green")
+        case 2: return UIImage(named: "star_report_yellow")
+        case 3: return UIImage(named: "star_report_red")
        default: return nil
        }
    }
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "circle_green.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "circle_green2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "circle_purple.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "circle_purple2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "circle_red.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "circle_red2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "circle_white.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "circle_white2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "circle_yellow.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "circle_yellow2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,19 +1,8 @@
 {
  "images" : [
-    {
-      "filename" : "dyamond_green-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "dyamond_green-2.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
    {
      "filename" : "dyamond_green.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "dyamond_green2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "dyamond_purple.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "dyamond_purple2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,19 +1,8 @@
 {
  "images" : [
-    {
-      "filename" : "dyamond_red-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "dyamond_red-2.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
    {
      "filename" : "dyamond_red.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "dyamond_red2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "dyamond_round_green.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "dyamond_round_green2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "dyamond_round_purple.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "dyamond_round_purple2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "dyamond_round_red.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "dyamond_round_red2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "dyamond_round_white.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "dyamond_round_white2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "dyamond_round_yellow.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "dyamond_round_yellow2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "dyamond_white.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "dyamond_white2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,19 +1,8 @@
 {
  "images" : [
-    {
-      "filename" : "dyamond_yellow-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "dyamond_yellow-2.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
    {
      "filename" : "dyamond_yellow.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "dyamond_yellow2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "esa_green2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "esa_purple2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "esa_red2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "esa_white2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "esa_yellow2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ese_green.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ese_purple.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ese_red.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ese_white.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ese_yellow.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "oct_green.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "oct_green2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "oct_purple.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "oct_purple2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "oct_red.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "oct_red2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/Show More
+++ b/Show More