Commit 6001030e authored by Quentin Muret's avatar Quentin Muret Committed by Kateryna Kostiuk

transition to Jami

- change the Ring app icon to Jami app icon
- change app colors
- rename all colors with jami
- change all Ring occurrences to Jami for English and French localizables
  strings
- change the size and police of all pages titles
- make the QR code icons change dynamically according to
  the colors of the app

Change-Id: If415fdf30232b3fe5d5e272546a24ab32fc54464
Reviewed-by: Kateryna Kostiuk<kateryna.kostiuk@savoirfairelinux.com>
parent e208253a
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017 Savoir-faire Linux Inc.
* *
* Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com> * Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Edric Ladent-Milaret <edric.ladent-milaret@savoirfairelinux.com> * Author: Edric Ladent-Milaret <edric.ladent-milaret@savoirfairelinux.com>
* Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com> * Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
* Author: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com> * Author: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -114,7 +115,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD ...@@ -114,7 +115,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
.disposed(by: self.disposeBag) .disposed(by: self.disposeBag)
// themetize the app // themetize the app
Chameleon.setRingThemeUsingPrimaryColor(UIColor.ringMain, withSecondaryColor: UIColor.ringSecondary, andContentStyle: .light) Chameleon.setRingThemeUsingPrimaryColor(UIColor.jamiMain, withSecondaryColor: UIColor.jamiSecondary, andContentStyle: .light)
UIApplication.shared.statusBarStyle = .default UIApplication.shared.statusBarStyle = .default
......
/* /*
* Copyright (C) 2016 Savoir-faire Linux Inc. * Copyright (C) 2016-2018 Savoir-faire Linux Inc.
* *
* Author: Edric Ladent-Milaret <edric.ladent-milaret@savoirfairelinux.com> * Author: Edric Ladent-Milaret <edric.ladent-milaret@savoirfairelinux.com>
* Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com> * Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> * Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> * Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Silbino Gonçalves Matado <silbino.gmatado@savoirfairelinux.com> * Author: Silbino Gonçalves Matado <silbino.gmatado@savoirfairelinux.com>
* Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> * Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -99,6 +100,7 @@ class CallViewController: UIViewController, StoryboardBased, ViewModelBased { ...@@ -99,6 +100,7 @@ class CallViewController: UIViewController, StoryboardBased, ViewModelBased {
self.setUpCallButtons() self.setUpCallButtons()
self.setupBindings() self.setupBindings()
let device = UIDevice.modelName let device = UIDevice.modelName
self.profileImageView.tintColor = UIColor.jamiDefaultAvatar
switch device { switch device {
case "iPhone X", "iPhone XS", "iPhone XS Max", "iPhone XR" : case "iPhone X", "iPhone XS", "iPhone XS Max", "iPhone XR" :
//keep the 4:3 format of the captured video on iPhone X and later when display it in full screen //keep the 4:3 format of the captured video on iPhone X and later when display it in full screen
...@@ -148,7 +150,7 @@ class CallViewController: UIViewController, StoryboardBased, ViewModelBased { ...@@ -148,7 +150,7 @@ class CallViewController: UIViewController, StoryboardBased, ViewModelBased {
func setWhiteAvatarView() { func setWhiteAvatarView() {
UIApplication.shared.statusBarStyle = .default UIApplication.shared.statusBarStyle = .default
self.callPulse.backgroundColor = UIColor.ringCallPulse self.callPulse.backgroundColor = UIColor.jamiCallPulse
self.avatarView.backgroundColor = UIColor.white self.avatarView.backgroundColor = UIColor.white
} }
......
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Silbino Gonçalves Matado <silbino.gmatado@savoirfairelinux.com> * Author: Silbino Gonçalves Matado <silbino.gmatado@savoirfairelinux.com>
* Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> * Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
...@@ -48,7 +48,6 @@ internal enum Asset { ...@@ -48,7 +48,6 @@ internal enum Asset {
internal static let pauseCall = ImageAsset(name: "pause_call") internal static let pauseCall = ImageAsset(name: "pause_call")
internal static let qrCode = ImageAsset(name: "qr_code") internal static let qrCode = ImageAsset(name: "qr_code")
internal static let qrCodeScan = ImageAsset(name: "qr_code_scan") internal static let qrCodeScan = ImageAsset(name: "qr_code_scan")
internal static let ringIcon = ImageAsset(name: "ringIcon")
internal static let ringLogo = ImageAsset(name: "ring_logo") internal static let ringLogo = ImageAsset(name: "ring_logo")
internal static let scan = ImageAsset(name: "scan") internal static let scan = ImageAsset(name: "scan")
internal static let sendButton = ImageAsset(name: "send_button") internal static let sendButton = ImageAsset(name: "send_button")
......
...@@ -57,7 +57,7 @@ internal enum L10n { ...@@ -57,7 +57,7 @@ internal enum L10n {
internal enum Alerts { internal enum Alerts {
/// Account Added /// Account Added
internal static let accountAddedTitle = L10n.tr("Localizable", "alerts.accountAddedTitle") internal static let accountAddedTitle = L10n.tr("Localizable", "alerts.accountAddedTitle")
/// Account couldn't be found on the Ring network. Make sure it was exported on Ring from an existing device, and that provided credentials are correct. /// Account couldn't be found on the Jami network. Make sure it was exported on Jami from an existing device, and that provided credentials are correct.
internal static let accountCannotBeFoundMessage = L10n.tr("Localizable", "alerts.accountCannotBeFoundMessage") internal static let accountCannotBeFoundMessage = L10n.tr("Localizable", "alerts.accountCannotBeFoundMessage")
/// Can't find account /// Can't find account
internal static let accountCannotBeFoundTitle = L10n.tr("Localizable", "alerts.accountCannotBeFoundTitle") internal static let accountCannotBeFoundTitle = L10n.tr("Localizable", "alerts.accountCannotBeFoundTitle")
...@@ -67,7 +67,7 @@ internal enum L10n { ...@@ -67,7 +67,7 @@ internal enum L10n {
internal static let accountDefaultErrorTitle = L10n.tr("Localizable", "alerts.accountDefaultErrorTitle") internal static let accountDefaultErrorTitle = L10n.tr("Localizable", "alerts.accountDefaultErrorTitle")
/// Linking account /// Linking account
internal static let accountLinkedTitle = L10n.tr("Localizable", "alerts.accountLinkedTitle") internal static let accountLinkedTitle = L10n.tr("Localizable", "alerts.accountLinkedTitle")
/// Could not add account because Ring couldn't connect to the distributed network. Check your device connectivity. /// Could not add account because Jami couldn't connect to the distributed network. Check your device connectivity.
internal static let accountNoNetworkMessage = L10n.tr("Localizable", "alerts.accountNoNetworkMessage") internal static let accountNoNetworkMessage = L10n.tr("Localizable", "alerts.accountNoNetworkMessage")
/// Can't connect to the network /// Can't connect to the network
internal static let accountNoNetworkTitle = L10n.tr("Localizable", "alerts.accountNoNetworkTitle") internal static let accountNoNetworkTitle = L10n.tr("Localizable", "alerts.accountNoNetworkTitle")
...@@ -83,7 +83,7 @@ internal enum L10n { ...@@ -83,7 +83,7 @@ internal enum L10n {
internal static let confirmDeleteConversationTitle = L10n.tr("Localizable", "alerts.confirmDeleteConversationTitle") internal static let confirmDeleteConversationTitle = L10n.tr("Localizable", "alerts.confirmDeleteConversationTitle")
/// Please close application and try to open it again /// Please close application and try to open it again
internal static let dbFailedMessage = L10n.tr("Localizable", "alerts.dbFailedMessage") internal static let dbFailedMessage = L10n.tr("Localizable", "alerts.dbFailedMessage")
/// An error happned when launching Ring /// An error happned when launching Jami
internal static let dbFailedTitle = L10n.tr("Localizable", "alerts.dbFailedTitle") internal static let dbFailedTitle = L10n.tr("Localizable", "alerts.dbFailedTitle")
/// Incoming call from /// Incoming call from
internal static let incomingCallAllertTitle = L10n.tr("Localizable", "alerts.incomingCallAllertTitle") internal static let incomingCallAllertTitle = L10n.tr("Localizable", "alerts.incomingCallAllertTitle")
...@@ -130,7 +130,7 @@ internal enum L10n { ...@@ -130,7 +130,7 @@ internal enum L10n {
internal enum CreateAccount { internal enum CreateAccount {
/// Encrypt my account /// Encrypt my account
internal static let chooseAPassword = L10n.tr("Localizable", "createAccount.ChooseAPassword") internal static let chooseAPassword = L10n.tr("Localizable", "createAccount.ChooseAPassword")
/// Choose strong password you will remember to protect your Ring account. /// Choose strong password you will remember to protect your Jami account.
internal static let chooseStrongPassword = L10n.tr("Localizable", "createAccount.chooseStrongPassword") internal static let chooseStrongPassword = L10n.tr("Localizable", "createAccount.chooseStrongPassword")
/// Create your account /// Create your account
internal static let createAccountFormTitle = L10n.tr("Localizable", "createAccount.createAccountFormTitle") internal static let createAccountFormTitle = L10n.tr("Localizable", "createAccount.createAccountFormTitle")
...@@ -216,7 +216,7 @@ internal enum L10n { ...@@ -216,7 +216,7 @@ internal enum L10n {
internal enum LinkDevice { internal enum LinkDevice {
/// An error occured during the export /// An error occured during the export
internal static let defaultError = L10n.tr("Localizable", "linkDevice.defaultError") internal static let defaultError = L10n.tr("Localizable", "linkDevice.defaultError")
/// To complete the process, you need to open Ring on the new device and choose the option "Link this device to an account." Your pin is valid for 10 minutes /// To complete the process, you need to open Jami on the new device and choose the option "Link this device to an account." Your pin is valid for 10 minutes
internal static let explanationMessage = L10n.tr("Localizable", "linkDevice.explanationMessage") internal static let explanationMessage = L10n.tr("Localizable", "linkDevice.explanationMessage")
/// Verifying /// Verifying
internal static let hudMessage = L10n.tr("Localizable", "linkDevice.hudMessage") internal static let hudMessage = L10n.tr("Localizable", "linkDevice.hudMessage")
...@@ -274,7 +274,7 @@ internal enum L10n { ...@@ -274,7 +274,7 @@ internal enum L10n {
internal static let createAccount = L10n.tr("Localizable", "welcome.createAccount") internal static let createAccount = L10n.tr("Localizable", "welcome.createAccount")
/// Link this device to an account /// Link this device to an account
internal static let linkDevice = L10n.tr("Localizable", "welcome.linkDevice") internal static let linkDevice = L10n.tr("Localizable", "welcome.linkDevice")
/// Ring is a free and universal communication platform which preserves the users' privacy and freedoms /// Jami is a free and universal communication platform which preserves the users' privacy and freedoms
internal static let text = L10n.tr("Localizable", "welcome.text") internal static let text = L10n.tr("Localizable", "welcome.text")
/// Welcome to Jami ! /// Welcome to Jami !
internal static let title = L10n.tr("Localizable", "welcome.title") internal static let title = L10n.tr("Localizable", "welcome.title")
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* Copyright (C) 2018 Savoir-faire Linux Inc. * Copyright (C) 2018 Savoir-faire Linux Inc.
* *
* Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> * Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -113,7 +114,7 @@ class ContactViewController: UIViewController, StoryboardBased, ViewModelBased { ...@@ -113,7 +114,7 @@ class ContactViewController: UIViewController, StoryboardBased, ViewModelBased {
let image = UIImage(asset: conversationItem.image) let image = UIImage(asset: conversationItem.image)
let tintedImage = image?.withRenderingMode(.alwaysTemplate) let tintedImage = image?.withRenderingMode(.alwaysTemplate)
cell?.imageView?.image = tintedImage cell?.imageView?.image = tintedImage
cell?.imageView?.tintColor = UIColor.ringSecondary cell?.imageView?.tintColor = UIColor.jamiSecondary
cell?.textLabel?.text = conversationItem.title cell?.textLabel?.text = conversationItem.title
return cell! return cell!
} }
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* Copyright (C) 2018 Savoir-faire Linux Inc. * Copyright (C) 2018 Savoir-faire Linux Inc.
* *
* Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> * Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -56,7 +57,7 @@ final class TitleView: UIView { ...@@ -56,7 +57,7 @@ final class TitleView: UIView {
addSubview(containerView) addSubview(containerView)
containerView.addSubview(avatarView) containerView.addSubview(avatarView)
containerView.addSubview(label) containerView.addSubview(label)
label.textColor = UIColor.ringSecondary label.textColor = UIColor.jamiSecondary
label.font = UIFont.systemFont(ofSize: 17.0, weight: .regular) label.font = UIFont.systemFont(ofSize: 17.0, weight: .regular)
clipsToBounds = true clipsToBounds = true
isUserInteractionEnabled = false isUserInteractionEnabled = false
......
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com> * Author: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com>
* Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com> * Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -155,7 +156,7 @@ final class AppCoordinator: Coordinator, StateableResponsive { ...@@ -155,7 +156,7 @@ final class AppCoordinator: Coordinator, StateableResponsive {
let conversationsCoordinator = ConversationsCoordinator(with: self.injectionBag) let conversationsCoordinator = ConversationsCoordinator(with: self.injectionBag)
let contactRequestsCoordinator = ContactRequestsCoordinator(with: self.injectionBag) let contactRequestsCoordinator = ContactRequestsCoordinator(with: self.injectionBag)
let meCoordinator = MeCoordinator(with: self.injectionBag) let meCoordinator = MeCoordinator(with: self.injectionBag)
self.tabBarViewController.tabBar.tintColor = UIColor.ringMain self.tabBarViewController.tabBar.tintColor = UIColor.jamiMain
self.tabBarViewController.viewControllers = [conversationsCoordinator.rootViewController, self.tabBarViewController.viewControllers = [conversationsCoordinator.rootViewController,
contactRequestsCoordinator.rootViewController, contactRequestsCoordinator.rootViewController,
......
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> * Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com> * Author: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -42,12 +43,12 @@ extension Chameleon { ...@@ -42,12 +43,12 @@ extension Chameleon {
MessageBubble.appearance().backgroundColor = secondaryColor MessageBubble.appearance().backgroundColor = secondaryColor
MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellSent.self]).tintColor = contentColor MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellSent.self]).tintColor = contentColor
MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellSent.self]).backgroundColor = UIColor.ringMsgCellSent MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellSent.self]).backgroundColor = UIColor.jamiMsgCellSent
UILabel.appearance(whenContainedInInstancesOf: [MessageBubble.self, MessageCellSent.self]).textColor = UIColor.ringMsgCellSentText UILabel.appearance(whenContainedInInstancesOf: [MessageBubble.self, MessageCellSent.self]).textColor = UIColor.jamiMsgCellSentText
MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellReceived.self]).tintColor = secondaryContentColor MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellReceived.self]).tintColor = secondaryContentColor
MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellReceived.self]).backgroundColor = UIColor.ringMsgCellReceived MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellReceived.self]).backgroundColor = UIColor.jamiMsgCellReceived
UILabel.appearance(whenContainedInInstancesOf: [MessageBubble.self, MessageCellReceived.self]).textColor = UIColor.ringMsgCellReceivedText UILabel.appearance(whenContainedInInstancesOf: [MessageBubble.self, MessageCellReceived.self]).textColor = UIColor.jamiMsgCellReceivedText
MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellGenerated.self]).tintColor = UIColor.clear MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellGenerated.self]).tintColor = UIColor.clear
MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellGenerated.self]).backgroundColor = UIColor.clear MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellGenerated.self]).backgroundColor = UIColor.clear
......
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2018 Savoir-faire Linux Inc.
* *
* Author: Quentin Muret <quentin.muret@savoirfairelinux.com> * Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* /*
* Copyright (C) 2016 Savoir-faire Linux Inc. * Copyright (C) 2016-2018 Savoir-faire Linux Inc.
* *
* Author: Edric Ladent-Milaret <edric.ladent-milaret@savoirfairelinux.com> * Author: Edric Ladent-Milaret <edric.ladent-milaret@savoirfairelinux.com>
* Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> * Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com> * Author: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -34,25 +35,24 @@ extension UIColor { ...@@ -34,25 +35,24 @@ extension UIColor {
self.init(red: (hex >> 16) & 0xff, green: (hex >> 8) & 0xff, blue: hex & 0xff, alpha: alpha) self.init(red: (hex >> 16) & 0xff, green: (hex >> 8) & 0xff, blue: hex & 0xff, alpha: alpha)
} }
static let ringMain = UIColor(hex: 0x3F6DA7, alpha: 1.0) // jami style static let jamiMain = UIColor(hex: 0x3F6DA7, alpha: 1.0)
static let ringSecondary = UIColor(hex: 0x1F4971, alpha: 1.0) // jami style static let jamiSecondary = UIColor(hex: 0x1F4971, alpha: 1.0)
static let ringMainLight = UIColor(red: 0, green: 76, blue: 96, alpha: 1.0)
static let ringMsgCellEmoji = UIColor(red: 0, green: 0, blue: 0, alpha: 0)
static let ringMsgCellSent = UIColor(red: 58, green: 192, blue: 210, alpha: 1.0)
static let ringMsgCellSentText = UIColor(red: 255, green: 255, blue: 255, alpha: 1.0)
static let ringMsgCellReceived = UIColor(red: 231, green: 235, blue: 235, alpha: 1.0)
static let ringMsgCellReceivedText = UIColor(red: 48, green: 48, blue: 48, alpha: 1.0)
static let ringMsgCellTimeText = UIColor(red: 128, green: 128, blue: 128, alpha: 1.0)
static let ringMsgBackground = UIColor(red: 252, green: 252, blue: 252, alpha: 1.0)
static let ringMsgTextFieldBackground = UIColor(red: 252, green: 252, blue: 252, alpha: 0)
static let ringMsgTextFieldBorder = UIColor(red: 220, green: 220, blue: 220, alpha: 1.0)
static let ringUITableViewCellSelection = UIColor(red: 209, green: 210, blue: 210, alpha: 1.0)
static let ringNavigationBar = UIColor(red: 235, green: 235, blue: 235, alpha: 1.0)
static let ringCallPulse = UIColor(red: 99, green: 191, blue: 208, alpha: 1.0)
static let ringSuccess = UIColor(hex: 0x00b20b, alpha: 1.0)
static let ringFailure = UIColor(hex: 0xf00000, alpha: 1.0)
static let ringWarning = UIColor.orange
static let jamiButtonLight = UIColor(hex: 0x285F97, alpha: 1.0) static let jamiButtonLight = UIColor(hex: 0x285F97, alpha: 1.0)
static let jamiButtonDark = UIColor(hex: 0x0F2643, alpha: 1.0) static let jamiButtonDark = UIColor(hex: 0x0F2643, alpha: 1.0)
static let jamiMsgCellEmoji = UIColor(red: 0, green: 0, blue: 0, alpha: 0)
static let jamiMsgCellSent = UIColor(hex: 0x367BC1, alpha: 1.0)
static let jamiMsgCellSentText = UIColor(red: 255, green: 255, blue: 255, alpha: 1.0)
static let jamiMsgCellReceived = UIColor(red: 231, green: 235, blue: 235, alpha: 1.0)
static let jamiMsgCellReceivedText = UIColor(red: 48, green: 48, blue: 48, alpha: 1.0)
static let jamiMsgCellTimeText = UIColor(red: 128, green: 128, blue: 128, alpha: 1.0)
static let jamiMsgBackground = UIColor(red: 252, green: 252, blue: 252, alpha: 1.0)
static let jamiMsgTextFieldBackground = UIColor(red: 252, green: 252, blue: 252, alpha: 0)
static let jamiMsgTextFieldBorder = UIColor(red: 220, green: 220, blue: 220, alpha: 1.0)
static let jamiUITableViewCellSelection = UIColor(red: 209, green: 210, blue: 210, alpha: 1.0)
static let jamiNavigationBar = UIColor(red: 235, green: 235, blue: 235, alpha: 1.0)
static let jamiCallPulse = UIColor(hex: 0x039FDF, alpha: 1.0)
static let jamiDefaultAvatar = UIColor(hex: 0x039FDF, alpha: 1.0)
static let jamiSuccess = UIColor(hex: 0x00b20b, alpha: 1.0)
static let jamiFailure = UIColor(hex: 0xf00000, alpha: 1.0)
static let jamiWarning = UIColor.orange
} }
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Hadrien De Sousa <hadrien.desousa@savoirfairelinux.com> * Author: Hadrien De Sousa <hadrien.desousa@savoirfairelinux.com>
* Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> * Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -60,7 +61,7 @@ extension UIImage { ...@@ -60,7 +61,7 @@ extension UIImage {
context?.saveGState() context?.saveGState()
path.addClip() path.addClip()
self.draw(in: bounds) self.draw(in: bounds)
UIColor.ringMsgBackground.setStroke() UIColor.jamiMsgBackground.setStroke()
path.lineWidth = offset * 2 path.lineWidth = offset * 2
path.stroke() path.stroke()
let roundedImage = UIGraphicsGetImageFromCurrentImageContext() let roundedImage = UIGraphicsGetImageFromCurrentImageContext()
......
/* /*
* Copyright (C) 2016 Savoir-faire Linux Inc. * Copyright (C) 2016-2018 Savoir-faire Linux Inc.
* *
* Author: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com> * Author: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com> * Author: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -126,7 +127,7 @@ extension UIViewController { ...@@ -126,7 +127,7 @@ extension UIViewController {
} }
func configureRingNavigationBar() { func configureRingNavigationBar() {
self.navigationController?.navigationBar.barTintColor = UIColor.ringNavigationBar self.navigationController?.navigationBar.barTintColor = UIColor.jamiNavigationBar
self.navigationController?.navigationBar.layer.shadowColor = UIColor.black.cgColor self.navigationController?.navigationBar.layer.shadowColor = UIColor.black.cgColor
self.navigationController?.navigationBar.layer.shadowOffset = CGSize(width: 0.0, height: 2.5) self.navigationController?.navigationBar.layer.shadowOffset = CGSize(width: 0.0, height: 2.5)
self.navigationController?.navigationBar.layer.shadowOpacity = 0.2 self.navigationController?.navigationBar.layer.shadowOpacity = 0.2
...@@ -134,8 +135,8 @@ extension UIViewController { ...@@ -134,8 +135,8 @@ extension UIViewController {
self.navigationController?.navigationBar.layer.masksToBounds = false self.navigationController?.navigationBar.layer.masksToBounds = false
self.navigationController?.navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default) self.navigationController?.navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
self.navigationController?.navigationBar.shadowImage = UIImage() self.navigationController?.navigationBar.shadowImage = UIImage()
let textAttributes = [NSAttributedStringKey.foregroundColor: UIColor.ringMain] let textAttributes = [NSAttributedStringKey.foregroundColor: UIColor.jamiMain]
self.navigationController?.navigationBar.titleTextAttributes = textAttributes self.navigationController?.navigationBar.titleTextAttributes = textAttributes
self.navigationController?.navigationBar.tintColor = UIColor.ringMain self.navigationController?.navigationBar.tintColor = UIColor.jamiMain
} }
} }
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Silbino Gonçalves Matado <silbino.gmatado@savoirfairelinux.com> * Author: Silbino Gonçalves Matado <silbino.gmatado@savoirfairelinux.com>
* Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> * Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -32,15 +33,15 @@ class ContactRequestCell: UITableViewCell, NibReusable { ...@@ -32,15 +33,15 @@ class ContactRequestCell: UITableViewCell, NibReusable {
@IBOutlet weak var banButton: UIButton! @IBOutlet weak var banButton: UIButton!
override func setSelected(_ selected: Bool, animated: Bool) { override func setSelected(_ selected: Bool, animated: Bool) {
self.backgroundColor = UIColor.ringUITableViewCellSelection self.backgroundColor = UIColor.jamiUITableViewCellSelection
UIView.animate(withDuration: 0.35, animations: { UIView.animate(withDuration: 0.35, animations: {
self.backgroundColor = UIColor.ringUITableViewCellSelection.lighten(byPercentage: 5.0) self.backgroundColor = UIColor.jamiUITableViewCellSelection.lighten(byPercentage: 5.0)
}) })
} }
override func setHighlighted(_ highlighted: Bool, animated: Bool) { override func setHighlighted(_ highlighted: Bool, animated: Bool) {
if highlighted { if highlighted {
self.backgroundColor = UIColor.ringUITableViewCellSelection self.backgroundColor = UIColor.jamiUITableViewCellSelection
} else { } else {
self.backgroundColor = UIColor.clear self.backgroundColor = UIColor.clear
} }
......
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Silbino Gonçalves Matado <silbino.gmatado@savoirfairelinux.com> * Author: Silbino Gonçalves Matado <silbino.gmatado@savoirfairelinux.com>
* Author: Quentin Muret <quentin.muret@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -53,6 +54,7 @@ class ContactRequestsViewController: UIViewController, StoryboardBased, ViewMode ...@@ -53,6 +54,7 @@ class ContactRequestsViewController: UIViewController, StoryboardBased, ViewMode
UIApplication.shared.statusBarStyle = .default UIApplication.shared.statusBarStyle = .default
self.setupTableView() self.setupTableView()
self.setupBindings() self.setupBindings()
self.navigationController?.navigationBar.titleTextAttributes = [NSAttributedStringKey.font: UIFont(name: "HelveticaNeue-Light", size: 25)!,NSAttributedStringKey.foregroundColor : UIColor.jamiMain]
} }
func setupTableView() { func setupTableView() {
......
/* /*
* Copyright (C) 2017 Savoir-faire Linux Inc. * Copyright (C) 2017-2018 Savoir-faire Linux Inc.
* *
* Author: Silbino Gonçalves Matado <silbino.gmatado@savoirfairelinux.com> * Author: Silbino Gonçalves Matado <silbino.gmatado@savoirfairelinux.com>
* Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> * Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>