From ce0efc77db10c8a68c170a1dfacecc3733db1749 Mon Sep 17 00:00:00 2001
From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Tue, 17 Oct 2023 16:27:26 -0400
Subject: [PATCH] UI/UX: update actions color
Change-Id: I3f774ea27d094073dcd9b3d367a8ef1654ce0241
---
.../Extensions/UIViewController+Ring.swift | 2 +-
.../ConversationViewController.swift | 4 ++--
.../SmartList/SmartListHeaderView.swift | 2 +-
.../SmartList/SmartlistViewController.swift | 18 +++++++++---------
.../Walkthrough/WelcomeViewController.swift | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Ring/Ring/Extensions/UIViewController+Ring.swift b/Ring/Ring/Extensions/UIViewController+Ring.swift
index 9f11bafc3..d2db3e6eb 100644
--- a/Ring/Ring/Extensions/UIViewController+Ring.swift
+++ b/Ring/Ring/Extensions/UIViewController+Ring.swift
@@ -168,7 +168,7 @@ extension UIViewController {
// Explicitly set shadow properties to none
appearance.shadowColor = .clear
appearance.shadowImage = UIImage()
- navigationController?.navigationBar.tintColor = UIColor.jamiMain
+ navigationController?.navigationBar.tintColor = UIColor.jamiButtonDark
self.navigationController?.navigationBar.layer.shadowOpacity = 0
// Apply the appearance configuration
diff --git a/Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift b/Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift
index 7607ada25..3cbdd58f0 100644
--- a/Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift
+++ b/Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift
@@ -560,7 +560,7 @@ class ConversationViewController: UIViewController,
let dnlabel: UILabel = UILabel.init(frame: CGRect.init(x: imageSize + infoPadding, y: dnlabelYOffset, width: maxNameLength, height: 20))
dnlabel.text = name
dnlabel.font = UIFont.systemFont(ofSize: nameSize)
- dnlabel.textColor = UIColor.jamiMain
+ dnlabel.textColor = UIColor.jamiButtonDark
dnlabel.textAlignment = .left
titleView.addSubview(dnlabel)
nameSize = 14.0
@@ -575,7 +575,7 @@ class ConversationViewController: UIViewController,
let unlabel: UILabel = UILabel.init(frame: frame)
unlabel.text = username
unlabel.font = UIFont.systemFont(ofSize: nameSize)
- unlabel.textColor = UIColor.jamiMain
+ unlabel.textColor = UIColor.jamiButtonDark
unlabel.textAlignment = .left
titleView.addSubview(unlabel)
}
diff --git a/Ring/Ring/Features/Conversations/SmartList/SmartListHeaderView.swift b/Ring/Ring/Features/Conversations/SmartList/SmartListHeaderView.swift
index 04e391002..f6758d6ca 100644
--- a/Ring/Ring/Features/Conversations/SmartList/SmartListHeaderView.swift
+++ b/Ring/Ring/Features/Conversations/SmartList/SmartListHeaderView.swift
@@ -77,7 +77,7 @@ class SmartListHeaderView: UIView {
UIGraphicsBeginImageContextWithOptions(roundedRectSize, false, UIScreen.main.scale)
let roundedRectPath = UIBezierPath(roundedRect: CGRect(origin: .zero, size: roundedRectSize), cornerRadius: roundedRectSize.height / 2)
- UIColor.jamiMain.setFill()
+ UIColor.jamiButtonDark.setFill()
roundedRectPath.fill()
let stringOrigin = CGPoint(x: (roundedRectSize.width - sizeOfString.width) / 2, y: (roundedRectSize.height - sizeOfString.height) / 2)
diff --git a/Ring/Ring/Features/Conversations/SmartList/SmartlistViewController.swift b/Ring/Ring/Features/Conversations/SmartList/SmartlistViewController.swift
index d5a1de70e..38c32a502 100644
--- a/Ring/Ring/Features/Conversations/SmartList/SmartlistViewController.swift
+++ b/Ring/Ring/Features/Conversations/SmartList/SmartlistViewController.swift
@@ -275,7 +275,7 @@ class SmartlistViewController: UIViewController, StoryboardBased, ViewModelBased
let generalSettingsButton = UIButton(type: UIButton.ButtonType.system) as UIButton
generalSettingsButton.frame = CGRect(x: 0, y: 0, width: 30, height: 30)
generalSettingsButton.setImage(imageSettings, for: .normal)
- generalSettingsButton.tintColor = .jamiMain
+ generalSettingsButton.tintColor = .jamiButtonDark
generalSettingsButton.rx.tap
.subscribe(onNext: { [weak self] in
self?.searchController.isActive = true
@@ -290,7 +290,7 @@ class SmartlistViewController: UIViewController, StoryboardBased, ViewModelBased
generalSettingsButton.frame = CGRect(x: 0, y: 0, width: 30, height: 30)
generalSettingsButton.setImage(imageSettings, for: .normal)
generalSettingsButton.menu = createMenu()
- generalSettingsButton.tintColor = .jamiMain
+ generalSettingsButton.tintColor = .jamiButtonDark
generalSettingsButton.showsMenuAsPrimaryAction = true
return UIBarButtonItem(customView: generalSettingsButton)
}
@@ -348,7 +348,7 @@ class SmartlistViewController: UIViewController, StoryboardBased, ViewModelBased
addAccountButton.frame = CGRect(x: 0, y: 0, width: 250, height: 40)
addAccountButton.contentHorizontalAlignment = .right
addAccountButton.setTitle(L10n.Smartlist.addAccountButton, for: .normal)
- addAccountButton.setTitleColor(.jamiMain, for: .normal)
+ addAccountButton.setTitleColor(.jamiButtonDark, for: .normal)
addAccountButton.titleLabel?.font = UIFont(name: "HelveticaNeue-Light", size: 23)
// Enable auto-shrink
@@ -540,7 +540,7 @@ class SmartlistViewController: UIViewController, StoryboardBased, ViewModelBased
let button = UIButton()
let configuration = UIImage.SymbolConfiguration(pointSize: 40, weight: weight, scale: .large)
button.setImage(UIImage(systemName: imageName, withConfiguration: configuration), for: .normal)
- button.tintColor = .jamiMain
+ button.tintColor = .jamiButtonDark
button.translatesAutoresizingMaskIntoConstraints = false
button.widthAnchor.constraint(equalToConstant: width).isActive = true
button.heightAnchor.constraint(equalToConstant: 23).isActive = true
@@ -686,35 +686,35 @@ extension SmartlistViewController {
}
private func createSwarmAction() -> UIAction {
- let image = createTintedImage(systemName: "person.2", configuration: configuration, tintColor: .jamiMain)
+ let image = createTintedImage(systemName: "person.2", configuration: configuration, tintColor: .jamiButtonDark)
return UIAction(title: L10n.Swarm.newSwarm, image: image, identifier: nil, discoverabilityTitle: nil, attributes: [], state: .off) { [weak self] _ in
self?.viewModel.createGroup()
}
}
private func inviteFriendsAction() -> UIAction {
- let image = createTintedImage(systemName: "envelope.open", configuration: configuration, tintColor: .jamiMain)
+ let image = createTintedImage(systemName: "envelope.open", configuration: configuration, tintColor: .jamiButtonDark)
return UIAction(title: L10n.Smartlist.inviteFriends, image: image, identifier: nil, discoverabilityTitle: nil, attributes: [], state: .off) { [weak self] _ in
self?.shareAccountInfo()
}
}
private func accountsAction() -> UIAction {
- let image = createTintedImage(systemName: "list.bullet", configuration: configuration, tintColor: .jamiMain)
+ let image = createTintedImage(systemName: "list.bullet", configuration: configuration, tintColor: .jamiButtonDark)
return UIAction(title: L10n.Smartlist.accounts, image: image, identifier: nil, discoverabilityTitle: nil, attributes: [], state: .off) { [weak self] _ in
self?.openAccountsList()
}
}
private func openAccountAction() -> UIAction {
- let image = createTintedImage(systemName: "person.circle", configuration: configuration, tintColor: .jamiMain)
+ let image = createTintedImage(systemName: "person.circle", configuration: configuration, tintColor: .jamiButtonDark)
return UIAction(title: L10n.Global.accountSettings, image: image, identifier: nil, discoverabilityTitle: nil, attributes: [], state: .off) { [weak self] _ in
self?.viewModel.showAccountSettings()
}
}
private func openSettingsAction() -> UIAction {
- let image = createTintedImage(systemName: "gearshape", configuration: configuration, tintColor: .jamiMain)
+ let image = createTintedImage(systemName: "gearshape", configuration: configuration, tintColor: .jamiButtonDark)
return UIAction(title: L10n.Global.advancedSettings, image: image, identifier: nil, discoverabilityTitle: nil, attributes: [], state: .off) { [weak self] _ in
self?.viewModel.showGeneralSettings()
}
diff --git a/Ring/Ring/Features/Walkthrough/WelcomeViewController.swift b/Ring/Ring/Features/Walkthrough/WelcomeViewController.swift
index 4283694c2..ea03511c6 100644
--- a/Ring/Ring/Features/Walkthrough/WelcomeViewController.swift
+++ b/Ring/Ring/Features/Walkthrough/WelcomeViewController.swift
@@ -67,7 +67,7 @@ class WelcomeViewController: UIViewController, StoryboardBased, ViewModelBased {
configureSIPButton.setTitle(L10n.Account.createSipAccount, for: .normal)
if !self.viewModel.notCancelable {
let cancelButton = UIButton(type: .custom)
- cancelButton.setTitleColor(.jamiMain, for: .normal)
+ cancelButton.setTitleColor(.jamiButtonDark, for: .normal)
cancelButton.titleLabel?.font = UIFont(name: "HelveticaNeue-Light", size: 25)
cancelButton.setTitle(L10n.Global.cancel, for: .normal)
cancelButton.frame = CGRect(x: 0, y: 0, width: 100, height: 40)
--
GitLab