Read day-of-week sprite atlas and display correctly

OtaClock/Images.xcassets/bubble.imageset/Contents.json

@@ -3,7 +3,7 @@
     {
       "idiom" : "universal",
       "scale" : "1x",
-      "filename" : "bubble.png"
+      "filename" : "bubbleTest.png"
     },
     {
       "idiom" : "universal",

OtaClock/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>147</string>
+	<string>162</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

OtaClock/MainView.m

@@ -6,6 +6,7 @@
 //  Copyright (c) 2015 xythobuz. All rights reserved.
 //
 
+#import "Render.h"
 #import "MainWindow.h"
 #import "MainView.h"
 
@@ -18,7 +19,7 @@
 @synthesize render;
 
 -(void)awakeFromNib {
-    render = [[Render alloc] init];
+    render = [[Render alloc] initWithParent:self];
     [(MainWindow*)[self window] setDefaultBackgroundSize:[render baseSize]]; // Set window to a useful default size
 }
 

OtaClock/MainWindow.m

@@ -117,16 +117,24 @@
     if (startScale == 4) [self.changeSize4 setState:NSOnState];
     if (startScale == 5) [self.changeSize5 setState:NSOnState];
     
-    [[self.mainView render] drawWith:lastEyeState]; // Initialize render image
+    [[self.mainView render] drawWithEye:lastEyeState]; // Initialize render image
     [self unblink]; // Schedule next blinking
     
+    // Start time keeping
+    [NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(updateTime:) userInfo:nil repeats:YES];
+    [self updateTime:nil];
+    
     [self setFrame:frame display:YES];
 }
 
