Some style edits:

- Added braces to oneliner ifs. - Replaced weird negative if check with "== NO" instead. - Whitespace edits.
superjohan · Nov 8, 2015 · ffd41d0 · ffd41d0
1 parent 9078442
commit ffd41d0
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 8 deletions.
diff --git a/Classes/AbstractCircle.m b/Classes/AbstractCircle.m
@@ -27,8 +27,10 @@ - (void)animateToPoint:(CGPoint)point withDuration:(NSTimeInterval)duration
 
 - (void)moveCircleWithDelta:(NSTimeInterval)delta
 {
-	if ( ! self.animating)
+	if (self.animating == NO)
+	{
 		return;
+	}
 
 	self.currentTime += delta;
 

diff --git a/Classes/Circle.m b/Classes/Circle.m
@@ -21,6 +21,7 @@ - (id)initWithFrame:(CGRect)frame
 		self.savedCenter = self.center;
 		self.savedFrame = frame;
     }
+
     return self;
 }
 

diff --git a/Classes/CircloAppDelegate.m b/Classes/CircloAppDelegate.m
@@ -16,7 +16,7 @@ @implementation CircloAppDelegate
 
 - (void)_createUserDefaults
 {
-	if ( ! [[NSUserDefaults standardUserDefaults] boolForKey:kCircloUserDefaultsAppHasLaunchedBefore])
+	if ([[NSUserDefaults standardUserDefaults] boolForKey:kCircloUserDefaultsAppHasLaunchedBefore] == NO)
 	{
 		[[NSUserDefaults standardUserDefaults] setBool:YES forKey:kCircloUserDefaultsAppHasLaunchedBefore];
 		[[NSUserDefaults standardUserDefaults] setBool:YES forKey:kCircloUserDefaultsSoundEnabled];

diff --git a/Classes/CircloViewController.m b/Classes/CircloViewController.m
@@ -39,21 +39,29 @@ @implementation CircloViewController
 - (NSString *)_buttonTextForTag:(NSInteger)tag
 {
 	if (tag < kMaxHoursTag)
+	{
 		return [NSString stringWithFormat:@"%ld", kMaxHoursTag - tag];
+	}
 
 	if (tag == kAMTag)
+	{
 		return NSLocalizedString(@"AM", nil);
+	}
 
 	if (tag == kPMTag)
+	{
 		return NSLocalizedString(@"PM", nil);
+	}
 
 	return [NSString stringWithFormat:@"%ld", tag];
 }
 
 - (void)_layoutHours:(NSInteger)hrs
 {
 	if (self.hours == hrs)
+	{
 		return;
+	}
 
 	BOOL afternoon = NO;
 	if (hrs == 0)
@@ -65,17 +73,23 @@ - (void)_layoutHours:(NSInteger)hrs
 		afternoon = YES;
 
 		if (hrs > 12)
+		{
 			hrs = hrs - 12;
+		}
 	}
 
 	for (NSInteger i = 1; i < kMaxHoursTag; i++)
 	{
 		PulseCircleView *circ = (PulseCircleView *)[self.view viewWithTag:kMaxHoursTag - i];
 
 		if (i <= hrs)
+		{
 			[circ show];
+		}
 		else
+		{
 			[circ hide];
+		}
 	}
 
 	PulseCircleView *amCircle = (PulseCircleView *)[self.view viewWithTag:kAMTag];
@@ -97,7 +111,9 @@ - (void)_layoutHours:(NSInteger)hrs
 - (void)_layoutMinutes:(NSInteger)mins
 {
 	if (self.minutes == mins)
+	{
 		return;
+	}
 
 	NSInteger rightNumber = mins % 10;
 	NSInteger leftNumber = (mins - rightNumber) / 10;
@@ -132,9 +148,13 @@ - (void)_layoutMinutes:(NSInteger)mins
 		else
 		{
 			if (i <= rightNumber - 1)
+			{
 				[circ show];
+			}
 			else
+			{
 				[circ hide];
+			}
 		}
 	}
 
@@ -169,7 +189,9 @@ - (void)_updateClock:(NSTimer *)timer
 - (void)_startTimer
 {
 	if (self.timer)
+	{
 		return;
+	}
 
 	[UIApplication sharedApplication].idleTimerDisabled = YES;
 
@@ -227,13 +249,19 @@ - (void)_fadeOutStartupImage
 	__block UIImageView *startupImageView = nil;
 
 	if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad)
+	{
 		startupImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Default-Portrait"]];
+	}
 	else
 	{
 		if (self.view.frame.size.height > 480.0)
+		{
 			startupImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Default-568h"]];
+		}
 		else
+		{
 			startupImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Default"]];
+		}
 	}
 
 	startupImageView.frame = CGRectMake(0, 0, startupImageView.image.size.width, startupImageView.image.size.height);
@@ -303,8 +331,7 @@ - (void)viewDidLoad
 
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation 
 {
-    return (interfaceOrientation == UIInterfaceOrientationPortrait ||
-			interfaceOrientation == UIInterfaceOrientationPortraitUpsideDown);
+    return (interfaceOrientation == UIInterfaceOrientationPortrait || interfaceOrientation == UIInterfaceOrientationPortraitUpsideDown);
 }
 
 - (void)dealloc 

diff --git a/Classes/ColorSchemeManager.m b/Classes/ColorSchemeManager.m
@@ -26,9 +26,13 @@ + (ColorScheme *)getSavedColorScheme
 	CircloColorSchemeType schemeType = [[NSUserDefaults standardUserDefaults] integerForKey:kCircloUserDefaultsColorScheme];
 
 	if (schemeType == CircloColorSchemeNone || schemeType >= CircloColorSchemeMax)
+	{
 		return [[self class] changeToColorScheme:CircloColorScheme1];
+	}
 	else
+	{
 		return [[ColorScheme alloc] initWithColorScheme:schemeType];
+	}
 }
 
 @end
diff --git a/Classes/LayoutManager.m b/Classes/LayoutManager.m
@@ -24,9 +24,13 @@ + (void)createClockLayoutInView:(UIView *)view
 	CGFloat circleSize = 0;
 
 	if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad)
