Prepare Dark theme - Move the customization in `customizeViewRenderin…

…g` method. element-hq/riot-meta#22
matrix-org · Aug 7, 2017 · 7a91913 · 7a91913
1 parent 1fb2a74
commit 7a91913
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 38 deletions.
diff --git a/MatrixKit/Views/DeviceView/MXKDeviceView.m b/MatrixKit/Views/DeviceView/MXKDeviceView.m
@@ -60,13 +60,6 @@ - (void)awakeFromNib
     [tap setDelegate:self];
     [self.bgView addGestureRecognizer:tap];
 
-    _defaultTextColor = [UIColor blackColor];
-
-    // Add shadow on added view
-    _containerView.layer.cornerRadius = 5;
-    _containerView.layer.shadowOffset = CGSizeMake(0, 1);
-    _containerView.layer.shadowOpacity = 0.5f;
-
     // Localize string
     [_cancelButton setTitle:[NSBundle mxk_localizedStringForKey:@"ok"] forState:UIControlStateNormal];
     [_cancelButton setTitle:[NSBundle mxk_localizedStringForKey:@"ok"] forState:UIControlStateHighlighted];
@@ -86,6 +79,22 @@ - (void)layoutSubviews
     self.textView.contentOffset = CGPointZero;
 }
 
+#pragma mark - Override MXKView
+
+-(void)customizeViewRendering
+{
+    [super customizeViewRendering];
+
+    _defaultTextColor = [UIColor blackColor];
+
+    // Add shadow on added view
+    _containerView.layer.cornerRadius = 5;
+    _containerView.layer.shadowOffset = CGSizeMake(0, 1);
+    _containerView.layer.shadowOpacity = 0.5f;
+}
+
+#pragma mark -
+
 - (void)removeFromSuperviewDidUpdate:(BOOL)isUpdated
 {
     if (currentAlert)

diff --git a/MatrixKit/Views/EncryptionInfoView/MXKEncryptionInfoView.m b/MatrixKit/Views/EncryptionInfoView/MXKEncryptionInfoView.m
@@ -54,8 +54,6 @@ - (void)awakeFromNib
 {
     [super awakeFromNib];
 
-    _defaultTextColor = [UIColor blackColor];
-
     // Localize string
     [_cancelButton setTitle:[NSBundle mxk_localizedStringForKey:@"ok"] forState:UIControlStateNormal];
     [_cancelButton setTitle:[NSBundle mxk_localizedStringForKey:@"ok"] forState:UIControlStateHighlighted];
@@ -83,6 +81,17 @@ - (void)removeFromSuperview
     [super removeFromSuperview];
 }
 
+#pragma mark - Override MXKView
+
+-(void)customizeViewRendering
+{
+    [super customizeViewRendering];
+
+    _defaultTextColor = [UIColor blackColor];
+}
+
+#pragma mark -
+
 - (instancetype)initWithEvent:(MXEvent*)event andMatrixSession:(MXSession*)session
 {
     NSArray *nibViews = [[NSBundle bundleForClass:[MXKEncryptionInfoView class]] loadNibNamed:NSStringFromClass([MXKEncryptionInfoView class])

diff --git a/MatrixKit/Views/MXKImageView.m b/MatrixKit/Views/MXKImageView.m
@@ -1,5 +1,6 @@
 /*
  Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
  
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -58,28 +59,6 @@ @implementation MXKImageView
 
 #define CUSTOM_IMAGE_VIEW_BUTTON_WIDTH 100
 
-- (void)awakeFromNib
-{
-    [super awakeFromNib];
-
-    self.backgroundColor = [UIColor blackColor];
-    self.contentMode = UIViewContentModeScaleAspectFit;
-    self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleTopMargin;
-}
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-    {
-        self.backgroundColor = [UIColor blackColor];
-        self.contentMode = UIViewContentModeScaleAspectFit;
-        self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleTopMargin;
-    }
-
-    return self;
-}
-
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -101,6 +80,20 @@ - (void)dealloc
     pieChartView = nil;
 }
 
+#pragma mark - Override MXKView
+
+-(void)customizeViewRendering
+{
+    [super customizeViewRendering];
+
+    self.backgroundColor = [UIColor blackColor];
+
+    self.contentMode = UIViewContentModeScaleAspectFit;
+    self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleTopMargin;
+}
+
+#pragma mark -
+
 - (void)startActivityIndicator
 {
     // create the views if they don't exist

diff --git a/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.m b/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.m
@@ -93,12 +93,6 @@ - (void)awakeFromNib
     // Finalize setup
     [self setTranslatesAutoresizingMaskIntoConstraints: NO];
 
-    // Reset default container background color
-    messageComposerContainer.backgroundColor = [UIColor clearColor];
-
-    // Set default toolbar background color
-    self.backgroundColor = [UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1.0];
-
     // Disable send button
     self.rightInputToolbarButton.enabled = NO;
 
@@ -116,6 +110,21 @@ - (void)dealloc
     [self destroy];
 }
 
+#pragma mark - Override MXKView
+
+-(void)customizeViewRendering
+{
+    [super customizeViewRendering];
+
+    // Reset default container background color
+    messageComposerContainer.backgroundColor = [UIColor clearColor];
+
+    // Set default toolbar background color
+    self.backgroundColor = [UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1.0];
+}
+
+#pragma mark -
+
 - (IBAction)onTouchUpInside:(UIButton*)button
 {
     if (button == self.leftInputToolbarButton)

diff --git a/MatrixKit/Views/RoomTitle/MXKRoomTitleView.m b/MatrixKit/Views/RoomTitle/MXKRoomTitleView.m
@@ -41,7 +41,6 @@ - (void)awakeFromNib
     [super awakeFromNib];
 
     [self setTranslatesAutoresizingMaskIntoConstraints: NO];
-    self.autoresizingMask = UIViewAutoresizingFlexibleWidth;
 
     // Add an accessory view to the text view in order to retrieve keyboard view.
     inputAccessoryView = [[UIView alloc] initWithFrame:CGRectZero];
@@ -62,6 +61,17 @@ - (void)dealloc
     inputAccessoryView = nil;
 }
 
+#pragma mark - Override MXKView
+
+-(void)customizeViewRendering
+{
+    [super customizeViewRendering];
+
+    self.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+}
+
+#pragma mark -
+
 - (void)refreshDisplay
 {
     if (_mxRoom)