added support for form strings on CCL games

akeaswaran · Mar 3, 2020 · b9729b0 · b9729b0
1 parent 0aa4c1a
commit b9729b0
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 31 deletions.
diff --git a/mls-bar/Core/SharedUtils.h b/mls-bar/Core/SharedUtils.h
@@ -24,4 +24,6 @@
 + (NSColor *)pickColorBasedOnContrastWithBackground:(NSColor *)backgroundColor color1:(NSColor *)color1 color2:(NSColor *)color2;
 + (NSComparisonResult)compareEvents:(id)obj1 obj2:(id)obj2;
 + (NSInteger)retrieveCurrentUpdateInterval;
++ (NSAttributedString *)formattedFormString:(NSString *)formString;
++ (NSAttributedString *)formattedFormString:(NSString *)formString extraAttributes:(NSDictionary *)attrs;
 @end
diff --git a/mls-bar/Core/SharedUtils.m b/mls-bar/Core/SharedUtils.m
@@ -17,6 +17,41 @@ + (NSComparisonResult)compareEvents:(id)obj1 obj2:(id)obj2 {
     return [[NSNumber numberWithInteger:[objA[@"id"] integerValue]] compare:[NSNumber numberWithInteger:[objB[@"id"] integerValue]]];
 }
 
++ (NSAttributedString *)formattedFormString:(NSString *)formString {
+    return [self formattedFormString:formString extraAttributes:@{}];
+}
+
++ (NSAttributedString *)formattedFormString:(NSString *)formString extraAttributes:(NSDictionary *)attrs {
+    NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
+    paragraphStyle.alignment = NSTextAlignmentCenter;
+    NSMutableDictionary *attributes = [NSMutableDictionary dictionary];
+    [attributes addEntriesFromDictionary:@{NSParagraphStyleAttributeName : paragraphStyle}];
+    [attributes addEntriesFromDictionary:attrs];
+
+    NSMutableAttributedString *goodText = [[NSMutableAttributedString alloc] initWithString:formString attributes:attributes];
+
+    NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"W|L|D" options:NSRegularExpressionCaseInsensitive error:nil];
+
+    NSArray *arrayOfAllMatches = [regex matchesInString:formString options:0 range:NSMakeRange(0, formString.length)];
+
+    for (NSTextCheckingResult *match in arrayOfAllMatches) {
+        if ([[formString substringWithRange:[match range]] isEqualToString:@"W"]) {
+            [goodText addAttribute:NSForegroundColorAttributeName value:[NSColor systemGreenColor] range:match.range];
+        } else if ([[formString substringWithRange:[match range]] isEqualToString:@"L"]) {
+            [goodText addAttribute:NSForegroundColorAttributeName value:[NSColor systemRedColor] range:match.range];
+        } else {
+            [goodText addAttribute:NSForegroundColorAttributeName value:[NSColor secondaryLabelColor] range:match.range];
+        }
+    }
+
+    if (goodText.length == 0) {
+        goodText = [[NSMutableAttributedString alloc] initWithString:@"N/A" attributes:@{NSForegroundColorAttributeName : [NSColor secondaryLabelColor]}];
+    }
+
+    return goodText;
+}
+
+
 + (NSInteger)retrieveCurrentUpdateInterval {
     NSInteger curUpdateInterval = [[NSUserDefaults standardUserDefaults] integerForKey:DNV_UPDATE_INTERVAL_KEY];
     if (curUpdateInterval <= 0) {

diff --git a/mls-bar/View Controllers/PregameViewController.m b/mls-bar/View Controllers/PregameViewController.m
@@ -208,8 +208,8 @@ - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
         } else if ([stat[@"name"] isEqualToString:@"Recent Form"]) {
             [cellView.homeStatLabel setAlphaValue:1.0];
             [cellView.awayStatLabel setAlphaValue:1.0];
-            [cellView.homeStatLabel setAttributedStringValue:[self formattedFormString:stat[@"homeTeam"][@"value"]]];
-            [cellView.awayStatLabel setAttributedStringValue:[self formattedFormString:stat[@"awayTeam"][@"value"]]];
+            [cellView.homeStatLabel setAttributedStringValue:[SharedUtils formattedFormString:stat[@"homeTeam"][@"value"]]];
+            [cellView.awayStatLabel setAttributedStringValue:[SharedUtils formattedFormString:stat[@"awayTeam"][@"value"]]];
         } else {
             if ([stat[@"homeTeam"][@"value"] intValue] > [stat[@"awayTeam"][@"value"] intValue]) {
                 [cellView.awayStatLabel setTextColor:[NSColor labelColor]];
@@ -272,33 +272,6 @@ - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
     }
 }
 
--(NSAttributedString *)formattedFormString:(NSString *)formString {
-    NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
-    paragraphStyle.alignment = NSTextAlignmentCenter;
-    NSDictionary *attributes = @{NSParagraphStyleAttributeName : paragraphStyle};
-    NSMutableAttributedString *goodText = [[NSMutableAttributedString alloc] initWithString:formString attributes:attributes];
-
-    NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"W|L|D" options:NSRegularExpressionCaseInsensitive error:nil];
-
-    NSArray *arrayOfAllMatches = [regex matchesInString:formString options:0 range:NSMakeRange(0, formString.length)];
-
-    for (NSTextCheckingResult *match in arrayOfAllMatches) {
-        if ([[formString substringWithRange:[match range]] isEqualToString:@"W"]) {
-            [goodText addAttribute:NSForegroundColorAttributeName value:[NSColor systemGreenColor] range:match.range];
-        } else if ([[formString substringWithRange:[match range]] isEqualToString:@"L"]) {
-            [goodText addAttribute:NSForegroundColorAttributeName value:[NSColor systemRedColor] range:match.range];
-        } else {
-            [goodText addAttribute:NSForegroundColorAttributeName value:[NSColor secondaryLabelColor] range:match.range];
-        }
-    }
-
-    if (goodText.length == 0) {
-        goodText = [[NSMutableAttributedString alloc] initWithString:@"N/A" attributes:@{NSForegroundColorAttributeName : [NSColor secondaryLabelColor]}];
-    }
-
-    return goodText;
-}
-
 -(BOOL)tableView:(NSTableView *)tableView shouldSelectRow:(NSInteger)row {
     return NO;
 }

