Просмотр исходного кода

restructured color set - changed primary color to default blue, temporarily - chat bubble color to light green

Bastian van de Wetering 6 лет назад
Родитель
Сommit
01ed4efaa1

+ 1 - 1
deltachat-ios/AppTabBarController.swift

@@ -49,6 +49,6 @@ class AppTabBarController: UITabBarController {
     viewControllers = tabBarList
     selectedIndex = 3
 
-    tabBar.tintColor = Constants.primaryColor
+    tabBar.tintColor = DCColors.primary
   }
 }

+ 8 - 7
deltachat-ios/ChatViewController.swift

@@ -199,8 +199,9 @@ class ChatViewController: MessagesViewController {
   override func viewDidLoad() {
     messagesCollectionView.register(CustomCell.self)
     super.viewDidLoad()
+		self.view.backgroundColor = DCColors.chatBackgroundColor
 
-    if !MRConfig.configured {
+		if !MRConfig.configured {
       // TODO: display message about nothing being configured
       return
     }
@@ -273,12 +274,12 @@ class ChatViewController: MessagesViewController {
 
   func configureMessageInputBar() {
     messageInputBar.delegate = self
-    messageInputBar.inputTextView.tintColor = Constants.primaryColor
-    messageInputBar.sendButton.tintColor = Constants.primaryColor
+    messageInputBar.inputTextView.tintColor = DCColors.primary
+    messageInputBar.sendButton.tintColor = DCColors.primary
 
     messageInputBar.isTranslucent = true
     messageInputBar.separatorLine.isHidden = true
-    messageInputBar.inputTextView.tintColor = Constants.primaryColor
+    messageInputBar.inputTextView.tintColor = DCColors.primary
 
     messageInputBar.delegate = self
     scrollsToBottomOnKeyboardBeginsEditing = true
@@ -319,7 +320,7 @@ class ChatViewController: MessagesViewController {
           $0.setSize(CGSize(width: 36, height: 36), animated: false)
           $0.tintColor = UIColor(white: 0.8, alpha: 1)
         }.onSelected {
-          $0.tintColor = Constants.primaryColor
+          $0.tintColor = DCColors.primary
         }.onDeselected {
           $0.tintColor = UIColor(white: 0.8, alpha: 1)
         }.onTouchUpInside { _ in
@@ -332,7 +333,7 @@ class ChatViewController: MessagesViewController {
     messageInputBar.sendButton
       .onEnabled { item in
         UIView.animate(withDuration: 0.3, animations: {
-          item.backgroundColor = Constants.primaryColor
+          item.backgroundColor = DCColors.primary
         })
       }.onDisabled { item in
         UIView.animate(withDuration: 0.3, animations: {
@@ -614,7 +615,7 @@ extension ChatViewController: MessagesDisplayDelegate {
   // MARK: - All Messages
 
   func backgroundColor(for message: MessageType, at _: IndexPath, in _: MessagesCollectionView) -> UIColor {
-    return isFromCurrentSender(message: message) ? Constants.messagePrimaryColor : Constants.messageSecondaryColor
+    return isFromCurrentSender(message: message) ? DCColors.messagePrimaryColor : DCColors.messageSecondaryColor
   }
 
   func messageStyle(for message: MessageType, at indexPath: IndexPath, in _: MessagesCollectionView) -> MessageStyle {

+ 49 - 1
deltachat-ios/Colors.swift

@@ -8,8 +8,56 @@
 
 import UIKit
 
+struct DCColors {
+	static let primary = UIColor.systemBlue
+	// static let accent =
+
+	static let messagePrimaryColor = UIColor.rgb(red: 220, green: 248, blue: 198)
+	static let messageSecondaryColor = UIColor.rgb(red: 245, green: 245, blue: 245)
+	static let chatBackgroundColor = UIColor.rgb(red: 236, green: 229, blue: 221)
+
+}
+
+enum SystemColor {
+
+	case red
+	case orange
+	case yellow
+	case green
+	case tealBlue
+	case blue
+	case purple
+	case pink
+
+	var uiColor: UIColor {
+		switch self {
+		case .red:
+			return UIColor(red: 255/255, green: 59/255, blue: 48/255, alpha: 1)
+		case .orange:
+			return UIColor(red: 255/255, green: 149/255, blue: 0/255, alpha: 1)
+		case .yellow:
+			return UIColor(red: 255/255, green: 204/255, blue: 0/255, alpha: 1)
+		case .green:
+			return UIColor(red: 76/255, green: 217/255, blue: 100/255, alpha: 1)
+		case .tealBlue:
+			return UIColor(red: 90/255, green: 200/255, blue: 250/255, alpha: 1)
+		case .blue:
+			return UIColor(red: 0/255, green: 122/255, blue: 255/255, alpha: 1)
+		case .purple:
+			return UIColor(red: 88/255, green: 86/255, blue: 214/255, alpha: 1)
+		case .pink:
+			return UIColor(red: 255/255, green: 45/255, blue: 85/255, alpha: 1)
+		}
+	}
+}
+
+
 extension UIColor {
-  static var systemBlue: UIColor {
+	static func rgb(red: CGFloat, green: CGFloat, blue: CGFloat) -> UIColor {
+		return UIColor(red: red/255, green: green/255, blue: blue/255, alpha: 1)
+	}
+
+	static var systemBlue: UIColor {
     return UIButton(type: .system).tintColor
   }
 }

+ 3 - 3
deltachat-ios/Constants.swift

@@ -21,9 +21,9 @@ struct Constants {
     static let deltachatImapPasswordKey = "__DELTACHAT_IMAP_PASSWORD_KEY__"
   }
 
-  static let primaryColor = UIColor(red: 81 / 255, green: 73 / 255, blue: 255 / 255, alpha: 1)
-  static let messagePrimaryColor = Constants.primaryColor.withAlphaComponent(0.5)
-  static let messageSecondaryColor = UIColor(red: 245 / 255, green: 245 / 255, blue: 245 / 255, alpha: 1)
+  // static let primaryColor = UIColor(red: 81 / 255, green: 73 / 255, blue: 255 / 255, alpha: 1)
+  //static let messagePrimaryColor = Constants.primaryColor.withAlphaComponent(0.5)
+ // static let messageSecondaryColor = UIColor(red: 245 / 255, green: 245 / 255, blue: 245 / 255, alpha: 1)
 
   static let defaultShadow = UIImage(color: UIColor(hexString: "ff2b82"), size: CGSize(width: 1, height: 1))
   static let onlineShadow = UIImage(color: UIColor(hexString: "3ed67e"), size: CGSize(width: 1, height: 1))

+ 1 - 1
deltachat-ios/ContactCell.swift

@@ -93,7 +93,7 @@ class ContactCell: UITableViewCell {
       y: 0,
       width: imgSize, height: imgSize
     )
-    imgView.tintColor = Constants.primaryColor
+    imgView.tintColor = DCColors.primary
 
     avatar.addSubview(imgView)
 

+ 23 - 18
deltachat-ios/TopViews/ChatListController.swift

@@ -11,7 +11,14 @@ import UIKit
 class ChatListController: UIViewController {
   var chatList: MRChatList?
 
-  let chatTable = UITableView()
+	lazy var chatTable: UITableView = {
+		let chatTable = UITableView()
+		chatTable.dataSource = chatTableDataSource
+		chatTableDelegate.chatPresenter = self
+		chatTable.delegate = chatTableDelegate
+		chatTable.rowHeight = 80
+		return chatTable
+	}()
 
   let chatTableDataSource = ChatTableDataSource()
   let chatTableDelegate = ChatTableDelegate()
@@ -81,24 +88,22 @@ class ChatListController: UIViewController {
     super.viewDidLoad()
     title = "Chats"
     navigationController?.navigationBar.prefersLargeTitles = true
-    view.addSubview(chatTable)
-    chatTable.translatesAutoresizingMaskIntoConstraints = false
-    chatTable.topAnchor.constraint(equalTo: view.topAnchor).isActive = true
-    chatTable.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
-    chatTable.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
-    chatTable.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true
-    chatTable.dataSource = chatTableDataSource
-    chatTableDelegate.chatPresenter = self
-    chatTable.delegate = chatTableDelegate
-
-    chatTable.rowHeight = 80
-
-    let newImage = UIImage(named: "create_new")!
-    newButton = UIBarButtonItem(image: newImage, landscapeImagePhone: nil, style: .plain, target: self, action: #selector(didPressNewChat))
-
-    newButton.tintColor = Constants.primaryColor
+
+    newButton = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.compose, target: self, action: #selector(didPressNewChat))
+    newButton.tintColor = DCColors.primary
     navigationItem.rightBarButtonItem = newButton
-  }
+
+		setupChatTable()
+	}
+
+	private func setupChatTable() {
+		view.addSubview(chatTable)
+		chatTable.translatesAutoresizingMaskIntoConstraints = false
+		chatTable.topAnchor.constraint(equalTo: view.topAnchor).isActive = true
+		chatTable.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
+		chatTable.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
+		chatTable.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true
+	}
 
   @objc func didPressNewChat() {
     let ncv = NewChatViewController()