From 57ee6039fd3af09106fad1e83c22cb3c3795da6f Mon Sep 17 00:00:00 2001 From: Nate Armstrong Date: Sat, 21 Feb 2015 15:52:16 -0700 Subject: [PATCH 1/5] add initWithCoder: --- .../CLWeeklyCalendarView.m | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m b/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m index 3f9ddc5..db64f45 100644 --- a/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m +++ b/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m @@ -76,13 +76,27 @@ - (id)initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; if (self) { - // Initialization code - [self addSubview:self.backgroundImageView]; - self.arrDailyWeather = @{}; + [self setup]; } return self; } +- (instancetype)initWithCoder:(NSCoder *)coder +{ + self = [super initWithCoder:coder]; + if (self) { + [self setup]; + } + return self; +} + +- (void)setup +{ + // Initialization code + [self addSubview:self.backgroundImageView]; + self.arrDailyWeather = @{}; +} + -(void)setDelegate:(id)delegate { _delegate = delegate; From dbb4d14f9679e907e10b38bdb6057d705c6a5e3d Mon Sep 17 00:00:00 2001 From: Nate Armstrong Date: Sun, 22 Feb 2015 00:24:12 -0700 Subject: [PATCH 2/5] support auto layout- set frames in layoutSubviews --- .../CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m b/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m index db64f45..983272f 100644 --- a/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m +++ b/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m @@ -97,6 +97,12 @@ - (void)setup self.arrDailyWeather = @{}; } +- (void)layoutSubviews +{ + self.backgroundImageView.frame = self.bounds; + [self initDailyViews]; +} + -(void)setDelegate:(id)delegate { _delegate = delegate; From 5cf0d1d048abc3c9689c1c7d0837e88cd6dac0ae Mon Sep 17 00:00:00 2001 From: Nate Armstrong Date: Sun, 22 Feb 2015 13:48:07 -0700 Subject: [PATCH 3/5] auto layout fixes --- .../CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m b/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m index 983272f..7c38e3c 100644 --- a/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m +++ b/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m @@ -100,6 +100,13 @@ - (void)setup - (void)layoutSubviews { self.backgroundImageView.frame = self.bounds; + CGRect titleSubViewFrame = self.dayTitleSubViewContainer.frame; + titleSubViewFrame.size.width = self.bounds.size.width; + self.dayTitleSubViewContainer.frame = titleSubViewFrame; + + CGRect dailyFrame = self.dailySubViewContainer.frame; + dailyFrame.size.width = self.bounds.size.width; + self.dailySubViewContainer.frame = dailyFrame; [self initDailyViews]; } From 413f597b094e4da3d1d7cd70a77fd948f5953444 Mon Sep 17 00:00:00 2001 From: Nate Armstrong Date: Sun, 22 Feb 2015 14:58:52 -0700 Subject: [PATCH 4/5] call super in layoutSubviews --- .../CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m | 1 + 1 file changed, 1 insertion(+) diff --git a/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m b/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m index 7c38e3c..6293646 100644 --- a/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m +++ b/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m @@ -99,6 +99,7 @@ - (void)setup - (void)layoutSubviews { + [super layoutSubviews]; self.backgroundImageView.frame = self.bounds; CGRect titleSubViewFrame = self.dayTitleSubViewContainer.frame; titleSubViewFrame.size.width = self.bounds.size.width; From d5ff9dfd4ed6aea8256efb5fbeb4886c7298a2ea Mon Sep 17 00:00:00 2001 From: Nate Armstrong Date: Sun, 22 Feb 2015 15:00:58 -0700 Subject: [PATCH 5/5] fix indentation to match context. --- .../CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m b/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m index 6293646..0d1c627 100644 --- a/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m +++ b/CLWeeklyCalendarView/CLWeeklyCalendarViewSourceCode/CLWeeklyCalendarView.m @@ -76,7 +76,7 @@ - (id)initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; if (self) { - [self setup]; + [self setup]; } return self; } @@ -85,7 +85,7 @@ - (instancetype)initWithCoder:(NSCoder *)coder { self = [super initWithCoder:coder]; if (self) { - [self setup]; + [self setup]; } return self; }