diff --git a/mls-bar/View Controllers/ScoresViewController.m b/mls-bar/View Controllers/ScoresViewController.m
@@ -228,7 +228,9 @@ - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
 
         [cellView.awayRecordLabel setStringValue:[NSString stringWithFormat:@"%@ %@ (%@)", [item.awayCompetitor points], awayPtsNoun, item.awayCompetitor.records[0][@"summary"]]];
     } else {
-        [cellView.awayRecordLabel setStringValue:[NSString stringWithFormat:@"Form: %@", item.awayCompetitor.form]];
+        NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
+        paragraphStyle.alignment = NSTextAlignmentRight;
+        [cellView.awayRecordLabel setAttributedStringValue:[SharedUtils formattedFormString:[NSString stringWithFormat:@"Form: %@", item.awayCompetitor.form] extraAttributes:@{NSParagraphStyleAttributeName : paragraphStyle}]];
     }
 
     if (item.homeCompetitor.records[0][@"summary"] != nil) {
@@ -239,7 +241,9 @@ - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
 
         [cellView.homeRecordLabel setStringValue:[NSString stringWithFormat:@"%@ %@ (%@)", [item.homeCompetitor points], homePtsNoun, item.homeCompetitor.records[0][@"summary"]]];
     } else {
-        [cellView.homeRecordLabel setStringValue:[NSString stringWithFormat:@"Form: %@", item.homeCompetitor.form]];
+        NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
+        paragraphStyle.alignment = NSTextAlignmentLeft;
+        [cellView.homeRecordLabel setAttributedStringValue:[SharedUtils formattedFormString:[NSString stringWithFormat:@"Form: %@", item.homeCompetitor.form] extraAttributes:@{NSParagraphStyleAttributeName : paragraphStyle}]];
     }
 
 
@@ -259,6 +263,8 @@ - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
         [cellView.statusField setStringValue:[item.startDate formattedDateWithFormat:@"h:mm a"]];
     } else if (item.status == GameStateFinal && [item.statusDescription containsString:@"45"]) {
         [cellView.statusField setStringValue:@"HT"];
+    } else if (item.status == GameStateFinal && [item.statusDescription containsString:@"9"]) {
+        [cellView.statusField setStringValue:@"FT"];
     } else {
         [cellView.statusField setStringValue:item.statusDescription];
     }