Revert "Just having some fun"

This reverts commit 89148da.

Conflicts:
	lib/CodeFramework

Author: thedillonb

CodeHub.iOS/Images/Images.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using MonoTouch.Foundation;
 using MonoTouch.UIKit;
-using System.Collections.Generic;
 
 namespace CodeHub.iOS
 {
@@ -21,99 +20,48 @@ public static UIImage FromFileAuto(string path)
             var template = img.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate);
             return template;
         }
-
-        public static UIImage WithTint(this UIImage img, UIColor color)
-        {
-            UIGraphics.BeginImageContextWithOptions(img.Size, false, img.CurrentScale);
-            var context = UIGraphics.GetCurrentContext();
-            context.TranslateCTM(0, img.Size.Height);
-            context.ScaleCTM(1.0f, -1.0f);
-            context.SetBlendMode(MonoTouch.CoreGraphics.CGBlendMode.Normal);
-            var rect = new System.Drawing.RectangleF(0, 0, img.Size.Width, img.Size.Height);
-            context.ClipToMask(rect, img.CGImage);
-            color.SetFill();
-            context.FillRect(rect);
-            var i = UIGraphics.GetImageFromCurrentImageContext();
-            UIGraphics.EndImageContext();
-            return i;
-        }
-
-        private static readonly Dictionary<string, UIImage> _retainedImages = new Dictionary<string, UIImage>();
-        public static UIImage LoadTemplateImage(string path, UIColor color, bool retain = true)
-        {
-            if (_retainedImages.ContainsKey(path))
-                return _retainedImages[path];
-
-            using (var img = UIImageHelper.FromFileAuto(path))
-            {
-                using (var template = img.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate))
-                {
-                    var tintedImage = template.WithTint(color);
-                    if (retain)
-                        _retainedImages.Add(path, tintedImage);
-                    return tintedImage;
-                }
-            }
-        }
 
         public static UIImage Merge { get { return FromBundle("/Images/merge"); } }
+        public static UIImage Language { get { return FromBundle("/Images/language"); } }
         public static UIImage Webpage { get { return FromBundle("/Images/webpage"); } }
-
+        public static UIImage Repo { get { return FromBundle("/Images/repo"); } }
+        public static UIImage Size { get { return FromBundle("/Images/size"); } }
+        public static UIImage Locked { get { return FromBundle("/Images/locked"); } }
+        public static UIImage Unlocked { get { return FromBundle("/Images/unlocked"); } }
+        public static UIImage Heart { get { return FromBundle("/Images/heart"); } }
+        public static UIImage Fork { get { return FromBundle("/Images/fork"); } }
         public static UIImage Pencil { get { return FromBundle("/Images/pencil"); } }
         public static UIImage Tag { get { return FromBundle("/Images/tag"); } }
+        public static UIImage Comments { get { return FromBundle("/Images/comments"); } }
+        public static UIImage BinClosed { get { return FromBundle("/Images/bin_closed"); } }
         public static UIImage Milestone { get { return FromBundle("/Images/milestone"); } }
         public static UIImage Script { get { return FromBundle("/Images/script"); } }
-
-        public static UIImage Create { get { return FromBundle("/Images/create"); } }
-
-        public static UIImage File { get { return LoadTemplateImage("Images/file", UIColor.FromRGB(44, 62, 80)); } }
-
-        public static UIImage Following { get { return LoadTemplateImage("Images/following", UIColor.FromRGB(192, 57, 43)); } }
-        public static UIImage Folder { get { return LoadTemplateImage("Images/folder", UIColor.FromRGB(243, 156, 18)); } }
-
-        public static UIImage BinClosed { get { return LoadTemplateImage("Images/bin_closed", UIColor.FromRGB(231, 76, 60)); } }
+        public static UIImage Commit { get { return FromBundle("/Images/commit"); } }
+        public static UIImage Following { get { return FromBundle("/Images/following"); } }
+        public static UIImage Folder { get { return FromBundle("/Images/folder"); } }
+        public static UIImage File { get { return FromBundle("/Images/file"); } }
+        public static UIImage Branch { get { return FromBundle("/Images/branch"); } }
+        public static UIImage Create { get { return FromBundle("/Images/create"); } }
 
