Maintenance: Use class extensions where appropriate

XBMC Remote/AppDelegate.m

@@ -12,7 +12,6 @@
 #import "ViewControllerIPad.h"
 #import "GlobalData.h"
 #import "InitialSlidingViewController.h"
-#import "UIImageView+WebCache.h"
 #import "Utilities.h"
 #import "Kodi_Remote-Swift.h"
 

XBMC Remote/BDKCollectionIndexView/BDKCollectionIndexView.m

@@ -171,7 +171,7 @@ - (void)buildIndexLabels {
         if ([indexTitle isEqualToString:@"🔍"]) {
             // Use the same icon as iOS's index (magnifying glass with transparent circle)
             UIImage *searchImage = [UIImage imageNamed:@"icon_search"];
-            searchImage = [Utilities colorizeImage:searchImage withColor:UIColor.systemBlueColor];
+            searchImage = [searchImage colorizeWithColor:UIColor.systemBlueColor];
             UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width, label.font.pointSize)];
             imageView.contentMode = UIViewContentModeScaleAspectFit;
             imageView.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin;
@@ -207,7 +207,7 @@ - (void)setNewIndexForPoint:(CGPoint)point {
 
 - (void)setBackgroundVisibility:(BOOL)flag {
     CGFloat alpha = flag ? 0.3 : 0;
-    self.touchStatusView.backgroundColor = [Utilities getGrayColor:0 alpha:alpha];
+    self.touchStatusView.backgroundColor = [UIColor getGrayColor:0 alpha:alpha];
 }
 
 #pragma mark - Gestures

XBMC Remote/BroadcastProgressView.m

@@ -35,7 +35,7 @@ - (void)createProgressView {
     barLabel.adjustsFontSizeToFitWidth = YES;
     barLabel.minimumScaleFactor = FONT_SCALING_MIN;
     barLabel.textAlignment = NSTextAlignmentRight;
-    barLabel.textColor = [Utilities get1stLabelColor];
+    barLabel.textColor = [UIColor get1stLabelColor];
     [self addSubview:barLabel];
 
     [progressBarView setTrackColor:UIColor.darkGrayColor];

XBMC Remote/ConvenienceMacros.h

@@ -20,29 +20,29 @@
 /*
  * Color defines
  */
-#define APP_TINT_COLOR [Utilities getGrayColor:0 alpha:0.3]
+#define APP_TINT_COLOR [UIColor getGrayColor:0 alpha:0.3]
 #define ICON_TINT_COLOR UIColor.lightGrayColor
 #define ICON_TINT_COLOR_ACTIVE UIColor.systemBlueColor
-#define REMOTE_CONTROL_BAR_TINT_COLOR [Utilities getGrayColor:12 alpha:1]
+#define REMOTE_CONTROL_BAR_TINT_COLOR [UIColor getGrayColor:12 alpha:1]
 #define SLIDER_DEFAULT_COLOR UIColor.lightGrayColor
-#define TOOLBAR_TINT_COLOR [Utilities getGrayColor:38 alpha:0.95]
-#define NAVBAR_TINT_COLOR [Utilities getGrayColor:38 alpha:1.0]
-#define KODI_BLUE_COLOR [Utilities getKodiBlue]
-#define CUSTOM_BUTTON_BACKGROUND [Utilities getGrayColor:25 alpha:1] // Gray:25 is same as the other remote buttons
-#define GRIDVIEW_SECTION_COLOR [Utilities getGrayColor:44 alpha:1.0]
-#define SYSTEMGRAY6_DARKMODE [Utilities getGrayColor:28 alpha:1] // Gray:28 is similar to systemGray6 in Dark Mode
-#define SYSTEMGRAY6_LIGHTMODE [Utilities getGrayColor:242 alpha:1] // Gray:242 is similar to systemGray6 in Light Mode
-#define MAINMENU_SELECTED_COLOR [Utilities getGrayColor:58 alpha:1] // Gray:58 is similar to systemGray4 in Dark Mode
-#define ACTOR_SELECTED_COLOR [Utilities getGrayColor:128 alpha:0.5]
-#define INFO_POPOVER_COLOR [Utilities getGrayColor:0 alpha:0.8]
-#define IPAD_MENU_SEPARATOR [Utilities getGrayColor:77 alpha:0.6]
-#define PLAYLIST_PROGRESSBAR_BACKGROUND_COLOR [Utilities getGrayColor:96 alpha:1.0]
-#define PLAYLIST_PROGRESSBAR_TRACK_COLOR [Utilities getGrayColor:28 alpha:1.0]
-#define FONT_SHADOW_WEAK [Utilities getGrayColor:0 alpha:0.6]
-#define FONT_SHADOW_STRONG [Utilities getGrayColor:0 alpha:0.8]
-#define ERROR_MESSAGE_COLOR [Utilities getSystemRed:0.95]
-#define SUCCESS_MESSAGE_COLOR [Utilities getSystemGreen:0.95]
-#define UI_AVERAGE_DEFAULT_COLOR [Utilities getSystemGray2]
+#define TOOLBAR_TINT_COLOR [UIColor getGrayColor:38 alpha:0.95]
+#define NAVBAR_TINT_COLOR [UIColor getGrayColor:38 alpha:1.0]
+#define KODI_BLUE_COLOR [UIColor getKodiBlue]
+#define CUSTOM_BUTTON_BACKGROUND [UIColor getGrayColor:25 alpha:1] // Gray:25 is same as the other remote buttons
+#define GRIDVIEW_SECTION_COLOR [UIColor getGrayColor:44 alpha:1.0]
+#define SYSTEMGRAY6_DARKMODE [UIColor getGrayColor:28 alpha:1] // Gray:28 is similar to systemGray6 in Dark Mode
+#define SYSTEMGRAY6_LIGHTMODE [UIColor getGrayColor:242 alpha:1] // Gray:242 is similar to systemGray6 in Light Mode
+#define MAINMENU_SELECTED_COLOR [UIColor getGrayColor:58 alpha:1] // Gray:58 is similar to systemGray4 in Dark Mode
+#define ACTOR_SELECTED_COLOR [UIColor getGrayColor:128 alpha:0.5]
+#define INFO_POPOVER_COLOR [UIColor getGrayColor:0 alpha:0.8]
+#define IPAD_MENU_SEPARATOR [UIColor getGrayColor:77 alpha:0.6]
+#define PLAYLIST_PROGRESSBAR_BACKGROUND_COLOR [UIColor getGrayColor:96 alpha:1.0]
+#define PLAYLIST_PROGRESSBAR_TRACK_COLOR [UIColor getGrayColor:28 alpha:1.0]
+#define FONT_SHADOW_WEAK [UIColor getGrayColor:0 alpha:0.6]
+#define FONT_SHADOW_STRONG [UIColor getGrayColor:0 alpha:0.8]
+#define ERROR_MESSAGE_COLOR [UIColor getSystemRed:0.95]
+#define SUCCESS_MESSAGE_COLOR [UIColor getSystemGreen:0.95]
+#define UI_AVERAGE_DEFAULT_COLOR [UIColor getSystemGray2]
 
 /*
  * Dimension and layout macros
@@ -83,4 +83,9 @@
 #define SERVICE_TYPE_TCP @"_xbmc-jsonrpc._tcp"
 #define DOMAIN_NAME @"local"
 
+/*
+ * Rounded edges
+ */
+#define GET_ROUNDED_EDGES_RADIUS(size) MAX(MIN(size.width, size.height) * 0.03, 6.0)
+
 #endif /* ConvenienceMacros_h */

XBMC Remote/DetailViewController.h

@@ -9,7 +9,6 @@
 #import "DSJSONRPC.h"
 #import "jsonDataCell.h"
 #import "ShowInfoViewController.h"
-#import "UIImageView+WebCache.h"
 #import "mainMenu.h"
 #import "MoreItemsViewController.h"
 #import "Utilities.h"