felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 23:18:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rebranding: replace Vector by Riot everywhere in the git and github repos

Browse Source 
- Rename VectorDesignValues with RiotDesignValues
This commit is contained in:
giomfo
2017-03-08 16:14:41 +01:00
parent 513d71338b
commit 06100684bc
77 changed files with 499 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Riot.xcodeproj/project.pbxproj
View File

@@ -239,7 +239,7 @@
F083BE021E7009ED00A9B29C /* AvatarGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BC111E7009EC00A9B29C /* AvatarGenerator.m */; };
F083BE031E7009ED00A9B29C /* EventFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BC131E7009EC00A9B29C /* EventFormatter.m */; };
F083BE041E7009ED00A9B29C /* Tools.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BC151E7009EC00A9B29C /* Tools.m */; };
F083BE051E7009ED00A9B29C /* VectorDesignValues.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BC171E7009EC00A9B29C /* VectorDesignValues.m */; };
F083BE051E7009ED00A9B29C /* RiotDesignValues.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BC171E7009EC00A9B29C /* RiotDesignValues.m */; };
F083BE061E7009ED00A9B29C /* Vector-Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = F083BC181E7009EC00A9B29C /* Vector-Defaults.plist */; };
F083BE071E7009ED00A9B29C /* AttachmentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BC1B1E7009EC00A9B29C /* AttachmentsViewController.m */; };
F083BE081E7009ED00A9B29C /* AuthenticationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BC1D1E7009EC00A9B29C /* AuthenticationViewController.m */; };
@@ -669,8 +669,8 @@
F083BC131E7009EC00A9B29C /* EventFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EventFormatter.m; sourceTree = "<group>"; };
F083BC141E7009EC00A9B29C /* Tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tools.h; sourceTree = "<group>"; };
F083BC151E7009EC00A9B29C /* Tools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Tools.m; sourceTree = "<group>"; };
F083BC161E7009EC00A9B29C /* VectorDesignValues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VectorDesignValues.h; sourceTree = "<group>"; };
F083BC171E7009EC00A9B29C /* VectorDesignValues.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VectorDesignValues.m; sourceTree = "<group>"; };
F083BC161E7009EC00A9B29C /* RiotDesignValues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RiotDesignValues.h; sourceTree = "<group>"; };
F083BC171E7009EC00A9B29C /* RiotDesignValues.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RiotDesignValues.m; sourceTree = "<group>"; };
F083BC181E7009EC00A9B29C /* Vector-Defaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Vector-Defaults.plist"; sourceTree = "<group>"; };
F083BC1A1E7009EC00A9B29C /* AttachmentsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AttachmentsViewController.h; sourceTree = "<group>"; };
F083BC1B1E7009EC00A9B29C /* AttachmentsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AttachmentsViewController.m; sourceTree = "<group>"; };
@@ -1316,8 +1316,8 @@
F083BC131E7009EC00A9B29C /* EventFormatter.m */,
F083BC141E7009EC00A9B29C /* Tools.h */,
F083BC151E7009EC00A9B29C /* Tools.m */,
F083BC161E7009EC00A9B29C /* VectorDesignValues.h */,
F083BC171E7009EC00A9B29C /* VectorDesignValues.m */,
F083BC161E7009EC00A9B29C /* RiotDesignValues.h */,
F083BC171E7009EC00A9B29C /* RiotDesignValues.m */,
);
path = Utils;
sourceTree = "<group>";
@@ -2218,7 +2218,7 @@
F083BE211E7009ED00A9B29C /* RoomSearchViewController.m in Sources */,
F083BE3E1E7009ED00A9B29C /* RoomIncomingEncryptedAttachmentWithPaginationTitleBubbleCell.m in Sources */,
F083BE071E7009ED00A9B29C /* AttachmentsViewController.m in Sources */,
F083BE051E7009ED00A9B29C /* VectorDesignValues.m in Sources */,
F083BE051E7009ED00A9B29C /* RiotDesignValues.m in Sources */,
F083BE311E7009ED00A9B29C /* DeviceTableViewCell.m in Sources */,
F083BE501E7009ED00A9B29C /* RoomOutgoingEncryptedTextMsgBubbleCell.m in Sources */,
F083BDED1E7009ED00A9B29C /* MXKRoomBubbleTableViewCell+Vector.m in Sources */,

7
Riot/AppDelegate.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2014 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.
@@ -52,7 +53,7 @@
#include <MatrixSDK/MXJingleCallStack.h>
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#define CALL_STATUS_BAR_HEIGHT 44
@@ -272,7 +273,7 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN
NSLog(@"------------------------------\n");
// Define the navigation bar text color
[[UINavigationBar appearance] setTintColor:kVectorColorGreen];
[[UINavigationBar appearance] setTintColor:kRiotColorGreen];
// Customize the localized string table
[NSBundle mxk_customizeLocalizedStringTableName:@"Vector"];
@@ -2327,7 +2328,7 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN
_callStatusBarButton.titleLabel.font = [UIFont boldSystemFontOfSize:17];
}
[_callStatusBarButton setBackgroundColor:kVectorColorGreen];
[_callStatusBarButton setBackgroundColor:kRiotColorGreen];
[_callStatusBarButton addTarget:self action:@selector(presentCallViewController) forControlEvents:UIControlEventTouchUpInside];
// Place button into the new window

9
Riot/Categories/MXKRoomBubbleTableViewCell+Vector.m
View File

@@ -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.
@@ -18,7 +19,7 @@
#import "RoomBubbleCellData.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import <objc/runtime.h>
@@ -52,7 +53,7 @@ NSString *const kMXKRoomBubbleCellVectorEditButtonPressed = @"kMXKRoomBubbleCell
timeLabel.text = [bubbleData.eventFormatter timeStringFromDate:component.date];
timeLabel.textAlignment = NSTextAlignmentRight;
timeLabel.textColor = kVectorTextColorGray;
timeLabel.textColor = kRiotTextColorGray;
if ([UIFont respondsToSelector:@selector(systemFontOfSize:weight:)])
{
timeLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightLight];
@@ -188,7 +189,7 @@ NSString *const kMXKRoomBubbleCellVectorEditButtonPressed = @"kMXKRoomBubbleCell
markPosY,
VECTOR_ROOMBUBBLETABLEVIEWCELL_MARK_WIDTH,
markHeight)];
markerView.backgroundColor = kVectorColorGreen;
markerView.backgroundColor = kRiotColorGreen;
[markerView setTranslatesAutoresizingMaskIntoConstraints:NO];
markerView.accessibilityIdentifier = @"markerView";
@@ -243,7 +244,7 @@ NSString *const kMXKRoomBubbleCellVectorEditButtonPressed = @"kMXKRoomBubbleCell
timeLabel.text = [bubbleData.eventFormatter dateStringFromDate:date withTime:NO];
timeLabel.textAlignment = NSTextAlignmentRight;
timeLabel.textColor = kVectorTextColorGray;
timeLabel.textColor = kRiotTextColorGray;
if ([UIFont respondsToSelector:@selector(systemFontOfSize:weight:)])
{
timeLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightLight];

5
Riot/Model/Room/RoomSearchDataSource.m
View File

@@ -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.
@@ -18,7 +19,7 @@
#import "RoomBubbleCellData.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "MXKRoomBubbleTableViewCell+Vector.h"
@@ -67,7 +68,7 @@
if (cellData)
{
// Highlight the search pattern
[cellData highlightPatternInTextMessage:self.searchText withForegroundColor:kVectorColorGreen andFont:patternFont];
[cellData highlightPatternInTextMessage:self.searchText withForegroundColor:kRiotColorGreen andFont:patternFont];
[cellDataArray insertObject:cellData atIndex:0];
}

5
Riot/Model/RoomList/HomeMessagesSearchDataSource.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -18,7 +19,7 @@
#import "RoomBubbleCellData.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "MXKRoomBubbleTableViewCell+Vector.h"
@@ -58,7 +59,7 @@
if (cellData)
{
// Highlight the search pattern
[cellData highlightPatternInTextMessage:self.searchText withForegroundColor:kVectorColorGreen andFont:patternFont];
[cellData highlightPatternInTextMessage:self.searchText withForegroundColor:kRiotColorGreen andFont:patternFont];
[cellDataArray insertObject:cellData atIndex:0];
}

5
Riot/Model/RoomList/RecentsDataSource.m
View File

@@ -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.
@@ -18,7 +19,7 @@
#import "EventFormatter.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RoomIdOrAliasTableViewCell.h"
#import "DirectoryRecentTableViewCell.h"
@@ -333,7 +334,7 @@
}
sectionHeader = [[UIView alloc] initWithFrame:frame];
sectionHeader.backgroundColor = kVectorColorLightGrey;
sectionHeader.backgroundColor = kRiotColorLightGrey;
if (sectionBitwise)
{

8
Riot/Utils/AvatarGenerator.m
View File

@@ -17,7 +17,7 @@
#import "AvatarGenerator.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation AvatarGenerator
@@ -34,9 +34,9 @@ static UILabel* backgroundLabel = nil;
if (!colorsList)
{
colorsList = [[NSMutableArray alloc] init];
[colorsList addObject:kVectorColorGreen];
[colorsList addObject:kVectorColorLightGreen];
[colorsList addObject:kVectorColorOrange];
[colorsList addObject:kRiotColorGreen];
[colorsList addObject:kRiotColorLightGreen];
[colorsList addObject:kRiotColorOrange];
}
}

17
Riot/Utils/EventFormatter.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "EventFormatter.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@interface EventFormatter ()
{
@@ -45,13 +46,13 @@
localTimeZone = [NSTimeZone localTimeZone];
self.defaultTextColor = kVectorTextColorBlack;
self.subTitleTextColor = kVectorTextColorGray;
self.prefixTextColor = kVectorTextColorGray;
self.bingTextColor = kVectorColorPinkRed;
self.encryptingTextColor = kVectorColorGreen;
self.sendingTextColor = kVectorTextColorGray;
self.errorTextColor = kVectorColorRed;
self.defaultTextColor = kRiotTextColorBlack;
self.subTitleTextColor = kRiotTextColorGray;
self.prefixTextColor = kRiotTextColorGray;
self.bingTextColor = kRiotColorPinkRed;
self.encryptingTextColor = kRiotColorGreen;
self.sendingTextColor = kRiotTextColorGray;
self.errorTextColor = kRiotColorRed;
self.defaultTextFont = [UIFont systemFontOfSize:15];
self.prefixTextFont = [UIFont boldSystemFontOfSize:15];

39
Riot/Utils/VectorDesignValues.h → Riot/Utils/RiotDesignValues.h
View File

@@ -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.
@@ -25,31 +26,31 @@
blue:((float)((rgbValue & 0x0000FF) >> 0))/255.0 \
alpha:1.0]
#pragma mark - Vector Colors
extern UIColor *kVectorColorGreen;
extern UIColor *kVectorColorLightGreen;
extern UIColor *kVectorColorLightGrey;
extern UIColor *kVectorColorSilver;
extern UIColor *kVectorColorOrange;
extern UIColor *kVectorColorPinkRed;
extern UIColor *kVectorColorRed;
#pragma mark - Riot Colors
extern UIColor *kRiotColorGreen;
extern UIColor *kRiotColorLightGreen;
extern UIColor *kRiotColorLightGrey;
extern UIColor *kRiotColorSilver;
extern UIColor *kRiotColorOrange;
extern UIColor *kRiotColorPinkRed;
extern UIColor *kRiotColorRed;
#pragma mark - Vector Text Colors
extern UIColor *kVectorTextColorBlack;
extern UIColor *kVectorTextColorDarkGray;
extern UIColor *kVectorTextColorGray;
#pragma mark - Riot Text Colors
extern UIColor *kRiotTextColorBlack;
extern UIColor *kRiotTextColorDarkGray;
extern UIColor *kRiotTextColorGray;
#pragma mark - Vector Navigation Bar Tint Color
extern UIColor *kVectorNavBarTintColor;
#pragma mark - Riot Navigation Bar Tint Color
extern UIColor *kRiotNavBarTintColor;
#pragma mark - Vector Standard Room Member Power Level
extern NSInteger const kVectorRoomModeratorLevel;
extern NSInteger const kVectorRoomAdminLevel;
#pragma mark - Riot Standard Room Member Power Level
extern NSInteger const kRiotRoomModeratorLevel;
extern NSInteger const kRiotRoomAdminLevel;
/**
`VectorDesignValues` class manages the Vector design parameters
`RiotDesignValues` class manages the Riot design parameters
*/
@interface VectorDesignValues : NSObject
@interface RiotDesignValues : NSObject
// to update the navigation bar buttons color
// [[AppDelegate theDelegate] recentsNavigationController].navigationBar.tintColor = [UIColor greenColor];

63
Riot/Utils/RiotDesignValues.m Normal file
View File