-        public static UIImage Comments { get { return LoadTemplateImage("Images/comments", UIColor.FromRGB(142, 68, 173)); } }
-        public static UIImage Heart { get { return LoadTemplateImage("Images/heart", UIColor.FromRGB(231, 76, 60)); } }
-
-        public static UIImage Repo { get { return LoadTemplateImage("Images/repo", UIColor.FromRGB(52, 73, 94)); } }
-        public static UIImage Branch { get { return LoadTemplateImage("Images/branch", UIColor.FromRGB(0x6c, 0xc6, 0x44)); } }
-
-        public static UIImage Language { get { return LoadTemplateImage("Images/language", UIColor.FromRGB(52, 73, 94)); } }
-        public static UIImage Size { get { return LoadTemplateImage("Images/size", UIColor.FromRGB(41, 128, 185)); } }
-
-        public static UIImage Locked { get { return LoadTemplateImage("Images/locked", UIColor.FromRGB(241, 196, 15), false); } }
-        public static UIImage Unlocked { get { return LoadTemplateImage("Images/unlocked", UIColor.FromRGB(241, 196, 15), false); } }
-
-        public static UIImage Commit { get { return LoadTemplateImage("Images/commit", UIColor.FromRGB(0x15, 0x6f, 0x9e)); } }
-        public static UIImage Fork { get { return LoadTemplateImage("Images/fork", UIColor.FromRGB(0x6c, 0xc6, 0x44)); } }
-        public static UIImage Issue { get { return LoadTemplateImage("Images/flag", UIColor.FromRGB(0x6c, 0xc6, 0x44)); } }
-        public static UIImage Hand { get { return LoadTemplateImage("Images/hand", UIColor.FromRGB(0x9e, 0x15, 0x7c)); } }
-
-        public static UIImage Star { get { return LoadTemplateImage("Images/star",  UIColor.FromRGB(241, 196, 15)); } }
-
-        public static UIImage User { get { return LoadTemplateImage("Images/user", UIColor.FromRGB(52, 152, 219)); } }
-        public static UIImage Priority { get { return LoadTemplateImage("Images/priority", UIColor.FromRGB(243, 156, 18)); } }
-        public static UIImage Cog { get { return LoadTemplateImage("Images/cog", UIColor.FromRGB(44, 62, 80)); } }
-
-        public static UIImage Eye { get { return LoadTemplateImage("Images/eye", UIColor.FromRGB(22, 160, 133)); } }
-
-        public static UIImage Event { get { return LoadTemplateImage("Images/events", UIColor.FromRGB(192, 57, 43)); } }
-
-        public static UIImage Group { get { return LoadTemplateImage("Images/group", UIColor.FromRGB(39, 174, 96)); } }
+        public static UIImage Info { get { return FromBundle("/Images/info"); } }
 
+        public static UIColor IssueColor { get { return UIColor.FromRGB(0x6c, 0xc6, 0x44); } }
+        public static UIImage Issue { get { return FromBundle("/Images/flag"); } }
 
+        public static UIImage User { get { return FromBundle("/Images/user"); } }
+        public static UIImage Explore { get { return FromBundle("/Images/explore"); } }
+        public static UIImage Group { get { return FromBundle("/Images/group"); } }
+        public static UIImage Event { get { return FromBundle("/Images/events"); } }
+        public static UIImage Cog { get { return FromBundle("/Images/cog"); } }
+        public static UIImage Star { get { return FromBundle("/Images/star"); } }
+        public static UIImage News { get { return FromBundle("/Images/news"); } }
+        public static UIImage Notifications { get { return FromBundle("/Images/notifications"); } }
+        public static UIImage Priority { get { return FromBundle("/Images/priority"); } }
         public static UIImage Anonymous { get { return FromBundle("/Images/anonymous"); } }
 
-
-
         public static UIImage Team { get { return FromFileAuto("Images/team"); } }
-
-        //These only appear in the menu
-        public static UIImage News { get { return FromFileAuto("Images/news"); } }
-        public static UIImage Info { get { return FromFileAuto("Images/info"); } }
-        public static UIImage Explore { get { return FromFileAuto("Images/explore"); } }
-        public static UIImage Notifications { get { return FromFileAuto("Images/notifications"); } }
+        public static UIImage Eye { get { return FromFileAuto("Images/eye"); } }
+        public static UIImage Hand { get { return FromFileAuto("Images/hand"); } }
         public static UIImage Bug { get { return FromFileAuto("Images/bug"); } }