consistent brace style

nonomal · Nov 13, 2018 · e217786 · e217786
1 parent 37d22fa
commit e217786
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 34 deletions.
diff --git a/app/AboutViewController.m b/app/AboutViewController.m
@@ -25,8 +25,7 @@ - (void)viewDidLoad {
     [self _updatePreferenceUI];
 }
 
-- (void)dealloc
-{
+- (void)dealloc {
     [self _removeObservers];
 }
 

diff --git a/app/TerminalViewController.m b/app/TerminalViewController.m
@@ -70,15 +70,13 @@ - (void)viewDidLoad {
     }
 }
 
-- (void)dealloc
-{
+- (void)dealloc {
     @try {
         [[UserPreferences shared] removeObserver:self forKeyPath:@"theme"];
     } @catch (NSException * __unused exception) {}
 }
 
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
-{
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
     if (object == [UserPreferences shared]) {
         [UIView animateWithDuration:0.1 animations:^{
             self.view.backgroundColor = ThemeBackgroundColor([UserPreferences shared].theme);

diff --git a/app/ThemeViewController.m b/app/ThemeViewController.m
@@ -26,15 +26,13 @@ - (void)viewDidLoad {
     [[UserPreferences shared] addObserver:self forKeyPath:@"theme" options:NSKeyValueObservingOptionNew context:nil];
 }
 
-- (void)dealloc
-{
+- (void)dealloc {
     @try {
         [[UserPreferences shared] removeObserver:self forKeyPath:@"theme"];
     } @catch (NSException * __unused exception) {}
 }
 
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
-{
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
     [self.tableView reloadData];
 }
 
@@ -56,8 +54,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
     return 0;
 }
 
-- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
-{
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
     if (section == 1) {
         return @"Preview";
     }

diff --git a/app/UserPreferences.m b/app/UserPreferences.m
@@ -60,13 +60,11 @@ UIStatusBarStyle ThemeStatusBar(UserPreferenceTheme theme) {
     }
 }
 
-@implementation UserPreferences
-{
+@implementation UserPreferences {
     NSUserDefaults *_defaults;
 }
 
-+ (instancetype)shared
-{
++ (instancetype)shared {
     static UserPreferences *shared = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
@@ -75,47 +73,39 @@ + (instancetype)shared
     return shared;
 }
 
-- (instancetype)init
-{
+- (instancetype)init {
     self = [super init];
     if (self) {
         _defaults = [NSUserDefaults standardUserDefaults];
     }
     return self;
 }
 
-- (BOOL)mapCapsLockAsControl
-{
+- (BOOL)mapCapsLockAsControl {
     return [_defaults boolForKey:kPreferenceMapCapsLockAsControlKey] ?: NO;
 }
 
-- (void)setMapCapsLockAsControl:(BOOL)mapCapsLockAsControl
-{
+- (void)setMapCapsLockAsControl:(BOOL)mapCapsLockAsControl {
     [_defaults setBool:mapCapsLockAsControl forKey:kPreferenceMapCapsLockAsControlKey];
 }
 
-- (NSNumber *)fontSize
-{
+- (NSNumber *)fontSize {
     return [_defaults objectForKey:kPreferenceFontSizeKey] ?: @(12);
 }
 
-- (void)setFontSize:(NSNumber *)fontSize
-{
+- (void)setFontSize:(NSNumber *)fontSize {
     [_defaults setObject:fontSize forKey:kPreferenceFontSizeKey];
 }
 
-- (UserPreferenceTheme)theme
-{
+- (UserPreferenceTheme)theme {
     return [_defaults integerForKey:kPreferenceThemeKey] ?: UserPreferenceThemeLight;
 }
 
-- (void)setTheme:(UserPreferenceTheme)theme
-{
+- (void)setTheme:(UserPreferenceTheme)theme {
     [_defaults setInteger:theme forKey:kPreferenceThemeKey];
 }
 
-- (NSString *)JSONDictionary
-{
+- (NSString *)JSONDictionary {
     NSDictionary *dict = @{
                            @"mapCapsLockAsControl": @(self.mapCapsLockAsControl),
                            @"fontSize": self.fontSize,
@@ -125,8 +115,7 @@ - (NSString *)JSONDictionary
     return [[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:dict options:0 error:nil] encoding:NSUTF8StringEncoding];
 }
 
--(NSString *)_hexFromUIColor:(UIColor *)color
-{
+-(NSString *)_hexFromUIColor:(UIColor *)color {
     const CGFloat *components = CGColorGetComponents(color.CGColor);
     size_t count = CGColorGetNumberOfComponents(color.CGColor);