@@ -0,0 +1,63 @@
/*
Copyright 2016 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#import "RiotDesignValues.h"
UIColor *kRiotColorGreen;
UIColor *kRiotColorLightGreen;
UIColor *kRiotColorLightGrey;
UIColor *kRiotColorSilver;
UIColor *kRiotColorOrange;
UIColor *kRiotColorPinkRed;
UIColor *kRiotColorRed;
UIColor *kRiotTextColorBlack;
UIColor *kRiotTextColorDarkGray;
UIColor *kRiotTextColorGray;
UIColor *kRiotNavBarTintColor;
NSInteger const kRiotRoomModeratorLevel = 50;
NSInteger const kRiotRoomAdminLevel = 100;
@implementation RiotDesignValues
+ (void)load
{
[super load];
// Load colors at the app load time for the life of the app
// Colors as defined by the design
kRiotColorGreen = [UIColor colorWithRed:(98.0/255.0) green:(206.0/255.0) blue:(156.0/255.0) alpha:1.0];
kRiotColorLightGrey = [UIColor colorWithRed:(242.0 / 255.0) green:(242.0 / 255.0) blue:(242.0 / 255.0) alpha:1.0];
kRiotColorSilver = [UIColor colorWithRed:(199.0 / 255.0) green:(199.0 / 255.0) blue:(204.0 / 255.0) alpha:1.0];
kRiotColorPinkRed = [UIColor colorWithRed:(255.0 / 255.0) green:(0.0 / 255.0) blue:(100.0 / 255.0) alpha:1.0];
kRiotColorRed = UIColorFromRGB(0xFF4444);
kRiotTextColorBlack = [UIColor colorWithRed:(60.0 / 255.0) green:(60.0 / 255.0) blue:(60.0 / 255.0) alpha:1.0];
kRiotTextColorDarkGray = [UIColor colorWithRed:(74.0 / 255.0) green:(74.0 / 255.0) blue:(74.0 / 255.0) alpha:1.0];
kRiotTextColorGray = [UIColor colorWithRed:(157.0 / 255.0) green:(157.0 / 255.0) blue:(157.0 / 255.0) alpha:1.0];
kRiotNavBarTintColor = kRiotColorLightGrey;
// Colors copied from Vector web
kRiotColorLightGreen = UIColorFromRGB(0x50e2c2);
kRiotColorOrange = UIColorFromRGB(0xf4c371);
}
@end

62
Riot/Utils/VectorDesignValues.m
View File

@@ -1,62 +0,0 @@
/*
Copyright 2016 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#import "VectorDesignValues.h"
UIColor *kVectorColorGreen;
UIColor *kVectorColorLightGreen;
UIColor *kVectorColorLightGrey;
UIColor *kVectorColorSilver;
UIColor *kVectorColorOrange;
UIColor *kVectorColorPinkRed;
UIColor *kVectorColorRed;
UIColor *kVectorTextColorBlack;
UIColor *kVectorTextColorDarkGray;
UIColor *kVectorTextColorGray;
UIColor *kVectorNavBarTintColor;
NSInteger const kVectorRoomModeratorLevel = 50;
NSInteger const kVectorRoomAdminLevel = 100;
@implementation VectorDesignValues
+ (void)load
{
[super load];
// Load colors at the app load time for the life of the app
// Colors as defined by the design
kVectorColorGreen = [UIColor colorWithRed:(98.0/255.0) green:(206.0/255.0) blue:(156.0/255.0) alpha:1.0];
kVectorColorLightGrey = [UIColor colorWithRed:(242.0 / 255.0) green:(242.0 / 255.0) blue:(242.0 / 255.0) alpha:1.0];
kVectorColorSilver = [UIColor colorWithRed:(199.0 / 255.0) green:(199.0 / 255.0) blue:(204.0 / 255.0) alpha:1.0];
kVectorColorPinkRed = [UIColor colorWithRed:(255.0 / 255.0) green:(0.0 / 255.0) blue:(100.0 / 255.0) alpha:1.0];
kVectorColorRed = UIColorFromRGB(0xFF4444);
kVectorTextColorBlack = [UIColor colorWithRed:(60.0 / 255.0) green:(60.0 / 255.0) blue:(60.0 / 255.0) alpha:1.0];
kVectorTextColorDarkGray = [UIColor colorWithRed:(74.0 / 255.0) green:(74.0 / 255.0) blue:(74.0 / 255.0) alpha:1.0];
kVectorTextColorGray = [UIColor colorWithRed:(157.0 / 255.0) green:(157.0 / 255.0) blue:(157.0 / 255.0) alpha:1.0];
kVectorNavBarTintColor = kVectorColorLightGrey;
// Colors copied from Vector web
kVectorColorLightGreen = UIColorFromRGB(0x50e2c2);
kVectorColorOrange = UIColorFromRGB(0xf4c371);
}
@end

5
Riot/ViewController/AttachmentsViewController.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -20,7 +21,7 @@
#import "RageShakeManager.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation AttachmentsViewController
@@ -31,7 +32,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}

20
Riot/ViewController/AuthenticationViewController.m
View File

@@ -24,7 +24,7 @@
#import "RageShakeManager.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@interface AuthenticationViewController ()
{
@@ -58,7 +58,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}
@@ -71,32 +71,32 @@
self.rightBarButtonItem.title = NSLocalizedStringFromTable(@"auth_register", @"Vector", nil);
self.defaultHomeServerUrl = [[NSUserDefaults standardUserDefaults] objectForKey:@"homeserverurl"];
self.homeServerTextField.textColor = kVectorTextColorBlack;
self.homeServerLabel.textColor = kVectorTextColorGray;
self.homeServerTextField.textColor = kRiotTextColorBlack;
self.homeServerLabel.textColor = kRiotTextColorGray;
self.defaultIdentityServerUrl = [[NSUserDefaults standardUserDefaults] objectForKey:@"identityserverurl"];
self.identityServerTextField.textColor = kVectorTextColorBlack;
self.identityServerLabel.textColor = kVectorTextColorGray;
self.identityServerTextField.textColor = kRiotTextColorBlack;
self.identityServerLabel.textColor = kRiotTextColorGray;
self.welcomeImageView.image = [UIImage imageNamed:@"logo"];
[self.submitButton.layer setCornerRadius:5];
self.submitButton.clipsToBounds = YES;
self.submitButton.backgroundColor = kVectorColorGreen;
self.submitButton.backgroundColor = kRiotColorGreen;
[self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_login", @"Vector", nil) forState:UIControlStateNormal];
[self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_login", @"Vector", nil) forState:UIControlStateHighlighted];
self.submitButton.enabled = YES;
[self.skipButton.layer setCornerRadius:5];
self.skipButton.clipsToBounds = YES;
self.skipButton.backgroundColor = kVectorColorGreen;
self.skipButton.backgroundColor = kRiotColorGreen;
[self.skipButton setTitle:NSLocalizedStringFromTable(@"auth_skip", @"Vector", nil) forState:UIControlStateNormal];
[self.skipButton setTitle:NSLocalizedStringFromTable(@"auth_skip", @"Vector", nil) forState:UIControlStateHighlighted];
self.skipButton.enabled = YES;
NSMutableAttributedString *forgotPasswordTitle = [[NSMutableAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"auth_forgot_password", @"Vector", nil)];
[forgotPasswordTitle addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:NSMakeRange(0, forgotPasswordTitle.length)];
[forgotPasswordTitle addAttribute:NSForegroundColorAttributeName value:kVectorColorGreen range:NSMakeRange(0, forgotPasswordTitle.length)];
[forgotPasswordTitle addAttribute:NSForegroundColorAttributeName value:kRiotColorGreen range:NSMakeRange(0, forgotPasswordTitle.length)];
[self.forgotPasswordButton setAttributedTitle:forgotPasswordTitle forState:UIControlStateNormal];
[self.forgotPasswordButton setAttributedTitle:forgotPasswordTitle forState:UIControlStateHighlighted];
@@ -105,7 +105,7 @@
[self.customServersTickButton setImage:[UIImage imageNamed:@"selection_untick"] forState:UIControlStateNormal];
[self.customServersTickButton setImage:[UIImage imageNamed:@"selection_untick"] forState:UIControlStateHighlighted];
NSAttributedString *serverOptionsTitle = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"auth_use_server_options", @"Vector", nil) attributes:@{NSForegroundColorAttributeName : kVectorTextColorGray, NSFontAttributeName: [UIFont systemFontOfSize:14]}];
NSAttributedString *serverOptionsTitle = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"auth_use_server_options", @"Vector", nil) attributes:@{NSForegroundColorAttributeName : kRiotTextColorGray, NSFontAttributeName: [UIFont systemFontOfSize:14]}];
[self.customServersTickButton setAttributedTitle:serverOptionsTitle forState:UIControlStateNormal];
[self.customServersTickButton setAttributedTitle:serverOptionsTitle forState:UIControlStateHighlighted];

11
Riot/ViewController/CallViewController.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -21,7 +22,7 @@
#import "RageShakeManager.h"
#import "AvatarGenerator.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "MXRoom+Vector.h"
@@ -71,7 +72,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}
@@ -102,10 +103,10 @@
[self.endCallButton setImage:[UIImage imageNamed:@"call_hangup_icon"] forState:UIControlStateNormal];
[self.endCallButton setImage:[UIImage imageNamed:@"call_hangup_icon"] forState:UIControlStateHighlighted];
self.callerNameLabel.textColor = kVectorTextColorBlack;
self.callStatusLabel.textColor = kVectorTextColorDarkGray;
self.callerNameLabel.textColor = kRiotTextColorBlack;
self.callStatusLabel.textColor = kRiotTextColorDarkGray;
self.localPreviewContainerView.layer.borderColor = kVectorColorGreen.CGColor;
self.localPreviewContainerView.layer.borderColor = kRiotColorGreen.CGColor;
self.localPreviewContainerView.layer.borderWidth = 2;
self.localPreviewContainerView.layer.cornerRadius = 5;
self.localPreviewContainerView.clipsToBounds = YES;

15
Riot/ViewController/ContactDetailsViewController.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -20,7 +21,7 @@
#import "RoomMemberTitleView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RageShakeManager.h"
@@ -103,7 +104,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}
@@ -123,9 +124,9 @@
actionsArray = [[NSMutableArray alloc] init];
directChatsArray = [[NSMutableArray alloc] init];
self.headerView.backgroundColor = kVectorColorLightGrey;
self.contactNameLabel.textColor = kVectorTextColorBlack;
self.contactStatusLabel.textColor = kVectorColorGreen;
self.headerView.backgroundColor = kRiotColorLightGrey;
self.contactNameLabel.textColor = kRiotTextColorBlack;
self.contactStatusLabel.textColor = kRiotColorGreen;
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
[tap setNumberOfTouchesRequired:1];
@@ -659,8 +660,8 @@
[cellWithButton.mxkButton setTitle:title forState:UIControlStateNormal];
[cellWithButton.mxkButton setTitle:title forState:UIControlStateHighlighted];
[cellWithButton.mxkButton setTitleColor:kVectorTextColorBlack forState:UIControlStateNormal];
[cellWithButton.mxkButton setTitleColor:kVectorTextColorBlack forState:UIControlStateHighlighted];
[cellWithButton.mxkButton setTitleColor:kRiotTextColorBlack forState:UIControlStateNormal];
[cellWithButton.mxkButton setTitleColor:kRiotTextColorBlack forState:UIControlStateHighlighted];
[cellWithButton.mxkButton addTarget:self action:@selector(onActionButtonPressed:) forControlEvents:UIControlEventTouchUpInside];

2
Riot/ViewController/ContactsTableViewController.h
View File

@@ -18,7 +18,7 @@
#import <MatrixKit/MatrixKit.h>
#import "ContactTableViewCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@class ContactsTableViewController;

8
Riot/ViewController/ContactsTableViewController.m
View File

@@ -78,7 +78,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
@@ -541,7 +541,7 @@
cell.textLabel.text = NSLocalizedStringFromTable(@"contacts_matrix_users_search_prompt", @"Vector", nil);
cell.textLabel.numberOfLines = 2;
cell.textLabel.textColor = kVectorTextColorGray;
cell.textLabel.textColor = kRiotTextColorGray;
cell.textLabel.font = [UIFont systemFontOfSize:15.0];
cell.selectionStyle = UITableViewCellSelectionStyleNone;
return cell;
@@ -663,7 +663,7 @@
NSInteger sectionBitwise = -1;
sectionHeader = [[UIView alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, height)];
sectionHeader.backgroundColor = kVectorColorLightGrey;
sectionHeader.backgroundColor = kRiotColorLightGrey;
CGRect frame = sectionHeader.frame;
frame.origin.x = 20;
@@ -753,7 +753,7 @@
UILabel *checkboxLabel = [[UILabel alloc] initWithFrame:CGRectMake(54, 5, containerWidth - 64, 30)];
checkboxLabel.translatesAutoresizingMaskIntoConstraints = NO;
checkboxLabel.textColor = kVectorTextColorBlack;
checkboxLabel.textColor = kRiotTextColorBlack;
checkboxLabel.font = [UIFont systemFontOfSize:16.0];
checkboxLabel.text = NSLocalizedStringFromTable(@"contacts_address_book_matrix_users_toggle", @"Vector", nil);
[localContactsCheckboxContainer addSubview:checkboxLabel];

4
Riot/ViewController/CountryPickerViewController.m
View File

@@ -18,7 +18,7 @@
#import "AppDelegate.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RageShakeManager.h"
@@ -29,7 +29,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}

5
Riot/ViewController/DirectoryViewController.m
View File

@@ -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.
@@ -20,7 +21,7 @@
#import "AppDelegate.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RageShakeManager.h"
@@ -41,7 +42,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}

5
Riot/ViewController/HomeFilesSearchViewController.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -25,7 +26,7 @@
#import "EventFormatter.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RageShakeManager.h"
@@ -36,7 +37,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}

5
Riot/ViewController/HomeMessagesSearchViewController.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -29,7 +30,7 @@
#import "EventFormatter.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RageShakeManager.h"
@@ -40,7 +41,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}

5
Riot/ViewController/MediaAlbumContentViewController.m
View File

@@ -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.
@@ -18,7 +19,7 @@
#import "AppDelegate.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RageShakeManager.h"
@@ -67,7 +68,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}

5
Riot/ViewController/MediaPickerViewController.m
View File

@@ -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.
@@ -28,7 +29,7 @@
#import "MediaAlbumTableCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RageShakeManager.h"
@@ -109,7 +110,7 @@ static void *RecordingContext = &RecordingContext;
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];

19
Riot/ViewController/RecentsViewController.m
View File

@@ -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.
@@ -27,7 +28,7 @@
#import "HomeViewController.h"
#import "RoomViewController.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "InviteRecentTableViewCell.h"
#import "DirectoryRecentTableViewCell.h"
@@ -84,7 +85,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}
@@ -443,7 +444,7 @@
}];
UIImage *actionIcon = isDirect ? [UIImage imageNamed:@"directChatOff"] : [UIImage imageNamed:@"directChatOn"];
directAction.backgroundColor = [MXKTools convertImageToPatternColor:isDirect ? @"directChatOff" : @"directChatOn" backgroundColor:kVectorColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
directAction.backgroundColor = [MXKTools convertImageToPatternColor:isDirect ? @"directChatOff" : @"directChatOn" backgroundColor:kRiotColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
[actions insertObject:directAction atIndex:0];
@@ -457,7 +458,7 @@
}];
actionIcon = isMuted ? [UIImage imageNamed:@"notifications"] : [UIImage imageNamed:@"notificationsOff"];
muteAction.backgroundColor = [MXKTools convertImageToPatternColor:isMuted ? @"notifications" : @"notificationsOff" backgroundColor:kVectorColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
muteAction.backgroundColor = [MXKTools convertImageToPatternColor:isMuted ? @"notifications" : @"notificationsOff" backgroundColor:kRiotColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
[actions insertObject:muteAction atIndex:0];
// Favorites management
@@ -482,7 +483,7 @@
}];
actionIcon = [UIImage imageNamed:@"favouriteOff"];
action.backgroundColor = [MXKTools convertImageToPatternColor:@"favouriteOff" backgroundColor:kVectorColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
action.backgroundColor = [MXKTools convertImageToPatternColor:@"favouriteOff" backgroundColor:kRiotColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
[actions insertObject:action atIndex:0];
}
else
@@ -494,7 +495,7 @@
}];
actionIcon = [UIImage imageNamed:@"favourite"];
action.backgroundColor = [MXKTools convertImageToPatternColor:@"favourite" backgroundColor:kVectorColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
action.backgroundColor = [MXKTools convertImageToPatternColor:@"favourite" backgroundColor:kRiotColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
[actions insertObject:action atIndex:0];
}
@@ -507,7 +508,7 @@
}];
actionIcon = [UIImage imageNamed:@"priorityHigh"];
action.backgroundColor = [MXKTools convertImageToPatternColor:@"priorityHigh" backgroundColor:kVectorColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
action.backgroundColor = [MXKTools convertImageToPatternColor:@"priorityHigh" backgroundColor:kRiotColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
[actions insertObject:action atIndex:0];
}
else
@@ -519,7 +520,7 @@
}];
actionIcon = [UIImage imageNamed:@"priorityLow"];
action.backgroundColor = [MXKTools convertImageToPatternColor:@"priorityLow" backgroundColor:kVectorColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
action.backgroundColor = [MXKTools convertImageToPatternColor:@"priorityLow" backgroundColor:kRiotColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
[actions insertObject:action atIndex:0];
}
@@ -530,7 +531,7 @@
}];
actionIcon = [UIImage imageNamed:@"leave"];
leaveAction.backgroundColor = [MXKTools convertImageToPatternColor:@"leave" backgroundColor:kVectorColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
leaveAction.backgroundColor = [MXKTools convertImageToPatternColor:@"leave" backgroundColor:kRiotColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:actionIcon.size];
[actions insertObject:leaveAction atIndex:0];
}

5
Riot/ViewController/RoomFilesSearchViewController.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -23,7 +24,7 @@
#import "FilesSearchCellData.h"
#import "FilesSearchTableViewCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RageShakeManager.h"
@@ -44,7 +45,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}

5
Riot/ViewController/RoomFilesViewController.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -20,7 +21,7 @@
#import "AppDelegate.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RageShakeManager.h"
@@ -57,7 +58,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}

39
Riot/ViewController/RoomMemberDetailsViewController.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -20,7 +21,7 @@
#import "RoomMemberTitleView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RageShakeManager.h"
@@ -95,7 +96,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
@@ -109,9 +110,9 @@
[super viewDidLoad];
// Do any additional setup after loading the view, typically from a nib.
self.memberHeaderView.backgroundColor = kVectorColorLightGrey;
self.roomMemberNameLabel.textColor = kVectorTextColorBlack;
self.roomMemberStatusLabel.textColor = kVectorColorGreen;
self.memberHeaderView.backgroundColor = kRiotColorLightGrey;
self.roomMemberNameLabel.textColor = kRiotTextColorBlack;
self.roomMemberStatusLabel.textColor = kRiotColorGreen;
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
[tap setNumberOfTouchesRequired:1];
@@ -313,12 +314,12 @@
// Update member badge
MXRoomPowerLevels *powerLevels = [self.mxRoom.state powerLevels];
NSInteger powerLevel = [powerLevels powerLevelOfUserWithUserID:self.mxRoomMember.userId];
if (powerLevel >= kVectorRoomAdminLevel)
if (powerLevel >= kRiotRoomAdminLevel)
{
memberTitleView.memberBadge.image = [UIImage imageNamed:@"admin_icon"];
memberTitleView.memberBadge.hidden = NO;
}
else if (powerLevel >= kVectorRoomModeratorLevel)
else if (powerLevel >= kRiotRoomModeratorLevel)
{
memberTitleView.memberBadge.image = [UIImage imageNamed:@"mod_icon"];
memberTitleView.memberBadge.hidden = NO;
@@ -413,13 +414,13 @@
if (oneSelfPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsStateEvent:kMXEventTypeStringRoomPowerLevels])
{
// Check whether the user is admin (in this case he may reduce his power level to become moderator or less, EXCEPT if he is the only admin).
if (oneSelfPowerLevel >= kVectorRoomAdminLevel)
if (oneSelfPowerLevel >= kRiotRoomAdminLevel)
{
NSArray *levelValues = powerLevels.users.allValues;
NSUInteger adminCount = 0;
for (NSNumber *valueNumber in levelValues)
{
if ([valueNumber unsignedIntegerValue] >= kVectorRoomAdminLevel)
if ([valueNumber unsignedIntegerValue] >= kRiotRoomAdminLevel)
{
adminCount ++;
}
@@ -432,7 +433,7 @@
}
}
// Check whether the user is moderator (in this case he may reduce his power level to become normal user).
else if (oneSelfPowerLevel >= kVectorRoomModeratorLevel)
else if (oneSelfPowerLevel >= kRiotRoomModeratorLevel)
{
[adminActionsArray addObject:@(MXKRoomMemberDetailsActionSetDefaultPowerLevel)];
}
@@ -450,18 +451,18 @@
if (oneSelfPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsStateEvent:kMXEventTypeStringRoomPowerLevels] && oneSelfPowerLevel > memberPowerLevel)
{
// Check whether user is admin
if (oneSelfPowerLevel >= kVectorRoomAdminLevel)
if (oneSelfPowerLevel >= kRiotRoomAdminLevel)
{
[adminActionsArray addObject:@(MXKRoomMemberDetailsActionSetAdmin)];
}
// Check whether the member may become moderator
if (oneSelfPowerLevel >= kVectorRoomModeratorLevel && memberPowerLevel < kVectorRoomModeratorLevel)
if (oneSelfPowerLevel >= kRiotRoomModeratorLevel && memberPowerLevel < kRiotRoomModeratorLevel)
{
[adminActionsArray addObject:@(MXKRoomMemberDetailsActionSetModerator)];
}
if (memberPowerLevel >= kVectorRoomModeratorLevel)
if (memberPowerLevel >= kRiotRoomModeratorLevel)
{
[adminActionsArray addObject:@(MXKRoomMemberDetailsActionSetDefaultPowerLevel)];
}
@@ -681,13 +682,13 @@
if (actionNumber.unsignedIntegerValue == MXKRoomMemberDetailsActionKick)
{
[cellWithButton.mxkButton setTitleColor:kVectorColorPinkRed forState:UIControlStateNormal];
[cellWithButton.mxkButton setTitleColor:kVectorColorPinkRed forState:UIControlStateHighlighted];
[cellWithButton.mxkButton setTitleColor:kRiotColorPinkRed forState:UIControlStateNormal];
[cellWithButton.mxkButton setTitleColor:kRiotColorPinkRed forState:UIControlStateHighlighted];
}
else
{
[cellWithButton.mxkButton setTitleColor:kVectorTextColorBlack forState:UIControlStateNormal];
[cellWithButton.mxkButton setTitleColor:kVectorTextColorBlack forState:UIControlStateHighlighted];
[cellWithButton.mxkButton setTitleColor:kRiotTextColorBlack forState:UIControlStateNormal];
[cellWithButton.mxkButton setTitleColor:kRiotTextColorBlack forState:UIControlStateHighlighted];
}
[cellWithButton.mxkButton addTarget:self action:@selector(onActionButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
@@ -831,12 +832,12 @@
}
case MXKRoomMemberDetailsActionSetModerator:
{
[self setPowerLevel:kVectorRoomModeratorLevel promptUser:YES];
[self setPowerLevel:kRiotRoomModeratorLevel promptUser:YES];
break;
}
case MXKRoomMemberDetailsActionSetAdmin:
{
[self setPowerLevel:kVectorRoomAdminLevel promptUser:YES];
[self setPowerLevel:kRiotRoomAdminLevel promptUser:YES];
break;
}
default:

5
Riot/ViewController/RoomMessagesSearchViewController.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -25,7 +26,7 @@
#import "RoomIncomingAttachmentBubbleCell.h"
#import "RoomIncomingTextMsgBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RageShakeManager.h"
@@ -46,7 +47,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}

24
Riot/ViewController/RoomParticipantsViewController.m
View File

@@ -86,7 +86,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}
@@ -131,7 +131,7 @@
_searchBarView.autocapitalizationType = UITextAutocapitalizationTypeNone;
[self refreshSearchBarItemsColor:_searchBarView];
_searchBarHeaderBorder.backgroundColor = kVectorColorSilver;
_searchBarHeaderBorder.backgroundColor = kRiotColorSilver;
// Search bar header is hidden when no room is provided
_searchBarHeader.hidden = (self.mxRoom == nil);
@@ -1051,12 +1051,12 @@
// Update member badge
MXRoomPowerLevels *powerLevels = [self.mxRoom.state powerLevels];
NSInteger powerLevel = [powerLevels powerLevelOfUserWithUserID:contact.mxMember.userId];
if (powerLevel >= kVectorRoomAdminLevel)
if (powerLevel >= kRiotRoomAdminLevel)
{
participantCell.thumbnailBadgeView.image = [UIImage imageNamed:@"admin_icon"];
participantCell.thumbnailBadgeView.hidden = NO;
}
else if (powerLevel >= kVectorRoomModeratorLevel)
else if (powerLevel >= kRiotRoomModeratorLevel)
{
participantCell.thumbnailBadgeView.image = [UIImage imageNamed:@"mod_icon"];
participantCell.thumbnailBadgeView.hidden = NO;
@@ -1111,7 +1111,7 @@
if (section == invitedSection)
{
sectionHeader = [[UIView alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, 30)];
sectionHeader.backgroundColor = kVectorColorLightGrey;
sectionHeader.backgroundColor = kRiotColorLightGrey;
CGRect frame = sectionHeader.frame;
frame.origin.x = 20;
@@ -1222,7 +1222,7 @@
}];
leaveAction.backgroundColor = [MXKTools convertImageToPatternColor:@"remove_icon" backgroundColor:kVectorColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:CGSizeMake(25, 24)];
leaveAction.backgroundColor = [MXKTools convertImageToPatternColor:@"remove_icon" backgroundColor:kRiotColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:CGSizeMake(25, 24)];
[actions insertObject:leaveAction atIndex:0];
}
@@ -1543,19 +1543,19 @@
- (void)refreshSearchBarItemsColor:(UISearchBar *)searchBar
{
// bar tint color
searchBar.barTintColor = searchBar.tintColor = kVectorColorGreen;
searchBar.tintColor = kVectorColorGreen;
searchBar.barTintColor = searchBar.tintColor = kRiotColorGreen;
searchBar.tintColor = kRiotColorGreen;
// FIXME: this all seems incredibly fragile and tied to gutwrenching the current UISearchBar internals.
// text color
UITextField *searchBarTextField = [searchBar valueForKey:@"_searchField"];
searchBarTextField.textColor = kVectorTextColorGray;
searchBarTextField.textColor = kRiotTextColorGray;
// Magnifying glass icon.
UIImageView *leftImageView = (UIImageView *)searchBarTextField.leftView;
leftImageView.image = [leftImageView.image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
leftImageView.tintColor = kVectorColorGreen;
leftImageView.tintColor = kRiotColorGreen;
// remove the gray background color
UIView *effectBackgroundTop = [searchBarTextField valueForKey:@"_effectBackgroundTop"];
@@ -1566,8 +1566,8 @@
// place holder
searchBarTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:searchBarTextField.placeholder
attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle),
NSUnderlineColorAttributeName: kVectorColorGreen,
NSForegroundColorAttributeName: kVectorColorGreen}];
NSUnderlineColorAttributeName: kRiotColorGreen,
NSForegroundColorAttributeName: kRiotColorGreen}];
}
- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText

58
Riot/ViewController/RoomSettingsViewController.m
View File

@@ -24,7 +24,7 @@
#import "RageShakeManager.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "AvatarGenerator.h"
#import "Tools.h"
@@ -163,7 +163,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
_selectedRoomSettingsField = RoomSettingsViewControllerFieldNone;
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}
@@ -213,7 +213,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
roomAddresses = [NSMutableArray array];
self.tableView.backgroundColor = kVectorColorLightGrey;
self.tableView.backgroundColor = kRiotColorLightGrey;
[self.tableView registerClass:MXKTableViewCellWithLabelAndSwitch.class forCellReuseIdentifier:[MXKTableViewCellWithLabelAndSwitch defaultReuseIdentifier]];
[self.tableView registerClass:MXKTableViewCellWithLabelAndMXKImageView.class forCellReuseIdentifier:[MXKTableViewCellWithLabelAndMXKImageView defaultReuseIdentifier]];
@@ -1810,7 +1810,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
{
// Customize label style
UITableViewHeaderFooterView *tableViewHeaderFooterView = (UITableViewHeaderFooterView*)view;
tableViewHeaderFooterView.textLabel.textColor = kVectorTextColorBlack;
tableViewHeaderFooterView.textLabel.textColor = kRiotTextColorBlack;
tableViewHeaderFooterView.textLabel.font = [UIFont systemFontOfSize:15];
}
}
@@ -1874,10 +1874,10 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
roomNotifCell.mxkSwitchTrailingConstraint.constant = 15;
[roomNotifCell.mxkSwitch addTarget:self action:@selector(onSwitchUpdate:) forControlEvents:UIControlEventValueChanged];
roomNotifCell.mxkSwitch.onTintColor = kVectorColorGreen;
roomNotifCell.mxkSwitch.onTintColor = kRiotColorGreen;
roomNotifCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_mute_notifs", @"Vector", nil);
roomNotifCell.mxkLabel.textColor = kVectorTextColorBlack;
roomNotifCell.mxkLabel.textColor = kRiotTextColorBlack;
roomNotifSwitch = roomNotifCell.mxkSwitch;
if ([updatedItemsDict objectForKey:kRoomSettingsMuteNotifKey])
@@ -1912,7 +1912,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
roomPhotoCell.mxkImageView.backgroundColor = [UIColor clearColor];
roomPhotoCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_photo", @"Vector", nil);
roomPhotoCell.mxkLabel.textColor = kVectorTextColorBlack;
roomPhotoCell.mxkLabel.textColor = kRiotTextColorBlack;
if ([updatedItemsDict objectForKey:kRoomSettingsAvatarKey])
{
@@ -1947,14 +1947,14 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
topicTextView.text = mxRoomState.topic;
}
topicTextView.tintColor = kVectorColorGreen;
topicTextView.tintColor = kRiotColorGreen;
topicTextView.font = [UIFont systemFontOfSize:15];
topicTextView.bounces = NO;
topicTextView.delegate = self;
// disable the edition if the user cannot update it
topicTextView.editable = (oneSelfPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsStateEvent:kMXEventTypeStringRoomTopic]);
topicTextView.textColor = kVectorTextColorGray;
topicTextView.textColor = kRiotTextColorGray;
cell = roomTopicCell;
}
@@ -1967,14 +1967,14 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
roomNameCell.mxkTextFieldTrailingConstraint.constant = 15;
roomNameCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_room_name", @"Vector", nil);
roomNameCell.mxkLabel.textColor = kVectorTextColorBlack;
roomNameCell.mxkLabel.textColor = kRiotTextColorBlack;
roomNameCell.accessoryType = UITableViewCellAccessoryNone;
roomNameCell.accessoryView = nil;
nameTextField = roomNameCell.mxkTextField;
nameTextField.tintColor = kVectorColorGreen;
nameTextField.tintColor = kRiotColorGreen;
nameTextField.font = [UIFont systemFontOfSize:17];
nameTextField.borderStyle = UITextBorderStyleNone;
nameTextField.textAlignment = NSTextAlignmentRight;
@@ -1991,7 +1991,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
// disable the edition if the user cannot update it
nameTextField.userInteractionEnabled = (oneSelfPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsStateEvent:kMXEventTypeStringRoomName]);
nameTextField.textColor = kVectorTextColorGray;
nameTextField.textColor = kRiotTextColorGray;
// Add a "textFieldDidChange" notification method to the text field control.
[nameTextField addTarget:self action:@selector(onTextFieldUpdate:) forControlEvents:UIControlEventEditingChanged];
@@ -2050,7 +2050,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
[leaveCell.mxkButton setTitle:title forState:UIControlStateNormal];
[leaveCell.mxkButton setTitle:title forState:UIControlStateHighlighted];
[leaveCell.mxkButton setTintColor:kVectorColorGreen];
[leaveCell.mxkButton setTintColor:kRiotColorGreen];
leaveCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
[leaveCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -2069,7 +2069,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
directoryToggleCell.mxkSwitchTrailingConstraint.constant = 15;
directoryToggleCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_access_section_directory_toggle", @"Vector", nil);
directoryToggleCell.mxkLabel.textColor = kVectorTextColorBlack;
directoryToggleCell.mxkLabel.textColor = kRiotTextColorBlack;
directoryVisibilitySwitch = directoryToggleCell.mxkSwitch;
@@ -2089,7 +2089,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
}
[directoryVisibilitySwitch addTarget:self action:@selector(onSwitchUpdate:) forControlEvents:UIControlEventValueChanged];
directoryVisibilitySwitch.onTintColor = kVectorColorGreen;
directoryVisibilitySwitch.onTintColor = kRiotColorGreen;
if ([updatedItemsDict objectForKey:kRoomSettingsDirectoryKey])
{
@@ -2111,7 +2111,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
cell = [tableView dequeueReusableCellWithIdentifier:kRoomSettingsWarningCellViewIdentifier forIndexPath:indexPath];
cell.textLabel.font = [UIFont systemFontOfSize:17];
cell.textLabel.textColor = kVectorColorPinkRed;
cell.textLabel.textColor = kRiotColorPinkRed;
cell.textLabel.numberOfLines = 0;
cell.accessoryView = nil;
cell.accessoryType = UITableViewCellAccessoryNone;
@@ -2250,9 +2250,9 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
addAddressTextField.placeholder = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_details_new_address_placeholder", @"Vector", nil), self.mainSession.matrixRestClient.homeserverSuffix];
addAddressTextField.userInteractionEnabled = YES;
addAddressTextField.text = currentValue;
addAddressTextField.textColor = kVectorTextColorGray;
addAddressTextField.textColor = kRiotTextColorGray;
addAddressTextField.tintColor = kVectorColorGreen;
addAddressTextField.tintColor = kRiotColorGreen;
addAddressTextField.font = [UIFont systemFontOfSize:17];
addAddressTextField.borderStyle = UITextBorderStyleNone;
addAddressTextField.textAlignment = NSTextAlignmentLeft;
@@ -2268,7 +2268,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
UITableViewCell *addressCell = [tableView dequeueReusableCellWithIdentifier:kRoomSettingsAddressCellViewIdentifier forIndexPath:indexPath];
addressCell.textLabel.font = [UIFont systemFontOfSize:16];
addressCell.textLabel.textColor = kVectorTextColorBlack;
addressCell.textLabel.textColor = kRiotTextColorBlack;
addressCell.textLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
addressCell.accessoryView = nil;
addressCell.accessoryType = UITableViewCellAccessoryNone;
@@ -2318,7 +2318,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
UITableViewCell *addressCell = [tableView dequeueReusableCellWithIdentifier:kRoomSettingsAddressCellViewIdentifier forIndexPath:indexPath];
addressCell.textLabel.font = [UIFont systemFontOfSize:16];
addressCell.textLabel.textColor = kVectorTextColorBlack;
addressCell.textLabel.textColor = kRiotTextColorBlack;
addressCell.textLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
addressCell.accessoryView = nil;
addressCell.accessoryType = UITableViewCellAccessoryNone;
@@ -2340,11 +2340,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
cell.textLabel.font = [UIFont systemFontOfSize:17];
cell.textLabel.text = NSLocalizedStringFromTable(@"room_details_advanced_room_id", @"Vector", nil);
cell.textLabel.textColor = kVectorTextColorBlack;
cell.textLabel.textColor = kRiotTextColorBlack;
cell.detailTextLabel.font = [UIFont systemFontOfSize:15];
cell.detailTextLabel.text = mxRoomState.roomId;
cell.detailTextLabel.textColor = kVectorTextColorGray;
cell.detailTextLabel.textColor = kRiotTextColorGray;
cell.detailTextLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
cell.selectionStyle = UITableViewCellSelectionStyleNone;
@@ -2359,10 +2359,10 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
roomBlacklistUnverifiedDevicesCell.mxkSwitchTrailingConstraint.constant = 15;
[roomBlacklistUnverifiedDevicesCell.mxkSwitch addTarget:self action:@selector(onSwitchUpdate:) forControlEvents:UIControlEventValueChanged];
roomBlacklistUnverifiedDevicesCell.mxkSwitch.onTintColor = kVectorColorGreen;
roomBlacklistUnverifiedDevicesCell.mxkSwitch.onTintColor = kRiotColorGreen;
roomBlacklistUnverifiedDevicesCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_advanced_e2e_encryption_blacklist_unverified_devices", @"Vector", nil);
roomBlacklistUnverifiedDevicesCell.mxkLabel.textColor = kVectorTextColorBlack;
roomBlacklistUnverifiedDevicesCell.mxkLabel.textColor = kRiotTextColorBlack;
roomEncryptionBlacklistUnverifiedDevicesSwitch = roomBlacklistUnverifiedDevicesCell.mxkSwitch;
@@ -2421,7 +2421,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
cell.textLabel.font = [UIFont systemFontOfSize:17];
cell.textLabel.numberOfLines = 0;
cell.textLabel.text = NSLocalizedStringFromTable(@"room_details_advanced_e2e_encryption_enabled", @"Vector", nil);
cell.textLabel.textColor = kVectorTextColorBlack;
cell.textLabel.textColor = kRiotTextColorBlack;
cell.selectionStyle = UITableViewCellSelectionStyleNone;
}
@@ -2440,10 +2440,10 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
roomEncryptionCell.mxkSwitchTrailingConstraint.constant = 15;
[roomEncryptionCell.mxkSwitch addTarget:self action:@selector(onSwitchUpdate:) forControlEvents:UIControlEventValueChanged];
roomEncryptionCell.mxkSwitch.onTintColor = kVectorColorGreen;
roomEncryptionCell.mxkSwitch.onTintColor = kRiotColorGreen;
roomEncryptionCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_advanced_enable_e2e_encryption", @"Vector", nil);
roomEncryptionCell.mxkLabel.textColor = kVectorTextColorBlack;
roomEncryptionCell.mxkLabel.textColor = kRiotTextColorBlack;
roomEncryptionSwitch = roomEncryptionCell.mxkSwitch;
@@ -2477,7 +2477,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
cell.textLabel.font = [UIFont systemFontOfSize:17];
cell.textLabel.numberOfLines = 0;
cell.textLabel.text = NSLocalizedStringFromTable(@"room_details_advanced_e2e_encryption_disabled", @"Vector", nil);
cell.textLabel.textColor = kVectorTextColorBlack;
cell.textLabel.textColor = kRiotTextColorBlack;
cell.selectionStyle = UITableViewCellSelectionStyleNone;
}
@@ -2776,7 +2776,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
}];
removeAction.backgroundColor = [MXKTools convertImageToPatternColor:@"remove_icon" backgroundColor:kVectorColorLightGrey patternSize:CGSizeMake(44, 44) resourceSize:CGSizeMake(25, 24)];
removeAction.backgroundColor = [MXKTools convertImageToPatternColor:@"remove_icon" backgroundColor:kRiotColorLightGrey patternSize:CGSizeMake(44, 44) resourceSize:CGSizeMake(25, 24)];
[actions insertObject:removeAction atIndex:0];
}
}

14
Riot/ViewController/RoomViewController.m
View File

@@ -21,7 +21,7 @@
#import "AppDelegate.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RageShakeManager.h"
@@ -89,7 +89,7 @@
#import "AvatarGenerator.h"
#import "Tools.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "GBDeviceInfo_iOS.h"
@@ -217,7 +217,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
@@ -267,7 +267,7 @@
[self.bubblesTableView registerClass:RoomOutgoingEncryptedTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.class forCellReuseIdentifier:RoomOutgoingEncryptedTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.defaultReuseIdentifier];
// Prepare expanded header
self.expandedHeaderContainer.backgroundColor = kVectorColorLightGrey;
self.expandedHeaderContainer.backgroundColor = kRiotColorLightGrey;
expandedHeader = [ExpandedRoomTitleView roomTitleView];
expandedHeader.delegate = self;
@@ -306,7 +306,7 @@
[self.expandedHeaderContainer addGestureRecognizer:swipe];
// Prepare preview header container
self.previewHeaderContainer.backgroundColor = kVectorColorLightGrey;
self.previewHeaderContainer.backgroundColor = kRiotColorLightGrey;
// Replace the default input toolbar view.
// Note: this operation will force the layout of subviews. That is why cell view classes must be registered before.
@@ -3021,11 +3021,11 @@
// Set the right background color
if (highlightCount)
{
missedDiscussionsBadgeLabelBgView.backgroundColor = kVectorColorPinkRed;
missedDiscussionsBadgeLabelBgView.backgroundColor = kRiotColorPinkRed;
}
else
{
missedDiscussionsBadgeLabelBgView.backgroundColor = kVectorColorGreen;
missedDiscussionsBadgeLabelBgView.backgroundColor = kRiotColorGreen;
}
if (!missedDiscussionsButton || [leftBarButtonItems indexOfObject:missedDiscussionsButton] == NSNotFound)

9
Riot/ViewController/SegmentedViewController.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "SegmentedViewController.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "RageShakeManager.h"
@@ -120,7 +121,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}
@@ -216,7 +217,7 @@
label.text = [sectionTitles objectAtIndex:index];
label.font = [UIFont systemFontOfSize:17];
label.textAlignment = NSTextAlignmentCenter;
label.textColor = kVectorColorGreen;
label.textColor = kRiotColorGreen;
label.backgroundColor = [UIColor clearColor];
label.accessibilityIdentifier = [NSString stringWithFormat:@"SegmentedVCSectionLabel%tu", index];
@@ -302,7 +303,7 @@
// create the selected marker view
selectedMarkerView = [[UIView alloc] init];
selectedMarkerView.backgroundColor = kVectorColorGreen;
selectedMarkerView.backgroundColor = kRiotColorGreen;
[selectedMarkerView setTranslatesAutoresizingMaskIntoConstraints:NO];
[self.selectionContainer addSubview:selectedMarkerView];

44
Riot/ViewController/SettingsViewController.m
View File

@@ -21,7 +21,7 @@
#import "AppDelegate.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "AvatarGenerator.h"
@@ -201,7 +201,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
@@ -217,7 +217,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
self.navigationItem.title = NSLocalizedStringFromTable(@"settings_title", @"Vector", nil);
self.tableView.backgroundColor = kVectorColorLightGrey;
self.tableView.backgroundColor = kRiotColorLightGrey;
[self.tableView registerClass:MXKTableViewCellWithLabelAndTextField.class forCellReuseIdentifier:[MXKTableViewCellWithLabelAndTextField defaultReuseIdentifier]];
[self.tableView registerClass:MXKTableViewCellWithLabelAndSwitch.class forCellReuseIdentifier:[MXKTableViewCellWithLabelAndSwitch defaultReuseIdentifier]];
@@ -821,30 +821,30 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
// Crypto information
NSMutableAttributedString *cryptoInformationString = [[NSMutableAttributedString alloc]
initWithString:NSLocalizedStringFromTable(@"settings_crypto_device_name", @"Vector", nil)
attributes:@{NSForegroundColorAttributeName : kVectorTextColorBlack,
attributes:@{NSForegroundColorAttributeName : kRiotTextColorBlack,
NSFontAttributeName: [UIFont systemFontOfSize:17]}];
[cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
initWithString:account.device.displayName ? account.device.displayName : @""
attributes:@{NSForegroundColorAttributeName : kVectorTextColorBlack,
attributes:@{NSForegroundColorAttributeName : kRiotTextColorBlack,
NSFontAttributeName: [UIFont systemFontOfSize:17]}]];
[cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
initWithString:NSLocalizedStringFromTable(@"settings_crypto_device_id", @"Vector", nil)
attributes:@{NSForegroundColorAttributeName : kVectorTextColorBlack,
attributes:@{NSForegroundColorAttributeName : kRiotTextColorBlack,
NSFontAttributeName: [UIFont systemFontOfSize:17]}]];
[cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
initWithString:account.device.deviceId ? account.device.deviceId : @""
attributes:@{NSForegroundColorAttributeName : kVectorTextColorBlack,
attributes:@{NSForegroundColorAttributeName : kRiotTextColorBlack,
NSFontAttributeName: [UIFont systemFontOfSize:17]}]];
[cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
initWithString:NSLocalizedStringFromTable(@"settings_crypto_device_key", @"Vector", nil)
attributes:@{NSForegroundColorAttributeName : kVectorTextColorBlack,
attributes:@{NSForegroundColorAttributeName : kRiotTextColorBlack,
NSFontAttributeName: [UIFont systemFontOfSize:17]}]];
NSString *fingerprint = account.mxSession.crypto.deviceEd25519Key;
[cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
initWithString:fingerprint ? fingerprint : @""
attributes:@{NSForegroundColorAttributeName : kVectorTextColorBlack,
attributes:@{NSForegroundColorAttributeName : kRiotTextColorBlack,
NSFontAttributeName: [UIFont boldSystemFontOfSize:17]}]];
return cryptoInformationString;
@@ -1135,12 +1135,12 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
cell.mxkTextFieldLeadingConstraint.constant = 16;
cell.mxkTextFieldTrailingConstraint.constant = 15;
cell.mxkLabel.textColor = kVectorTextColorBlack;
cell.mxkLabel.textColor = kRiotTextColorBlack;
cell.mxkTextField.userInteractionEnabled = YES;
cell.mxkTextField.borderStyle = UITextBorderStyleNone;
cell.mxkTextField.textAlignment = NSTextAlignmentRight;
cell.mxkTextField.textColor = kVectorTextColorGray;
cell.mxkTextField.textColor = kRiotTextColorGray;
cell.mxkTextField.font = [UIFont systemFontOfSize:16];
cell.mxkTextField.placeholder = nil;
@@ -1160,7 +1160,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
cell.mxkLabelLeadingConstraint.constant = cell.separatorInset.left;
cell.mxkSwitchTrailingConstraint.constant = 15;
cell.mxkLabel.textColor = kVectorTextColorBlack;
cell.mxkLabel.textColor = kRiotTextColorBlack;
return cell;
}
@@ -1181,7 +1181,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
}
cell.textLabel.font = [UIFont systemFontOfSize:17];
cell.textLabel.textColor = kVectorTextColorBlack;
cell.textLabel.textColor = kRiotTextColorBlack;
return cell;
}
@@ -1217,7 +1217,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
[signOutCell.mxkButton setTitle:title forState:UIControlStateNormal];
[signOutCell.mxkButton setTitle:title forState:UIControlStateHighlighted];
[signOutCell.mxkButton setTintColor:kVectorColorGreen];
[signOutCell.mxkButton setTintColor:kRiotColorGreen];
signOutCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
[signOutCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -1248,7 +1248,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
}
profileCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_profile_picture", @"Vector", nil);
profileCell.mxkLabel.textColor = kVectorTextColorBlack;
profileCell.mxkLabel.textColor = kRiotTextColorBlack;
// if the user defines a new avatar
if (newAvatarImage)
@@ -1448,7 +1448,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
else if (row == userSettingsNightModeSepIndex)
{
UITableViewCell *sepCell = [[UITableViewCell alloc] init];
sepCell.backgroundColor = kVectorColorLightGrey;
sepCell.backgroundColor = kRiotColorLightGrey;
cell = sepCell;
}
@@ -1531,7 +1531,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
NSLocale *local = [[NSLocale alloc] initWithLocaleIdentifier:[[[NSBundle mainBundle] preferredLocalizations] objectAtIndex:0]];
NSString *countryName = [local displayNameForKey:NSLocaleCountryCode value:countryCode];
cell.textLabel.textColor = kVectorTextColorBlack;
cell.textLabel.textColor = kRiotTextColorBlack;
cell.textLabel.text = NSLocalizedStringFromTable(@"settings_contacts_phonebook_country", @"Vector", nil);
cell.detailTextLabel.text = countryName;
@@ -1641,7 +1641,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
NSString *btnTitle = NSLocalizedStringFromTable(@"settings_mark_all_as_read", @"Vector", nil);
[markAllBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
[markAllBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
[markAllBtnCell.mxkButton setTintColor:kVectorColorGreen];
[markAllBtnCell.mxkButton setTintColor:kRiotColorGreen];
markAllBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
[markAllBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -1661,7 +1661,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
NSString *btnTitle = NSLocalizedStringFromTable(@"settings_clear_cache", @"Vector", nil);
[clearCacheBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
[clearCacheBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
[clearCacheBtnCell.mxkButton setTintColor:kVectorColorGreen];
[clearCacheBtnCell.mxkButton setTintColor:kRiotColorGreen];
clearCacheBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
[clearCacheBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -1749,7 +1749,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
NSString *btnTitle = NSLocalizedStringFromTable(@"settings_crypto_export", @"Vector", nil);
[exportKeysBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
[exportKeysBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
[exportKeysBtnCell.mxkButton setTintColor:kVectorColorGreen];
[exportKeysBtnCell.mxkButton setTintColor:kRiotColorGreen];
exportKeysBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
[exportKeysBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -1827,7 +1827,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
{
// Customize label style
UITableViewHeaderFooterView *tableViewHeaderFooterView = (UITableViewHeaderFooterView*)view;
tableViewHeaderFooterView.textLabel.textColor = kVectorTextColorBlack;
tableViewHeaderFooterView.textLabel.textColor = kRiotTextColorBlack;
tableViewHeaderFooterView.textLabel.font = [UIFont systemFontOfSize:15];
}
}
@@ -1912,7 +1912,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
}];
leaveAction.backgroundColor = [MXKTools convertImageToPatternColor:@"remove_icon_pink" backgroundColor:kVectorColorLightGrey patternSize:CGSizeMake(50, cellHeight) resourceSize:CGSizeMake(20, 18)];
leaveAction.backgroundColor = [MXKTools convertImageToPatternColor:@"remove_icon_pink" backgroundColor:kRiotColorLightGrey patternSize:CGSizeMake(50, cellHeight) resourceSize:CGSizeMake(20, 18)];
[actions insertObject:leaveAction atIndex:0];
}
}

17
Riot/ViewController/StartChatViewController.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -129,7 +130,7 @@
_searchBarView.autocapitalizationType = UITextAutocapitalizationTypeNone;
[self refreshSearchBarItemsColor:_searchBarView];
_searchBarHeaderBorder.backgroundColor = kVectorColorSilver;
_searchBarHeaderBorder.backgroundColor = kRiotColorSilver;
// Hide line separators of empty cells
self.tableView.tableFooterView = [[UIView alloc] init];
@@ -389,7 +390,7 @@
}];
leaveAction.backgroundColor = [MXKTools convertImageToPatternColor:@"remove_icon" backgroundColor:kVectorColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:CGSizeMake(25, 24)];
leaveAction.backgroundColor = [MXKTools convertImageToPatternColor:@"remove_icon" backgroundColor:kRiotColorLightGrey patternSize:CGSizeMake(74, 74) resourceSize:CGSizeMake(25, 24)];
[actions insertObject:leaveAction atIndex:0];
}
@@ -557,19 +558,19 @@
- (void)refreshSearchBarItemsColor:(UISearchBar *)searchBar
{
// bar tint color
searchBar.barTintColor = searchBar.tintColor = kVectorColorGreen;
searchBar.tintColor = kVectorColorGreen;
searchBar.barTintColor = searchBar.tintColor = kRiotColorGreen;
searchBar.tintColor = kRiotColorGreen;
// FIXME: this all seems incredibly fragile and tied to gutwrenching the current UISearchBar internals.
// text color
UITextField *searchBarTextField = [searchBar valueForKey:@"_searchField"];
searchBarTextField.textColor = kVectorTextColorGray;
searchBarTextField.textColor = kRiotTextColorGray;
// Magnifying glass icon.
UIImageView *leftImageView = (UIImageView *)searchBarTextField.leftView;
leftImageView.image = [leftImageView.image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
leftImageView.tintColor = kVectorColorGreen;
leftImageView.tintColor = kRiotColorGreen;
// remove the gray background color
UIView *effectBackgroundTop = [searchBarTextField valueForKey:@"_effectBackgroundTop"];
@@ -580,8 +581,8 @@
// place holder
searchBarTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:searchBarTextField.placeholder
attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle),
NSUnderlineColorAttributeName: kVectorColorGreen,
NSForegroundColorAttributeName: kVectorColorGreen}];
NSUnderlineColorAttributeName: kRiotColorGreen,
NSForegroundColorAttributeName: kRiotColorGreen}];
}
- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText

4
Riot/ViewController/UsersDevicesViewController.m
View File

@@ -20,7 +20,7 @@
#import "AppDelegate.h"
#import "RageShakeManager.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@interface UsersDevicesViewController ()
{
@@ -43,7 +43,7 @@
[super finalizeInit];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
self.defaultBarTintColor = kRiotNavBarTintColor;
self.enableBarTintColorStatusChange = NO;
self.rageShakeManager = [RageShakeManager sharedManager];
}

12
Riot/Views/Authentication/AuthInputsView.m
View File

@@ -17,7 +17,7 @@
#import "AuthInputsView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "Tools.h"
#import "CountryPickerViewController.h"
@@ -64,16 +64,16 @@
[super awakeFromNib];
_repeatPasswordTextField.placeholder = NSLocalizedStringFromTable(@"auth_repeat_password_placeholder", @"Vector", nil);
_repeatPasswordTextField.textColor = kVectorTextColorBlack;
_repeatPasswordTextField.textColor = kRiotTextColorBlack;
self.userLoginTextField.placeholder = NSLocalizedStringFromTable(@"auth_user_id_placeholder", @"Vector", nil);
self.userLoginTextField.textColor = kVectorTextColorBlack;
self.userLoginTextField.textColor = kRiotTextColorBlack;
self.passWordTextField.placeholder = NSLocalizedStringFromTable(@"auth_password_placeholder", @"Vector", nil);
self.passWordTextField.textColor = kVectorTextColorBlack;
self.passWordTextField.textColor = kRiotTextColorBlack;
self.emailTextField.textColor = kVectorTextColorBlack;
self.phoneTextField.textColor = kVectorTextColorBlack;
self.emailTextField.textColor = kRiotTextColorBlack;
self.phoneTextField.textColor = kRiotTextColorBlack;
self.messageLabel.numberOfLines = 0;

10
Riot/Views/Authentication/ForgotPasswordInputsView.m
View File

@@ -17,7 +17,7 @@
#import "ForgotPasswordInputsView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@interface ForgotPasswordInputsView ()
{
@@ -52,19 +52,19 @@
[super awakeFromNib];
self.emailTextField.placeholder = NSLocalizedStringFromTable(@"auth_email_placeholder", @"Vector", nil);
self.emailTextField.textColor = kVectorTextColorBlack;
self.emailTextField.textColor = kRiotTextColorBlack;
self.passWordTextField.placeholder = NSLocalizedStringFromTable(@"auth_new_password_placeholder", @"Vector", nil);
self.passWordTextField.textColor = kVectorTextColorBlack;
self.passWordTextField.textColor = kRiotTextColorBlack;
self.repeatPasswordTextField.placeholder = NSLocalizedStringFromTable(@"auth_repeat_new_password_placeholder", @"Vector", nil);
self.repeatPasswordTextField.textColor = kVectorTextColorBlack;
self.repeatPasswordTextField.textColor = kRiotTextColorBlack;
self.messageLabel.numberOfLines = 0;
[self.nextStepButton.layer setCornerRadius:5];
self.nextStepButton.clipsToBounds = YES;
self.nextStepButton.backgroundColor = kVectorColorGreen;
self.nextStepButton.backgroundColor = kRiotColorGreen;
[self.nextStepButton setTitle:[NSBundle mxk_localizedStringForKey:@"auth_reset_password_next_step_button"] forState:UIControlStateNormal];
[self.nextStepButton setTitle:[NSBundle mxk_localizedStringForKey:@"auth_reset_password_next_step_button"] forState:UIControlStateHighlighted];
self.nextStepButton.enabled = YES;

8
Riot/Views/Contact/ContactTableViewCell.m
View File

@@ -19,7 +19,7 @@
#import "MXKContactManager.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "AvatarGenerator.h"
#import "Tools.h"
@@ -41,7 +41,7 @@
[super awakeFromNib];
// apply the vector colours
self.contactInformationLabel.textColor = kVectorTextColorGray;
self.contactInformationLabel.textColor = kRiotTextColorGray;
// Clear the default background color of a MXKImageView instance
self.thumbnailView.backgroundColor = [UIColor clearColor];
@@ -203,11 +203,11 @@
}
else if ((!contact.isMatrixContact && contact.phoneNumbers.count && !contact.emailAddresses.count))
{
image = [AvatarGenerator imageFromText:@"#" withBackgroundColor:kVectorColorGreen];
image = [AvatarGenerator imageFromText:@"#" withBackgroundColor:kRiotColorGreen];
}
else
{
image = [AvatarGenerator imageFromText:@"@" withBackgroundColor:kVectorColorGreen];
image = [AvatarGenerator imageFromText:@"@" withBackgroundColor:kRiotColorGreen];
}
}

8
Riot/Views/Device/DeviceTableViewCell.m
View File

@@ -17,7 +17,7 @@
#import "DeviceTableViewCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "MXRoom+Vector.h"
#define DEVICE_TABLEVIEW_ROW_CELL_HEIGHT_WITHOUT_LABEL_HEIGHT 59
@@ -30,15 +30,15 @@
{
[super awakeFromNib];
self.deviceName.textColor = kVectorTextColorBlack;
self.deviceName.textColor = kRiotTextColorBlack;
[self.verifyButton.layer setCornerRadius:5];
self.verifyButton.clipsToBounds = YES;
self.verifyButton.backgroundColor = kVectorColorGreen;
self.verifyButton.backgroundColor = kRiotColorGreen;
[self.blockButton.layer setCornerRadius:5];
self.blockButton.clipsToBounds = YES;
self.blockButton.backgroundColor = kVectorColorGreen;
self.blockButton.backgroundColor = kRiotColorGreen;
}
- (void)render:(MXDeviceInfo *)deviceInfo

7
Riot/Views/Device/DeviceView.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -16,7 +17,7 @@
#import "DeviceView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation DeviceView
@@ -24,7 +25,7 @@
{
[super awakeFromNib];
self.defaultTextColor = kVectorTextColorBlack;
self.defaultTextColor = kRiotTextColorBlack;
}
@end
@end

7
Riot/Views/EncryptionInfoView/EncryptionInfoView.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -16,7 +17,7 @@
#import "EncryptionInfoView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation EncryptionInfoView
@@ -24,7 +25,7 @@
{
[super awakeFromNib];
self.defaultTextColor = kVectorTextColorBlack;
self.defaultTextColor = kRiotTextColorBlack;
}
@end
@end

9
Riot/Views/MediaAlbum/MediaAlbumTableCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "MediaAlbumTableCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation MediaAlbumTableCell
@@ -24,8 +25,8 @@
{
[super awakeFromNib];
self.albumDisplayNameLabel.textColor = kVectorTextColorBlack;
self.albumCountLabel.textColor = kVectorTextColorGray;
self.albumDisplayNameLabel.textColor = kRiotTextColorBlack;
self.albumCountLabel.textColor = kRiotTextColorGray;
}
@end
@end

24
Riot/Views/RoomActivitiesView/RoomActivitiesView.m
View File

@@ -17,7 +17,7 @@
#import "RoomActivitiesView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import <objc/runtime.h>
@@ -96,8 +96,8 @@
{
[super awakeFromNib];
self.separatorView.backgroundColor = kVectorColorLightGrey;
self.messageLabel.textColor = kVectorTextColorGray;
self.separatorView.backgroundColor = kRiotColorLightGrey;
self.messageLabel.textColor = kRiotTextColorGray;
// Adjust text view
// Remove the container inset: this operation impacts only the vertical margin.
@@ -132,18 +132,18 @@
[tappableNotif addAttribute:NSLinkAttributeName value:@"onCancelLink" range:range];
NSRange wholeString = NSMakeRange(0, tappableNotif.length);
[tappableNotif addAttribute:NSForegroundColorAttributeName value:kVectorColorPinkRed range:wholeString];
[tappableNotif addAttribute:NSForegroundColorAttributeName value:kRiotColorPinkRed range:wholeString];
[tappableNotif addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:15] range:wholeString];
self.messageTextView.attributedText = tappableNotif;
self.messageTextView.tintColor = kVectorColorPinkRed;
self.messageTextView.tintColor = kRiotColorPinkRed;
self.messageTextView.hidden = NO;
self.messageTextView.backgroundColor = [UIColor clearColor];
}
else
{
self.messageLabel.text = notification;
self.messageLabel.textColor = kVectorColorPinkRed;
self.messageLabel.textColor = kRiotColorPinkRed;
self.messageLabel.hidden = NO;
}
@@ -174,7 +174,7 @@
{
self.iconImageView.image = [UIImage imageNamed:@"error"];
self.messageLabel.text = labelText;
self.messageLabel.textColor = kVectorColorPinkRed;
self.messageLabel.textColor = kRiotColorPinkRed;
self.iconImageView.hidden = NO;
self.messageLabel.hidden = NO;
@@ -226,15 +226,15 @@
// Display the string in white on pink red
NSRange wholeString = NSMakeRange(0, onGoingConferenceCallAttibutedString.length);
[onGoingConferenceCallAttibutedString addAttribute:NSForegroundColorAttributeName value:UIColor.whiteColor range:wholeString];
[onGoingConferenceCallAttibutedString addAttribute:NSBackgroundColorAttributeName value:kVectorColorPinkRed range:wholeString];
[onGoingConferenceCallAttibutedString addAttribute:NSBackgroundColorAttributeName value:kRiotColorPinkRed range:wholeString];
[onGoingConferenceCallAttibutedString addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:15] range:wholeString];
self.messageTextView.attributedText = onGoingConferenceCallAttibutedString;
self.messageTextView.tintColor = UIColor.whiteColor;
self.messageTextView.hidden = NO;
self.backgroundColor = kVectorColorPinkRed;
self.messageTextView.backgroundColor = kVectorColorPinkRed;
self.backgroundColor = kRiotColorPinkRed;
self.messageTextView.backgroundColor = kRiotColorPinkRed;
// Hide the separator to display correctly the red pink conf call banner
self.separatorView.hidden = YES;
@@ -260,7 +260,7 @@
notification = NSLocalizedStringFromTable(@"room_new_message_notification", @"Vector", nil);
}
self.messageLabel.text = [NSString stringWithFormat:notification, newMessagesCount];
self.messageLabel.textColor = kVectorColorPinkRed;
self.messageLabel.textColor = kRiotColorPinkRed;
self.messageLabel.hidden = NO;
}
else
@@ -321,7 +321,7 @@
[self.messageTextView resignFirstResponder];
self.messageTextView.hidden = YES;
self.messageLabel.textColor = kVectorTextColorGray;
self.messageLabel.textColor = kRiotTextColorGray;
objc_removeAssociatedObjects(self.messageTextView);
}

2
Riot/Views/RoomBubbleList/Encryption/RoomIncomingEncryptedAttachmentWithPaginationTitleBubbleCell.m
View File

@@ -18,7 +18,7 @@
#import "RoomEncryptedDataBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomIncomingEncryptedAttachmentWithPaginationTitleBubbleCell

7
Riot/Views/RoomBubbleList/RoomIncomingAttachmentBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomIncomingAttachmentBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomIncomingAttachmentBubbleCell
@@ -24,8 +25,8 @@
{
[super awakeFromNib];
self.userNameLabel.textColor = kVectorTextColorBlack;
self.messageTextView.tintColor = kVectorColorGreen;
self.userNameLabel.textColor = kRiotTextColorBlack;
self.messageTextView.tintColor = kRiotColorGreen;
}
@end

11
Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithPaginationTitleBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomIncomingAttachmentWithPaginationTitleBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomIncomingAttachmentWithPaginationTitleBubbleCell
@@ -24,11 +25,11 @@
{
[super awakeFromNib];
self.userNameLabel.textColor = kVectorTextColorBlack;
self.userNameLabel.textColor = kRiotTextColorBlack;
self.paginationLabel.textColor = kVectorColorGreen;
self.paginationSeparatorView.backgroundColor = kVectorColorGreen;
self.messageTextView.tintColor = kVectorColorGreen;
self.paginationLabel.textColor = kRiotColorGreen;
self.paginationSeparatorView.backgroundColor = kRiotColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
- (void)render:(MXKCellData *)cellData

5
Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomIncomingAttachmentWithoutSenderInfoBubbleCell
@@ -24,7 +25,7 @@
{
[super awakeFromNib];
self.messageTextView.tintColor = kVectorColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
@end

7
Riot/Views/RoomBubbleList/RoomIncomingTextMsgBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomIncomingTextMsgBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomIncomingTextMsgBubbleCell
@@ -24,8 +25,8 @@
{
[super awakeFromNib];
self.userNameLabel.textColor = kVectorTextColorBlack;
self.messageTextView.tintColor = kVectorColorGreen;
self.userNameLabel.textColor = kRiotTextColorBlack;
self.messageTextView.tintColor = kRiotColorGreen;
}
@end

11
Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithPaginationTitleBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomIncomingTextMsgWithPaginationTitleBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomIncomingTextMsgWithPaginationTitleBubbleCell
@@ -24,11 +25,11 @@
{
[super awakeFromNib];
self.userNameLabel.textColor = kVectorTextColorBlack;
self.userNameLabel.textColor = kRiotTextColorBlack;
self.paginationLabel.textColor = kVectorColorGreen;
self.paginationSeparatorView.backgroundColor = kVectorColorGreen;
self.messageTextView.tintColor = kVectorColorGreen;
self.paginationLabel.textColor = kRiotColorGreen;
self.paginationSeparatorView.backgroundColor = kRiotColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
- (void)render:(MXKCellData *)cellData

5
Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell
@@ -24,7 +25,7 @@
{
[super awakeFromNib];
self.messageTextView.tintColor = kVectorColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
@end

5
Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomIncomingTextMsgWithoutSenderInfoBubbleCell
@@ -24,7 +25,7 @@
{
[super awakeFromNib];
self.messageTextView.tintColor = kVectorColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
@end

5
Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithoutSenderNameBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomIncomingTextMsgWithoutSenderNameBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomIncomingTextMsgWithoutSenderNameBubbleCell
@@ -24,7 +25,7 @@
{
[super awakeFromNib];
self.messageTextView.tintColor = kVectorColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
@end

11
Riot/Views/RoomBubbleList/RoomOutgoingAttachmentBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomOutgoingAttachmentBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomOutgoingAttachmentBubbleCell
@@ -25,8 +26,8 @@
[super awakeFromNib];
self.readReceiptsAlignment = ReadReceiptAlignmentRight;
self.userNameLabel.textColor = kVectorTextColorBlack;
self.messageTextView.tintColor = kVectorColorGreen;
self.userNameLabel.textColor = kRiotTextColorBlack;
self.messageTextView.tintColor = kRiotColorGreen;
}
- (void)render:(MXKCellData *)cellData
@@ -48,7 +49,7 @@
// Show a red border when the attachment sending failed
if (bubbleCell->bubbleData.attachment.eventSentState == MXEventSentStateFailed)
{
bubbleCell.attachmentView.layer.borderColor = kVectorColorPinkRed.CGColor;
bubbleCell.attachmentView.layer.borderColor = kRiotColorPinkRed.CGColor;
bubbleCell.attachmentView.layer.borderWidth = 1;
}
else
@@ -58,4 +59,4 @@
}
}
@end
@end

13
Riot/Views/RoomBubbleList/RoomOutgoingAttachmentWithPaginationTitleBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomOutgoingAttachmentWithPaginationTitleBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomOutgoingAttachmentWithPaginationTitleBubbleCell
@@ -25,11 +26,11 @@
[super awakeFromNib];
self.readReceiptsAlignment = ReadReceiptAlignmentRight;
self.userNameLabel.textColor = kVectorTextColorBlack;
self.userNameLabel.textColor = kRiotTextColorBlack;
self.paginationLabel.textColor = kVectorColorGreen;
self.paginationSeparatorView.backgroundColor = kVectorColorGreen;
self.messageTextView.tintColor = kVectorColorGreen;
self.paginationLabel.textColor = kRiotColorGreen;
self.paginationSeparatorView.backgroundColor = kRiotColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
- (void)render:(MXKCellData *)cellData
@@ -42,4 +43,4 @@
}
}
@end
@end

7
Riot/Views/RoomBubbleList/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomOutgoingAttachmentWithoutSenderInfoBubbleCell
@@ -25,7 +26,7 @@
[super awakeFromNib];
self.readReceiptsAlignment = ReadReceiptAlignmentRight;
self.messageTextView.tintColor = kVectorColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
- (void)render:(MXKCellData *)cellData
@@ -35,4 +36,4 @@
[RoomOutgoingAttachmentBubbleCell render:cellData inBubbleCell:self];
}
@end
@end

9
Riot/Views/RoomBubbleList/RoomOutgoingTextMsgBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomOutgoingTextMsgBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomOutgoingTextMsgBubbleCell
@@ -25,8 +26,8 @@
[super awakeFromNib];
self.readReceiptsAlignment = ReadReceiptAlignmentRight;
self.userNameLabel.textColor = kVectorTextColorBlack;
self.messageTextView.tintColor = kVectorColorGreen;
self.userNameLabel.textColor = kRiotTextColorBlack;
self.messageTextView.tintColor = kRiotColorGreen;
}
@end
@end

13
Riot/Views/RoomBubbleList/RoomOutgoingTextMsgWithPaginationTitleBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomOutgoingTextMsgWithPaginationTitleBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomOutgoingTextMsgWithPaginationTitleBubbleCell
@@ -25,11 +26,11 @@
[super awakeFromNib];
self.readReceiptsAlignment = ReadReceiptAlignmentRight;
self.userNameLabel.textColor = kVectorTextColorBlack;
self.userNameLabel.textColor = kRiotTextColorBlack;
self.paginationLabel.textColor = kVectorColorGreen;
self.paginationSeparatorView.backgroundColor = kVectorColorGreen;
self.messageTextView.tintColor = kVectorColorGreen;
self.paginationLabel.textColor = kRiotColorGreen;
self.paginationSeparatorView.backgroundColor = kRiotColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
- (void)render:(MXKCellData *)cellData
@@ -42,4 +43,4 @@
}
}
@end
@end

7
Riot/Views/RoomBubbleList/RoomOutgoingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomOutgoingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomOutgoingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell
@@ -24,7 +25,7 @@
{
[super awakeFromNib];
self.messageTextView.tintColor = kVectorColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
@end
@end

7
Riot/Views/RoomBubbleList/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomOutgoingTextMsgWithoutSenderInfoBubbleCell
@@ -25,7 +26,7 @@
[super awakeFromNib];
self.readReceiptsAlignment = ReadReceiptAlignmentRight;
self.messageTextView.tintColor = kVectorColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
@end
@end

7
Riot/Views/RoomBubbleList/RoomOutgoingTextMsgWithoutSenderNameBubbleCell.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomOutgoingTextMsgWithoutSenderNameBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomOutgoingTextMsgWithoutSenderNameBubbleCell
@@ -24,7 +25,7 @@
{
[super awakeFromNib];
self.messageTextView.tintColor = kVectorColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
@end
@end

13
Riot/Views/RoomInputToolbar/RoomInputToolbarView.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomInputToolbarView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "UINavigationController+Vector.h"
@@ -67,10 +68,10 @@
self.rightInputToolbarButton.hidden = YES;
[self.rightInputToolbarButton setTitleColor:kVectorColorGreen forState:UIControlStateNormal];
[self.rightInputToolbarButton setTitleColor:kVectorColorGreen forState:UIControlStateHighlighted];
[self.rightInputToolbarButton setTitleColor:kRiotColorGreen forState:UIControlStateNormal];
[self.rightInputToolbarButton setTitleColor:kRiotColorGreen forState:UIControlStateHighlighted];
self.separatorView.backgroundColor = kVectorColorSilver;
self.separatorView.backgroundColor = kRiotColorSilver;
// Custom the growingTextView display
growingTextView.layer.cornerRadius = 0;
@@ -78,8 +79,8 @@
growingTextView.backgroundColor = [UIColor clearColor];
growingTextView.font = [UIFont systemFontOfSize:15];
growingTextView.textColor = kVectorTextColorBlack;
growingTextView.tintColor = kVectorColorGreen;
growingTextView.textColor = kRiotTextColorBlack;
growingTextView.tintColor = kRiotColorGreen;
self.placeholder = NSLocalizedStringFromTable(@"room_message_placeholder", @"Vector", nil);
}

7
Riot/Views/RoomList/DirectoryRecentTableViewCell.m
View File

@@ -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.
@@ -18,7 +19,7 @@
#import "PublicRoomsDirectoryDataSource.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation DirectoryRecentTableViewCell
@@ -28,8 +29,8 @@
{
[super awakeFromNib];
self.titleLabel.textColor = kVectorTextColorBlack;
self.descriptionLabel.textColor = kVectorTextColorGray;
self.titleLabel.textColor = kRiotTextColorBlack;
self.descriptionLabel.textColor = kRiotTextColorGray;
}
- (void)render:(PublicRoomsDirectoryDataSource *)publicRoomsDirectoryDataSource

9
Riot/Views/RoomList/InviteRecentTableViewCell.m
View File

@@ -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.
@@ -20,7 +21,7 @@
#import "MXEvent.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#pragma mark - Constant definitions
@@ -39,7 +40,7 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
[self.leftButton.layer setCornerRadius:5];
self.leftButton.clipsToBounds = YES;
self.leftButton.backgroundColor = kVectorColorGreen;
self.leftButton.backgroundColor = kRiotColorGreen;
[self.leftButton setTitle:NSLocalizedStringFromTable(@"decline", @"Vector", nil) forState:UIControlStateNormal];
[self.leftButton setTitle:NSLocalizedStringFromTable(@"decline", @"Vector", nil) forState:UIControlStateHighlighted];
[self.leftButton addTarget:self action:@selector(onDeclinePressed:) forControlEvents:UIControlEventTouchUpInside];
@@ -47,12 +48,12 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
[self.rightButton.layer setCornerRadius:5];
self.rightButton.clipsToBounds = YES;
self.rightButton.backgroundColor = kVectorColorGreen;
self.rightButton.backgroundColor = kRiotColorGreen;
[self.rightButton setTitle:NSLocalizedStringFromTable(@"preview", @"Vector", nil) forState:UIControlStateNormal];
[self.rightButton setTitle:NSLocalizedStringFromTable(@"preview", @"Vector", nil) forState:UIControlStateHighlighted];
[self.rightButton addTarget:self action:@selector(onPreviewPressed:) forControlEvents:UIControlEventTouchUpInside];
self.noticeBadgeView.backgroundColor = kVectorColorPinkRed;
self.noticeBadgeView.backgroundColor = kRiotColorPinkRed;
[self.noticeBadgeView.layer setCornerRadius:10];
self.selectionStyle = UITableViewCellSelectionStyleNone;

17
Riot/Views/RoomList/RecentTableViewCell.m
View File

@@ -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.
@@ -20,7 +21,7 @@
#import "MXEvent.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "MXRoom+Vector.h"
@@ -36,9 +37,9 @@
[_missedNotifAndUnreadBadgeBgView.layer setCornerRadius:10];
_missedNotifAndUnreadBadgeBgViewWidthConstraint.constant = 0;
self.roomTitle.textColor = kVectorTextColorBlack;
self.lastEventDescription.textColor = kVectorTextColorGray;
self.lastEventDate.textColor = kVectorTextColorGray;
self.roomTitle.textColor = kRiotTextColorBlack;
self.lastEventDescription.textColor = kRiotTextColorGray;
self.lastEventDate.textColor = kRiotTextColorGray;
self.missedNotifAndUnreadBadgeLabel.textColor = [UIColor whiteColor];
}
@@ -70,7 +71,7 @@
{
// Force the default text color for the last message (cancel highlighted message color)
NSMutableAttributedString *lastEventDescription = [[NSMutableAttributedString alloc] initWithAttributedString:roomCellData.lastEventAttributedTextMessage];
[lastEventDescription addAttribute:NSForegroundColorAttributeName value:kVectorTextColorGray range:NSMakeRange(0, lastEventDescription.length)];
[lastEventDescription addAttribute:NSForegroundColorAttributeName value:kRiotTextColorGray range:NSMakeRange(0, lastEventDescription.length)];
self.lastEventDescription.attributedText = lastEventDescription;
}
else
@@ -85,7 +86,7 @@
if (0 < roomCellData.notificationCount)
{
self.missedNotifAndUnreadIndicator.backgroundColor = roomCellData.highlightCount ? kVectorColorPinkRed : kVectorColorGreen;
self.missedNotifAndUnreadIndicator.backgroundColor = roomCellData.highlightCount ? kRiotColorPinkRed : kRiotColorGreen;
self.missedNotifAndUnreadBadgeBgView.hidden = NO;
self.missedNotifAndUnreadBadgeBgView.backgroundColor = self.missedNotifAndUnreadIndicator.backgroundColor;
@@ -97,7 +98,7 @@
}
else
{
self.missedNotifAndUnreadIndicator.backgroundColor = kVectorColorSilver;
self.missedNotifAndUnreadIndicator.backgroundColor = kRiotColorSilver;
}
// Use bold font for the room title
@@ -112,7 +113,7 @@
}
else
{
self.lastEventDate.textColor = kVectorTextColorGray;
self.lastEventDate.textColor = kRiotTextColorGray;
// The room title is not bold anymore
if ([UIFont respondsToSelector:@selector(systemFontOfSize:weight:)])

5
Riot/Views/RoomList/RoomIdOrAliasTableViewCell.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -17,7 +18,7 @@
#import "RoomIdOrAliasTableViewCell.h"
#import "AvatarGenerator.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation RoomIdOrAliasTableViewCell
@@ -27,7 +28,7 @@
{
[super awakeFromNib];
self.titleLabel.textColor = kVectorTextColorBlack;
self.titleLabel.textColor = kRiotTextColorBlack;
}
- (void)layoutSubviews

5
Riot/Views/RoomList/RoomTableViewCell.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -16,7 +17,7 @@
#import "RoomTableViewCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "MXRoom+Vector.h"
@implementation RoomTableViewCell
@@ -27,7 +28,7 @@
{
[super awakeFromNib];
self.titleLabel.textColor = kVectorTextColorBlack;
self.titleLabel.textColor = kRiotTextColorBlack;
}
- (void)layoutSubviews

13
Riot/Views/RoomTitle/ExpandedRoomTitleView.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -16,7 +17,7 @@
#import "ExpandedRoomTitleView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "MXRoom+Vector.h"
@@ -32,9 +33,9 @@
{
[super awakeFromNib];
self.displayNameTextField.textColor = kVectorTextColorBlack;
self.roomTopic.textColor = kVectorTextColorDarkGray;
self.roomMembers.textColor = kVectorColorGreen;
self.displayNameTextField.textColor = kRiotTextColorBlack;
self.roomTopic.textColor = kRiotTextColorDarkGray;
self.roomMembers.textColor = kRiotColorGreen;
}
- (void)refreshDisplay
@@ -47,11 +48,11 @@
if (!self.displayNameTextField.text.length)
{
self.displayNameTextField.text = NSLocalizedStringFromTable(@"room_displayname_no_title", @"Vector", nil);
self.displayNameTextField.textColor = kVectorTextColorGray;
self.displayNameTextField.textColor = kRiotTextColorGray;
}
else
{
self.displayNameTextField.textColor = kVectorTextColorBlack;
self.displayNameTextField.textColor = kRiotTextColorBlack;
}
self.roomTopic.text = [MXTools stripNewlineCharacters:self.mxRoom.state.topic];

25
Riot/Views/RoomTitle/PreviewRoomTitleView.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -16,7 +17,7 @@
#import "PreviewRoomTitleView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "MXRoom+Vector.h"
@@ -32,28 +33,28 @@
{
[super awakeFromNib];
self.mainHeaderBackground.backgroundColor = kVectorColorLightGrey;
self.mainHeaderBackground.backgroundColor = kRiotColorLightGrey;
self.displayNameTextField.textColor = kVectorTextColorBlack;
self.displayNameTextField.textColor = kRiotTextColorBlack;
self.roomTopic.textColor = kVectorTextColorDarkGray;
self.roomTopic.textColor = kRiotTextColorDarkGray;
self.roomTopic.numberOfLines = 0;
self.roomMembers.textColor = kVectorColorGreen;
self.roomMembers.textColor = kRiotColorGreen;
self.previewLabel.textColor = kVectorTextColorDarkGray;
self.previewLabel.textColor = kRiotTextColorDarkGray;
self.previewLabel.numberOfLines = 0;
self.previewLabel.text = nil;
self.subNoticeLabel.textColor = kVectorTextColorGray;
self.subNoticeLabel.textColor = kRiotTextColorGray;
self.subNoticeLabel.numberOfLines = 0;
self.subNoticeLabel.text = nil;
self.bottomBorderView.backgroundColor = kVectorColorLightGrey;
self.bottomBorderView.backgroundColor = kRiotColorLightGrey;
[self.leftButton.layer setCornerRadius:5];
self.leftButton.clipsToBounds = YES;
self.leftButton.backgroundColor = kVectorColorGreen;
self.leftButton.backgroundColor = kRiotColorGreen;
[self.leftButton setTitle:NSLocalizedStringFromTable(@"decline", @"Vector", nil) forState:UIControlStateNormal];
[self.leftButton setTitle:NSLocalizedStringFromTable(@"decline", @"Vector", nil) forState:UIControlStateHighlighted];
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(reportTapGesture:)];
@@ -65,7 +66,7 @@
[self.rightButton.layer setCornerRadius:5];
self.rightButton.clipsToBounds = YES;
self.rightButton.backgroundColor = kVectorColorGreen;
self.rightButton.backgroundColor = kRiotColorGreen;
[self.rightButton setTitle:NSLocalizedStringFromTable(@"join", @"Vector", nil) forState:UIControlStateNormal];
[self.rightButton setTitle:NSLocalizedStringFromTable(@"join", @"Vector", nil) forState:UIControlStateHighlighted];
tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(reportTapGesture:)];
@@ -137,11 +138,11 @@
if (!self.displayNameTextField.text.length)
{
self.displayNameTextField.text = NSLocalizedStringFromTable(@"room_displayname_no_title", @"Vector", nil);
self.displayNameTextField.textColor = kVectorTextColorGray;
self.displayNameTextField.textColor = kRiotTextColorGray;
}
else
{
self.displayNameTextField.textColor = kVectorTextColorBlack;
self.displayNameTextField.textColor = kRiotTextColorBlack;
}
// Display room topic

5
Riot/Views/RoomTitle/RoomAvatarTitleView.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -16,7 +17,7 @@
#import "RoomAvatarTitleView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "MXRoom+Vector.h"
@@ -89,7 +90,7 @@
self.roomAvatar.layer.cornerRadius = self.roomAvatar.frame.size.width / 2;
self.roomAvatar.clipsToBounds = YES;
self.roomAvatar.backgroundColor = kVectorColorLightGrey;
self.roomAvatar.backgroundColor = kRiotColorLightGrey;
}
- (void)setRoomAvatarURL:(NSString *)roomAvatarURL

9
Riot/Views/RoomTitle/RoomTitleView.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "RoomTitleView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "MXRoom+Vector.h"
@@ -37,7 +38,7 @@
{
[super awakeFromNib];
self.displayNameTextField.textColor = kVectorTextColorBlack;
self.displayNameTextField.textColor = kRiotTextColorBlack;
if (_titleMask)
{
@@ -120,11 +121,11 @@
if (!self.displayNameTextField.text.length)
{
self.displayNameTextField.text = NSLocalizedStringFromTable(@"room_displayname_no_title", @"Vector", nil);
self.displayNameTextField.textColor = kVectorTextColorGray;
self.displayNameTextField.textColor = kRiotTextColorGray;
}
else
{
self.displayNameTextField.textColor = kVectorTextColorBlack;
self.displayNameTextField.textColor = kRiotTextColorBlack;
}
}
}

9
Riot/Views/RoomTitle/SimpleRoomTitleView.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -16,7 +17,7 @@
#import "SimpleRoomTitleView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "MXRoom+Vector.h"
@@ -32,7 +33,7 @@
{
[super awakeFromNib];
self.displayNameTextField.textColor = kVectorTextColorBlack;
self.displayNameTextField.textColor = kRiotTextColorBlack;
}
- (void)layoutSubviews
@@ -77,11 +78,11 @@
if (!self.displayNameTextField.text.length)
{
self.displayNameTextField.text = NSLocalizedStringFromTable(@"room_displayname_no_title", @"Vector", nil);
self.displayNameTextField.textColor = kVectorTextColorGray;
self.displayNameTextField.textColor = kRiotTextColorGray;
}
else
{
self.displayNameTextField.textColor = kVectorTextColorBlack;
self.displayNameTextField.textColor = kRiotTextColorBlack;
}
}
}

9
Riot/Views/Search/FilesSearchTableViewCell.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -16,7 +17,7 @@
#import "FilesSearchTableViewCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation FilesSearchTableViewCell
@synthesize delegate, mxkCellData;
@@ -25,11 +26,11 @@
{
[super awakeFromNib];
self.title.textColor = kVectorTextColorBlack;
self.title.textColor = kRiotTextColorBlack;
self.message.textColor = kVectorTextColorGray;
self.message.textColor = kRiotTextColorGray;
self.date.tintColor = kVectorTextColorGray;
self.date.tintColor = kRiotTextColorGray;
}
+ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth

9
Riot/Views/Search/MessagesSearchResultAttachmentBubbleCell.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -16,7 +17,7 @@
#import "MessagesSearchResultAttachmentBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "MXRoom+Vector.h"
@@ -26,11 +27,11 @@
{
[super awakeFromNib];
self.userNameLabel.textColor = kVectorTextColorBlack;
self.userNameLabel.textColor = kRiotTextColorBlack;
self.roomNameLabel.textColor = kVectorTextColorGray;
self.roomNameLabel.textColor = kRiotTextColorGray;
self.messageTextView.tintColor = kVectorColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
- (void)render:(MXKCellData *)cellData

9
Riot/Views/Search/MessagesSearchResultTextMsgBubbleCell.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -16,7 +17,7 @@
#import "MessagesSearchResultTextMsgBubbleCell.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
#import "MXRoom+Vector.h"
@@ -26,11 +27,11 @@
{
[super awakeFromNib];
self.userNameLabel.textColor = kVectorTextColorBlack;
self.userNameLabel.textColor = kRiotTextColorBlack;
self.roomNameLabel.textColor = kVectorTextColorGray;
self.roomNameLabel.textColor = kRiotTextColorGray;
self.messageTextView.tintColor = kVectorColorGreen;
self.messageTextView.tintColor = kRiotColorGreen;
}
- (void)render:(MXKCellData *)cellData

4
Riot/Views/TableViewCell/TableViewCellWithCheckBoxAndLabel.m
View File

@@ -16,7 +16,7 @@
#import "TableViewCellWithCheckBoxAndLabel.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation TableViewCellWithCheckBoxAndLabel
@@ -24,7 +24,7 @@
{
[super awakeFromNib];
_label.textColor = kVectorTextColorBlack;
_label.textColor = kRiotTextColorBlack;
}
- (void)setEnabled:(BOOL)enabled

5
Riot/Views/TableViewCell/TableViewCellWithCheckBoxes.m
View File

@@ -1,5 +1,6 @@
/*
Copyright 2016 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.
@@ -16,7 +17,7 @@
#import "TableViewCellWithCheckBoxes.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
// The space between 2 check boxes
#define TABLEVIEWCELLWITHCHECKBOXES_MARGIN 8
@@ -136,7 +137,7 @@
UILabel *theLabel = [[UILabel alloc] initWithFrame:CGRectMake(60, 0, containerWidth - 60, 31)];
theLabel.translatesAutoresizingMaskIntoConstraints = NO;
theLabel.textColor = kVectorTextColorBlack;
theLabel.textColor = kRiotTextColorBlack;
[checkboxContainer addSubview:theLabel];
[labelArray addObject:theLabel];

5
Riot/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.m
View File

@@ -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.
@@ -16,7 +17,7 @@
#import "TableViewCellWithLabelAndLargeTextView.h"
#import "VectorDesignValues.h"
#import "RiotDesignValues.h"
@implementation TableViewCellWithLabelAndLargeTextView
@@ -24,7 +25,7 @@
{
[super awakeFromNib];
_label.textColor = kVectorTextColorBlack;
_label.textColor = kRiotTextColorBlack;
// Adjust text view
// Remove the container inset: this operation impacts only the vertical margin.