Merge branch 'material-icons2' into material-fonts-not-loaded

Sources/iOS/MaterialIcon.swift

@@ -52,38 +52,37 @@ public struct MaterialIcon {
     public static let add: UIImage? = MaterialIcon.icon("ic_add_white")
     public static let arrowBack: UIImage? = MaterialIcon.icon("ic_arrow_back_white")
     public static let arrowDownward: UIImage? = MaterialIcon.icon("ic_arrow_downward_white")
-    public static let clear: UIImage? = MaterialIcon.icon("ic_close_white")
-    public static let close: UIImage? = MaterialIcon.icon("ic_close_white")
-    public static let menu: UIImage? = MaterialIcon.icon("ic_menu_white")
-    public static let moreHorizontal: UIImage? = MaterialIcon.icon("ic_more_horiz_white")
-    public static let moreVertical: UIImage? = MaterialIcon.icon("ic_more_vert_white")
-    public static let search: UIImage? = MaterialIcon.icon("ic_search_white")
-    public static let share: UIImage? = MaterialIcon.icon("ic_share_white")
-    public static let star: UIImage? = MaterialIcon.icon("ic_star_white")
-    public static let videocam: UIImage? = MaterialIcon.icon("ic_videocam_white")
-    
     public static let addCircle: UIImage? = MaterialIcon.icon("ic_add_circle_white")
     public static let addCircleOutline: UIImage? = MaterialIcon.icon("ic_add_circle_outline_white")
     public static let audio: UIImage? = MaterialIcon.icon("ic_audiotrack_white")
+    public static let bell: UIImage? = MaterialIcon.icon("cm_bell_white")
+    public static let clear: UIImage? = MaterialIcon.icon("ic_close_white")
+    public static let close: UIImage? = MaterialIcon.icon("ic_close_white")
     public static let edit: UIImage? = MaterialIcon.icon("ic_edit_white")
     public static let history: UIImage? = MaterialIcon.icon("ic_history_white")
     public static let image: UIImage? = MaterialIcon.icon("ic_image_white")
+    public static let menu: UIImage? = MaterialIcon.icon("ic_menu_white")
+    public static let moreHorizontal: UIImage? = MaterialIcon.icon("ic_more_horiz_white")
+    public static let moreVertical: UIImage? = MaterialIcon.icon("ic_more_vert_white")
     public static let movie: UIImage? = MaterialIcon.icon("ic_movie_white")
     public static let pen: UIImage? = MaterialIcon.icon("ic_edit_white")
     public static let place: UIImage? = MaterialIcon.icon("ic_place_white")
     public static let photoCamera: UIImage? = MaterialIcon.icon("ic_photo_camera_white")
     public static let photoLibrary: UIImage? = MaterialIcon.icon("ic_photo_library_white")
+    public static let search: UIImage? = MaterialIcon.icon("ic_search_white")
     public static let settings: UIImage? = MaterialIcon.icon("ic_settings_white")
+    public static let share: UIImage? = MaterialIcon.icon("ic_share_white")
+    public static let star: UIImage? = MaterialIcon.icon("ic_star_white")
     public static let starBorder: UIImage? = MaterialIcon.icon("ic_star_border_white")
     public static let starHalf: UIImage? = MaterialIcon.icon("ic_star_half_white")
-    
-    //Compatibility Material icons
-    public static let bell: UIImage? = MaterialIcon.icon("cm_bell_white")
+    public static let videocam: UIImage? = MaterialIcon.icon("ic_videocam_white")
     public static let video: UIImage? = MaterialIcon.icon("cm_video_white")
-
+    
 	/// Custom CosmicMind icons.
     public struct cm {
-		public static let add: UIImage? = MaterialIcon.icon("cm_add_white")
+        public static let add: UIImage? = MaterialIcon.icon("cm_add_white")
+        public static let addCircle: UIImage? = MaterialIcon.icon("ic_add_circle_white")
+        public static let addCircleOutline: UIImage? = MaterialIcon.icon("ic_add_circle_outline_white")
 		public static let arrowBack: UIImage? = MaterialIcon.icon("cm_arrow_back_white")
 		public static let arrowDownward: UIImage? = MaterialIcon.icon("cm_arrow_downward_white")
 		public static let audio: UIImage? = MaterialIcon.icon("cm_audio_white")
@@ -91,28 +90,23 @@ public struct MaterialIcon {
 		public static let clear: UIImage? = MaterialIcon.icon("cm_close_white")
         public static let close: UIImage? = MaterialIcon.icon("cm_close_white")
         public static let edit: UIImage? = MaterialIcon.icon("cm_pen_white")
-		public static let image: UIImage? = MaterialIcon.icon("cm_image_white")
+        public static let image: UIImage? = MaterialIcon.icon("cm_image_white")
+        public static let history: UIImage? = MaterialIcon.icon("ic_history_white")
 		public static let menu: UIImage? = MaterialIcon.icon("cm_menu_white")
 		public static let moreHorizontal: UIImage? = MaterialIcon.icon("cm_more_horiz_white")
-		public static let moreVertical: UIImage? = MaterialIcon.icon("cm_more_vert_white")
-		public static let pen: UIImage? = MaterialIcon.icon("cm_pen_white")
+        public static let moreVertical: UIImage? = MaterialIcon.icon("cm_more_vert_white")
+        public static let movie: UIImage? = MaterialIcon.icon("ic_movie_white")
+        public static let pen: UIImage? = MaterialIcon.icon("cm_pen_white")
+        public static let place: UIImage? = MaterialIcon.icon("ic_place_white")
 		public static let photoCamera: UIImage? = MaterialIcon.icon("cm_photo_camera_white")
 		public static let photoLibrary: UIImage? = MaterialIcon.icon("cm_photo_library_white")
 		public static let search: UIImage? = MaterialIcon.icon("cm_search_white")
 		public static let settings: UIImage? = MaterialIcon.icon("cm_settings_white")
 		public static let share: UIImage? = MaterialIcon.icon("cm_share_white")
-		public static let star: UIImage? = MaterialIcon.icon("cm_star_white")
-		public static let video: UIImage? = MaterialIcon.icon("cm_video_white")
-		public static let videocam: UIImage? = MaterialIcon.icon("cm_videocam_white")
-        
-        
-        //Compatibility CosmicMind icons
-        public static let addCircle: UIImage? = MaterialIcon.icon("ic_add_circle_white")
-        public static let addCircleOutline: UIImage? = MaterialIcon.icon("ic_add_circle_outline_white")
-        public static let history: UIImage? = MaterialIcon.icon("ic_history_white")
-        public static let movie: UIImage? = MaterialIcon.icon("ic_movie_white")
-        public static let place: UIImage? = MaterialIcon.icon("ic_place_white")
+        public static let star: UIImage? = MaterialIcon.icon("cm_star_white")
         public static let starBorder: UIImage? = MaterialIcon.icon("ic_star_border_white")
         public static let starHalf: UIImage? = MaterialIcon.icon("ic_star_half_white")
+		public static let video: UIImage? = MaterialIcon.icon("cm_video_white")
+		public static let videocam: UIImage? = MaterialIcon.icon("cm_videocam_white")
 	}
 }