From 7420cc222e09787c0c2f61f4e02f13f9d56ce222 Mon Sep 17 00:00:00 2001
From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Mon, 27 Apr 2020 15:36:59 -0400
Subject: [PATCH] UI: fix color and layout
Change-Id: I91a27370fb97488cc62946d339704ae02ee313a6
---
Ring/Ring/Calls/CallViewController.swift | 6 +++---
.../Conversation/ConversationViewController.swift | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Ring/Ring/Calls/CallViewController.swift b/Ring/Ring/Calls/CallViewController.swift
index 1fcf053e3..cd0435fed 100644
--- a/Ring/Ring/Calls/CallViewController.swift
+++ b/Ring/Ring/Calls/CallViewController.swift
@@ -109,13 +109,13 @@ class CallViewController: UIViewController, StoryboardBased, ViewModelBased {
self.setUpCallButtons()
self.setupBindings()
self.profileImageView.tintColor = UIColor.jamiDefaultAvatar
+ nameLabel.textColor = UIColor.jamiLabelColor
+ durationLabel.textColor = UIColor.jamiLabelColor
+ infoBottomLabel.textColor = UIColor.jamiLabelColor
if self.viewModel.isAudioOnly {
// The durationLabel and buttonsContainer alpha is set here to 0, and to 1 (with a duration) when appear on the screen to have a fade in animation
self.durationLabel.alpha = 0
self.buttonsContainer.stackView.alpha = 0
- nameLabel.textColor = UIColor.jamiLabelColor
- durationLabel.textColor = UIColor.jamiLabelColor
- infoBottomLabel.textColor = UIColor.jamiLabelColor
self.showAllInfo()
self.setWhiteAvatarView()
}
diff --git a/Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift b/Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift
index f66daec84..decc5f333 100644
--- a/Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift
+++ b/Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift
@@ -77,6 +77,7 @@ class ConversationViewController: UIViewController,
self.setupNavTitle(profileImageData: self.viewModel.profileImageData.value,
displayName: self.viewModel.displayName.value,
username: self.viewModel.userName.value)
+ self.tableView.reloadData()
}).disposed(by: self.disposeBag)
/*
--
GitLab