Selaa lähdekoodia

show mute icon in chat title bar

cyberta 5 vuotta sitten
vanhempi
commit
dfa08ec469

+ 23 - 0
deltachat-ios/Assets.xcassets/volume_off.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "baseline_volume_off_white_24pt_1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "baseline_volume_off_white_24pt_2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "baseline_volume_off_white_24pt_3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
deltachat-ios/Assets.xcassets/volume_off.imageset/baseline_volume_off_white_24pt_1x.png


BIN
deltachat-ios/Assets.xcassets/volume_off.imageset/baseline_volume_off_white_24pt_2x.png


BIN
deltachat-ios/Assets.xcassets/volume_off.imageset/baseline_volume_off_white_24pt_3x.png


+ 17 - 3
deltachat-ios/Controller/ChatViewController.swift

@@ -61,6 +61,17 @@ class ChatViewController: MessagesViewController {
         return UIBarButtonItem(customView: indicator)
     }()
 
+
+    private lazy var muteItem: UIBarButtonItem = {
+        let imageView = UIImageView()
+        imageView.tintColor = DcColors.defaultTextColor
+        imageView.image =  #imageLiteral(resourceName: "volume_off").withRenderingMode(.alwaysTemplate)
+        imageView.translatesAutoresizingMaskIntoConstraints = false
+        imageView.heightAnchor.constraint(equalToConstant: 20).isActive = true
+        imageView.widthAnchor.constraint(equalToConstant: 20).isActive = true
+        return UIBarButtonItem(customView: imageView)
+    }()
+
     private lazy var badgeItem: UIBarButtonItem = {
         let badge: InitialsBadge
         let chat = dcContext.getChat(chatId: chatId)
@@ -298,11 +309,14 @@ class ChatViewController: MessagesViewController {
         titleView.updateTitleView(title: chat.name, subtitle: subtitle)
         navigationItem.titleView = titleView
 
+        var rightBarButtonItems = [badgeItem]
         if chat.isSendingLocations {
-            navigationItem.rightBarButtonItems = [badgeItem, locationStreamingItem]
-        } else {
-            navigationItem.rightBarButtonItems = [badgeItem]
+            rightBarButtonItems.append(locationStreamingItem)
+        }
+        if chat.isMuted {
+            rightBarButtonItems.append(muteItem)
         }
+        navigationItem.rightBarButtonItems = rightBarButtonItems
     }
 
     @objc