+	{
 		circleSize = iPadCircleSize;
+	}
 	else
+	{
 		circleSize = iPhoneCircleSize;
+	}
 
 	CGFloat xPadding = (view.bounds.size.width - (5 * circleSize)) / 2.0;
 	CGFloat yPadding = (view.bounds.size.height - (6 * circleSize)) / 2.0;
@@ -98,9 +102,13 @@ + (void)createUnanimatedCircleLayoutInView:(UIView *)view
 	CGFloat circleSize = 0;
 
 	if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad)
+	{
 		circleSize = iPadCircleSize;
+	}
 	else
+	{
 		circleSize = iPhoneCircleSize;
+	}
 
 	for (NSInteger i = 0; i < 10; i++)
 	{

diff --git a/Classes/MenuView.m b/Classes/MenuView.m
@@ -30,7 +30,9 @@ @implementation MenuView
 - (void)_overlayButtonTouched:(id)sender
 {
 	if ([self.delegate respondsToSelector:@selector(overlayButtonTouchedInMenuView:)])
+	{
 		[self.delegate overlayButtonTouchedInMenuView:self];
+	}
 }
 
 - (void)_setSoundSelection
@@ -59,9 +61,13 @@ - (void)_setColorScheme:(ColorScheme *)scheme
 		PulseCircleView *circle = (PulseCircleView *)[self viewWithTag:i];
 
 		if (i == scheme.colorSchemeType)
+		{
 			circle.selected = YES;
+		}
 		else
+		{
 			circle.selected = NO;
+		}
 	}
 
 	[self _setSoundSelection];
@@ -74,7 +80,9 @@ - (void)touchUpInCircleView:(PulseCircleView *)circleView
 	if (circleView.tag > 0 && circleView.tag < 6)
 	{
 		if ([self.delegate respondsToSelector:@selector(menuView:changedToColorScheme:)])
+		{
 			[self _setColorScheme:[self.delegate menuView:self changedToColorScheme:circleView.tag]];
+		}
 	}
 
 	if (circleView.tag == kSoundCircleTag)

diff --git a/Classes/PulseCircleView.m b/Classes/PulseCircleView.m
@@ -94,7 +94,9 @@ - (void)_performAnimation
 - (void)_touchUpInside
 {
 	if ([self.delegate respondsToSelector:@selector(touchUpInCircleView:)])
+	{
 		[self.delegate touchUpInCircleView:self];
+	}
 
 	[self startAnimation];
 }
@@ -143,7 +145,9 @@ - (id)initWithFrame:(CGRect)frame title:(NSString *)titleText button:(BOOL)butto
 			[self addSubview:self.button];
 
 			if (titleText)
+			{
 				[self.button setTitle:titleText forState:UIControlStateNormal];
+			}
 		}
 
 		self.opaque = NO;
