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

reskin: kill kRiotPrimaryBgColor

Browse Source
This commit is contained in:
manuroe
2019-01-10 17:50:26 +01:00
parent 77e6a81276
commit dd4e20d389
49 changed files with 120 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/Attachements/AttachmentsViewController.m
+1 -1
View File
@@ -61,7 +61,7 @@
{
[RiotDesignValues.theme applyStyleOnNavigationBar:self.navigationController.navigationBar];
self.view.backgroundColor = kRiotPrimaryBgColor;
self.view.backgroundColor = RiotDesignValues.theme.backgroundColor;
self.activityIndicator.backgroundColor = kRiotOverlayColor;
self.backButton.tintColor = RiotDesignValues.theme.tintColor;
Riot/Modules/Room/Files/RoomFilesViewController.m
+2 -2
View File
@@ -115,7 +115,7 @@
self.activityIndicator.backgroundColor = kRiotOverlayColor;
// Check the table view style to select its bg color.
self.bubblesTableView.backgroundColor = ((self.bubblesTableView.style == UITableViewStylePlain) ? kRiotPrimaryBgColor : kRiotSecondaryBgColor);
self.bubblesTableView.backgroundColor = ((self.bubblesTableView.style == UITableViewStylePlain) ? RiotDesignValues.theme.backgroundColor : kRiotSecondaryBgColor);
self.view.backgroundColor = self.bubblesTableView.backgroundColor;
if (self.bubblesTableView.dataSource)
@@ -193,7 +193,7 @@
- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
{
cell.backgroundColor = kRiotPrimaryBgColor;
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
+2 -2
View File
@@ -228,7 +228,7 @@
self.roomMemberStatusLabel.textColor = RiotDesignValues.theme.tintColor;
// Check the table view style to select its bg color.
self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? kRiotPrimaryBgColor : kRiotSecondaryBgColor);
self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? RiotDesignValues.theme.backgroundColor : kRiotSecondaryBgColor);
self.view.backgroundColor = self.tableView.backgroundColor;
if (self.tableView.dataSource)
@@ -843,7 +843,7 @@
- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
{
cell.backgroundColor = kRiotPrimaryBgColor;
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
Riot/Modules/Room/Members/RoomParticipantsViewController.m
+5 -5
View File
@@ -166,12 +166,12 @@
_searchBarHeaderBorder.backgroundColor = RiotDesignValues.theme.headerBorderColor;
// Check the table view style to select its bg color.
self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? kRiotPrimaryBgColor : kRiotSecondaryBgColor);
self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? RiotDesignValues.theme.backgroundColor : kRiotSecondaryBgColor);
self.view.backgroundColor = self.tableView.backgroundColor;
// Update the gradient view above the screen
CGFloat white = 1.0;
[kRiotPrimaryBgColor getWhite:&white alpha:nil];
[RiotDesignValues.theme.backgroundColor getWhite:&white alpha:nil];
CGColorRef opaqueWhiteColor = [UIColor colorWithWhite:white alpha:1.0].CGColor;
CGColorRef transparentWhiteColor = [UIColor colorWithWhite:white alpha:0].CGColor;
tableViewMaskLayer.colors = @[(__bridge id) transparentWhiteColor, (__bridge id) transparentWhiteColor, (__bridge id) opaqueWhiteColor];
@@ -575,9 +575,9 @@
// Add blur mask programmatically
tableViewMaskLayer = [CAGradientLayer layer];
// Consider the grayscale components of the kRiotPrimaryBgColor.
// Consider the grayscale components of the RiotDesignValues.theme.backgroundColor.
CGFloat white = 1.0;
[kRiotPrimaryBgColor getWhite:&white alpha:nil];
[RiotDesignValues.theme.backgroundColor getWhite:&white alpha:nil];
CGColorRef opaqueWhiteColor = [UIColor colorWithWhite:white alpha:1.0].CGColor;
CGColorRef transparentWhiteColor = [UIColor colorWithWhite:white alpha:0].CGColor;
@@ -1175,7 +1175,7 @@
- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
{
cell.backgroundColor = kRiotPrimaryBgColor;
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m
+3 -3
View File
@@ -102,10 +102,10 @@
self.overlayView.alpha = 1.0;
self.titleLabel.textColor = kRiotPrimaryTextColor;
self.containerView.backgroundColor = kRiotPrimaryBgColor;
self.containerView.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Check the table view style to select its bg color.
self.receiptsTableView.backgroundColor = ((self.receiptsTableView.style == UITableViewStylePlain) ? kRiotPrimaryBgColor : kRiotSecondaryBgColor);
self.receiptsTableView.backgroundColor = ((self.receiptsTableView.style == UITableViewStylePlain) ? RiotDesignValues.theme.backgroundColor : kRiotSecondaryBgColor);
self.closeButton.tintColor = RiotDesignValues.theme.tintColor;
@@ -240,7 +240,7 @@
- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
{
cell.backgroundColor = kRiotPrimaryBgColor;
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
Riot/Modules/Room/RoomViewController.m
+4 -4
View File
@@ -424,19 +424,19 @@
self.activityIndicator.backgroundColor = kRiotOverlayColor;
// Prepare jump to last unread banner
self.jumpToLastUnreadBannerContainer.backgroundColor = kRiotPrimaryBgColor;
self.jumpToLastUnreadBannerContainer.backgroundColor = RiotDesignValues.theme.backgroundColor;
self.jumpToLastUnreadLabel.attributedText = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"room_jump_to_first_unread", @"Vector", nil) attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle), NSUnderlineColorAttributeName: kRiotPrimaryTextColor, NSForegroundColorAttributeName: kRiotPrimaryTextColor}];
self.expandedHeaderContainer.backgroundColor = kRiotSecondaryBgColor;
self.previewHeaderContainer.backgroundColor = kRiotSecondaryBgColor;
missedDiscussionsBadgeLabel.textColor = kRiotPrimaryBgColor;
missedDiscussionsBadgeLabel.textColor = RiotDesignValues.theme.backgroundColor;
missedDiscussionsBadgeLabel.font = [UIFont boldSystemFontOfSize:14];
missedDiscussionsBadgeLabel.backgroundColor = [UIColor clearColor];
// Check the table view style to select its bg color.
self.bubblesTableView.backgroundColor = ((self.bubblesTableView.style == UITableViewStylePlain) ? kRiotPrimaryBgColor : kRiotSecondaryBgColor);
self.bubblesTableView.backgroundColor = ((self.bubblesTableView.style == UITableViewStylePlain) ? RiotDesignValues.theme.backgroundColor : kRiotSecondaryBgColor);
self.view.backgroundColor = self.bubblesTableView.backgroundColor;
if (self.bubblesTableView.dataSource)
@@ -3338,7 +3338,7 @@
- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
{
cell.backgroundColor = kRiotPrimaryBgColor;
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
+3 -3
View File
@@ -77,10 +77,10 @@
self.activityIndicator.backgroundColor = kRiotOverlayColor;
// Check the table view style to select its bg color.
self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? kRiotPrimaryBgColor : kRiotSecondaryBgColor);
self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? RiotDesignValues.theme.backgroundColor : kRiotSecondaryBgColor);
self.view.backgroundColor = self.searchTableView.backgroundColor;
self.noResultsLabel.textColor = kRiotPrimaryBgColor;
self.noResultsLabel.textColor = RiotDesignValues.theme.backgroundColor;
if (self.searchTableView.dataSource)
{
@@ -146,7 +146,7 @@
- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
{
cell.backgroundColor = kRiotPrimaryBgColor;
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
+3 -3
View File
@@ -78,10 +78,10 @@
self.activityIndicator.backgroundColor = kRiotOverlayColor;
// Check the table view style to select its bg color.
self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? kRiotPrimaryBgColor : kRiotSecondaryBgColor);
self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? RiotDesignValues.theme.backgroundColor : kRiotSecondaryBgColor);
self.view.backgroundColor = self.searchTableView.backgroundColor;
self.noResultsLabel.textColor = kRiotPrimaryBgColor;
self.noResultsLabel.textColor = RiotDesignValues.theme.backgroundColor;
if (self.searchTableView.dataSource)
{
@@ -173,7 +173,7 @@
- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
{
cell.backgroundColor = kRiotPrimaryBgColor;
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
Riot/Modules/Room/Settings/RoomSettingsViewController.m
+2 -2
View File
@@ -271,7 +271,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
self.activityIndicator.backgroundColor = kRiotOverlayColor;
// Check the table view style to select its bg color.
self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? kRiotPrimaryBgColor : kRiotSecondaryBgColor);
self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? RiotDesignValues.theme.backgroundColor : kRiotSecondaryBgColor);
self.view.backgroundColor = self.tableView.backgroundColor;
if (self.tableView.dataSource)
@@ -2822,7 +2822,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
{
cell.backgroundColor = kRiotPrimaryBgColor;
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
+6 -5
View File
@@ -18,6 +18,7 @@
#import "RoomActivitiesView.h"
#import "RiotDesignValues.h"
#import "Riot-Swift.h"
#import <objc/runtime.h>
@@ -259,12 +260,12 @@
// Display the string in white on pink red
NSRange wholeString = NSMakeRange(0, onGoingConferenceCallAttibutedString.length);
[onGoingConferenceCallAttibutedString addAttribute:NSForegroundColorAttributeName value:kRiotPrimaryBgColor range:wholeString];
[onGoingConferenceCallAttibutedString addAttribute:NSForegroundColorAttributeName value:RiotDesignValues.theme.backgroundColor 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 = kRiotPrimaryBgColor;
self.messageTextView.tintColor = RiotDesignValues.theme.backgroundColor;
self.messageTextView.hidden = NO;
self.backgroundColor = kRiotColorPinkRed;
@@ -431,13 +432,13 @@
message2 = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"room_resource_usage_limit_reached_message_2", @"Vector", nil)
attributes:@{
NSFontAttributeName: [UIFont boldSystemFontOfSize:fontSize],
NSForegroundColorAttributeName: kRiotPrimaryBgColor
NSForegroundColorAttributeName: RiotDesignValues.theme.backgroundColor
}];
}
NSDictionary *attributes = @{
NSFontAttributeName: [UIFont systemFontOfSize:fontSize],
NSForegroundColorAttributeName: kRiotPrimaryBgColor
NSForegroundColorAttributeName: RiotDesignValues.theme.backgroundColor
};
NSDictionary *messageContact2LinkAttributes;
@@ -481,7 +482,7 @@
[attributedText appendAttributedString:messageContact3];
self.messageTextView.attributedText = attributedText;
self.messageTextView.tintColor = kRiotPrimaryBgColor;
self.messageTextView.tintColor = RiotDesignValues.theme.backgroundColor;
self.messageTextView.hidden = NO;
if (hardLimit)
Riot/Modules/Room/Views/Event/EventDetailsView.m
+1 -1
View File
@@ -26,7 +26,7 @@
[super customizeViewRendering];
self.backgroundColor = kRiotSecondaryBgColor;
self.textView.backgroundColor = kRiotPrimaryBgColor;
self.textView.backgroundColor = RiotDesignValues.theme.backgroundColor;
self.textView.textColor = kRiotPrimaryTextColor;
self.redactButton.tintColor = RiotDesignValues.theme.tintColor;
self.closeButton.tintColor = RiotDesignValues.theme.tintColor;