+- (void)updateTime:(id)sender {
+    [[self.mainView render] drawWithDate:[NSDate date]];
+}
+
 - (void)blink {
     if (currentlyBlinking == NO) {
         currentlyBlinking = YES;
-        [[self.mainView render] drawWith:EYE_BLINK];
+        [[self.mainView render] drawWithEye:EYE_BLINK];
         self.mainView.needsDisplay = YES;
     }
     
@@ -136,7 +144,7 @@
 - (void)unblink {
     if (currentlyBlinking == YES) {
         currentlyBlinking = NO;
-        [[self.mainView render] drawWith:lastEyeState];
+        [[self.mainView render] drawWithEye:lastEyeState];
         self.mainView.needsDisplay = YES;
     }
     
@@ -271,7 +279,7 @@
     if (eyeState != lastEyeState) {
         lastEyeState = eyeState;
         if (currentlyBlinking == NO) {
-            [[self.mainView render] drawWith:lastEyeState];
+            [[self.mainView render] drawWithEye:lastEyeState];
             self.mainView.needsDisplay = YES;
         }
     }

OtaClock/Render.h

@@ -8,12 +8,15 @@
 
 #import <Cocoa/Cocoa.h>
 
+@class MainView;
+
 @interface Render : NSObject
 
-- (id)init;
+- (id)initWithParent:(MainView *)par;
 - (NSSize)baseSize;
 
-- (void)drawWith:(NSInteger)eyeIndex;
+- (void)drawWithDate:(NSDate *)date;
+- (void)drawWithEye:(NSInteger)eyeIndex;
 - (void)drawInto:(NSView *)view;
 
 @end

OtaClock/Render.m

@@ -6,6 +6,7 @@
 //  Copyright (c) 2015 xythobuz. All rights reserved.
 //
 
+#import "MainView.h"
 #import "Render.h"
 
 #define FULL_IMAGE_WIDTH 86
@@ -15,25 +16,36 @@
 #define EYE_X_OFFSET 60
 #define EYE_Y_OFFSET 45
 
+#define FONT_DAYS_WIDTH 17
+#define FONT_DAYS_HEIGHT 3
+#define FONT_DAYS_PADDING 1
+#define FONT_DAYS_X_OFFSET 31
+#define FONT_DAYS_Y_OFFSET 72
+
 @interface Render ()
 
-@property (assign) CGImageRef otaconGraphic;
-@property (assign) CGImageRef bubbleGraphic;
+@property (assign) CGImageRef otaconGraphic, bubbleGraphic;
 @property (assign) CGImageRef eye0, eye1, eye2, eye3, eye4;
+@property (assign) CGImageRef fontMonday, fontTuesday, fontWednesday, fontThursday, fontFriday, fontSaturday, fontSunday;
+@property (assign) NSInteger eyeToDraw, dayOfWeek;
 
 @property (assign) NSSize fullSize;
 @property (assign) CGContextRef drawContext;
 
+@property (weak) MainView *parent;
+
 @end
 
 @implementation Render
 
-@synthesize otaconGraphic;
-@synthesize bubbleGraphic;
+@synthesize otaconGraphic, bubbleGraphic;
 @synthesize eye0, eye1, eye2, eye3, eye4;
+@synthesize fontMonday, fontTuesday, fontWednesday, fontThursday, fontFriday, fontSaturday, fontSunday;
+@synthesize eyeToDraw, dayOfWeek;
 
 @synthesize fullSize;
 @synthesize drawContext;
+@synthesize parent;
 
 - (CGImageRef)eyeHelper:(NSInteger)index {
     if (index == 0) return eye0;
@@ -46,10 +58,26 @@
     return eye0;
 }
 
-- (id)init {
+- (CGImageRef)dayHelper:(NSInteger)index {
+    if (index == -1) return fontSunday;
+    if (index == 0) return fontMonday;
+    if (index == 1) return fontTuesday;
+    if (index == 2) return fontWednesday;
+    if (index == 3) return fontThursday;
+    if (index == 4) return fontFriday;
+    if (index == 5) return fontSaturday;
+    if (index == 6) return fontSunday;
+    
+    NSLog(@"Render:dayHelper:%ld unknown index!", (long)index);
+    return fontMonday;
+}
+
+- (id)initWithParent:(MainView *)par {
     self = [super init];
     if (self == nil) return nil;
     
+    parent = par;
+    
     NSImage *otaconImage = [NSImage imageNamed:@"otacon"];
     NSImage *bubbleImage = [NSImage imageNamed:@"bubble"];
     NSImage *eye0Image = [NSImage imageNamed:@"eyes_0"];
@@ -57,6 +85,7 @@
     NSImage *eye2Image = [NSImage imageNamed:@"eyes_2"];
     NSImage *eye3Image = [NSImage imageNamed:@"eyes_3"];
     NSImage *eye4Image = [NSImage imageNamed:@"eyes_4"];
+    NSImage *fontDaysImage = [NSImage imageNamed:@"font_days"];
     
     NSGraphicsContext *context = [NSGraphicsContext graphicsContextWithAttributes:nil];
     
@@ -68,11 +97,34 @@
     eye3 = [eye3Image CGImageForProposedRect:nil context:context hints:nil];
     eye4 = [eye4Image CGImageForProposedRect:nil context:context hints:nil];
     
+    CGImageRef fontDays = [fontDaysImage CGImageForProposedRect:nil context:context hints:nil];
+    NSRect rectDay;
+    rectDay.size.width = FONT_DAYS_WIDTH;
+    rectDay.size.height = FONT_DAYS_HEIGHT;
+    rectDay.origin.x = 0;
+    rectDay.origin.y = 0;
+    fontMonday = CGImageCreateWithImageInRect(fontDays, rectDay);
+    rectDay.origin.y += FONT_DAYS_HEIGHT + FONT_DAYS_PADDING;
+    fontTuesday = CGImageCreateWithImageInRect(fontDays, rectDay);
+    rectDay.origin.y += FONT_DAYS_HEIGHT + FONT_DAYS_PADDING;
+    fontWednesday = CGImageCreateWithImageInRect(fontDays, rectDay);
+    rectDay.origin.y += FONT_DAYS_HEIGHT + FONT_DAYS_PADDING;
+    fontThursday = CGImageCreateWithImageInRect(fontDays, rectDay);
+    rectDay.origin.y += FONT_DAYS_HEIGHT + FONT_DAYS_PADDING;
+    fontFriday = CGImageCreateWithImageInRect(fontDays, rectDay);
+    rectDay.origin.y += FONT_DAYS_HEIGHT + FONT_DAYS_PADDING;
+    fontSaturday = CGImageCreateWithImageInRect(fontDays, rectDay);
+    rectDay.origin.y += FONT_DAYS_HEIGHT + FONT_DAYS_PADDING;
+    fontSunday = CGImageCreateWithImageInRect(fontDays, rectDay);
+    
     fullSize.width = FULL_IMAGE_WIDTH;
     fullSize.height = FULL_IMAGE_HEIGHT;
     
     drawContext = CGBitmapContextCreate(NULL, fullSize.width, fullSize.height, 8, 0, CGColorSpaceCreateDeviceRGB(), kCGImageAlphaPremultipliedLast | kCGBitmapByteOrderDefault);
     
+    eyeToDraw = 0;
+    dayOfWeek = 0;
+    
     return self;
 }
 
@@ -80,10 +132,24 @@
     return fullSize;
 }
 
-- (void)drawWith:(NSInteger)eyeIndex {
-    CGRect size;
+- (void)drawWithDate:(NSDate *)date {
+    NSDateComponents *components = [[NSCalendar currentCalendar] components:NSWeekdayCalendarUnit fromDate:date];
+    dayOfWeek = [components weekday] - 2;
     
+    
+    // Check if something changed, if so, set needsDisplay
+    // if (bla) {
+    //     parent.needsDisplay = YES;
+    // }
+}
+
+- (void)drawWithEye:(NSInteger)eyeIndex {
+    eyeToDraw = eyeIndex;
+}
+
+- (void)drawInto:(NSView *)view {
     // Clear entire canvas
+    CGRect size;
     size.size = fullSize;
     size.origin = NSZeroPoint;
     CGContextClearRect(drawContext, size);
@@ -94,6 +160,18 @@
     size.origin.y = BUBBLE_Y_OFFSET;
     CGContextDrawImage(drawContext, size, bubbleGraphic);
     
+    // Draw Date
+
+    // Draw Day of Week
+    CGImageRef day = [self dayHelper:dayOfWeek];
+    size.size.width = FONT_DAYS_WIDTH;
+    size.size.height = FONT_DAYS_HEIGHT;
+    size.origin.x = FONT_DAYS_X_OFFSET;
+    size.origin.y = FONT_DAYS_Y_OFFSET;
+    CGContextDrawImage(drawContext, size, day);
+    
+    // Draw Time
+    
     // Draw Otacon
     size.size.width = CGImageGetWidth(otaconGraphic);
     size.size.height = CGImageGetHeight(otaconGraphic);
@@ -102,14 +180,13 @@
     CGContextDrawImage(drawContext, size, otaconGraphic);
     
     // Draw eyes
-    size.size.width = CGImageGetWidth([self eyeHelper:eyeIndex]);
-    size.size.height = CGImageGetHeight([self eyeHelper:eyeIndex]);
+    size.size.width = CGImageGetWidth([self eyeHelper:eyeToDraw]);
+    size.size.height = CGImageGetHeight([self eyeHelper:eyeToDraw]);
     size.origin.x = EYE_X_OFFSET;
     size.origin.y = EYE_Y_OFFSET;
-    CGContextDrawImage(drawContext, size, [self eyeHelper:eyeIndex]);
-}
-
-- (void)drawInto:(NSView *)view {
+    CGContextDrawImage(drawContext, size, [self eyeHelper:eyeToDraw]);
+    
+    // Render resulting canvas into bitmap and scale this into our window
     CGImageRef drawnImage = CGBitmapContextCreateImage(drawContext);
     NSImage *result = [[NSImage alloc] initWithCGImage:drawnImage size:fullSize];
     [result drawInRect:[view bounds] fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0 respectFlipped:NO hints:[NSDictionary dictionaryWithObject:[NSNumber numberWithInteger:NSImageInterpolationNone] forKey:NSImageHintInterpolation]];