@@ -160,10 +164,14 @@ - (id)initWithFrame:(CGRect)frame title:(NSString *)titleText button:(BOOL)butto
 - (void)startAnimation
 {
 	if (self.timer || self.circleHidden)
+	{
 		return;
+	}
 
 	if (self.frequency < 0.001)
+	{
 		self.frequency = kDefaultFrequency;
+	}
 
 	[self _performAnimation];
 
@@ -174,7 +182,9 @@ - (void)startAnimation
 - (void)stopAnimation
 {
 	if (self.circleHidden)
+	{
 		return;
+	}
 
 	if (self.timer)
 	{
@@ -186,7 +196,9 @@ - (void)stopAnimation
 - (void)hide
 {
 	if (self.circleHidden)
+	{
 		return;
+	}
 
 	[self stopAnimation];
 	[self _performHide];
@@ -196,8 +208,10 @@ - (void)hide
 
 - (void)show
 {
-	if ( ! self.circleHidden)
+	if (self.circleHidden == NO)
+	{
 		return;
+	}
 
 	[self _forceCircleDisplay];
 	[self _performShow];
@@ -208,7 +222,9 @@ - (void)show
 - (void)resetImmediately
 {
 	if (self.circleHidden)
+	{
 		return;
+	}
 
 	[self stopAnimation];
 

diff --git a/Classes/ReactiveCircleView.m b/Classes/ReactiveCircleView.m
@@ -22,8 +22,10 @@ - (double)_distanceFromPoint:(CGPoint)originPoint toPoint:(CGPoint)destinationPo
 	double b = destinationPoint.y - originPoint.y;
 	double c = sqrt(pow(a, 2) + pow(b, 2));
 
-	if (c == 0) 
+	if (c == 0)
+	{
 		return 0.00001; // this is only to prevent a division by zero
+	}
 
 	return c;
 }
@@ -50,11 +52,13 @@ - (void)_moveCircle:(AbstractCircle *)circle inReactionToPoint:(CGPoint)point
 	CGPoint newPoint = CGPointMake(x, y);
 
 	if (fabs(newPoint.x - circle.center.x) < 0.000001 && fabs(newPoint.y - circle.center.y) < 0.000001)
+	{
 		return;
+	}
 
 	circle.center = newPoint;
 
-	if ( ! [circle isKindOfClass:[PulseCircleView class]])
+	if ([circle isKindOfClass:[PulseCircleView class]] == NO)
 	{
 		CGFloat sizeRatio = (distance / maxDistance) < 1 ? (distance / maxDistance) : 1;
 
@@ -65,12 +69,16 @@ - (void)_moveCircle:(AbstractCircle *)circle inReactionToPoint:(CGPoint)point
 - (void)_returnCircleToNormal:(AbstractCircle *)circle
 {
 	if (fabs(circle.savedCenter.x - circle.center.x) < 0.000001 && fabs(circle.savedCenter.y - circle.center.y) < 0.000001)
+	{
 		return;
+	}
 
 	circle.center = circle.savedCenter;
 
-	if ( ! [circle isKindOfClass:[PulseCircleView class]])
+	if ([circle isKindOfClass:[PulseCircleView class]] == NO)
+	{
 		circle.frame = CGRectMake(circle.savedFrame.origin.x, circle.savedFrame.origin.y, circle.savedFrame.size.width, circle.savedFrame.size.height);
+	}
 }
 
 - (void)_moveCirclesInReactionToPoint:(CGPoint)point

diff --git a/Classes/SoundManager.m b/Classes/SoundManager.m
@@ -60,7 +60,9 @@ + (void)loadSounds
 + (void)playSound:(CircloSoundType)soundType number:(NSInteger)number
 {
 	if ([[NSUserDefaults standardUserDefaults] boolForKey:kCircloUserDefaultsSoundEnabled])
+	{
 		[[SimpleAudioEngine sharedEngine] playEffect:[NSString stringWithFormat:@"%ld-%ld.caf", soundType, number]];
+	}
 }
 
 + (void)toggleSound
@@ -81,15 +83,21 @@ + (BOOL)soundOn
 + (void)playBackgroundSound
 {
 	if ([[self class] soundOn])
+	{
 		[[SimpleAudioEngine sharedEngine] playBackgroundMusic:@"bg.m4a" loop:YES];
+	}
 	else
+	{
 		[[SimpleAudioEngine sharedEngine] stopBackgroundMusic];
+	}
 }
 
 + (void)updateBackgroundMusicVolumeWithHours:(NSInteger)hours minutes:(NSInteger)minutes
 {
 	if (hours > 12)
+	{
 		hours = hours - 12;
+	}
 
 	double firstDecimal = (double)hours / 12.0;
 	double secondDecimal = (hours < 12) ? ((double)minutes / 60.0) / 10.0 : 0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ - (id)initWithFrame:(CGRect)frame @@
     		self.savedCenter = self.center;
     		self.savedFrame = frame;
         }
         return self;
     }
@@ Expand Down @@