Removed adress label and enabled multiline for room names

Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift

@@ -132,15 +132,21 @@ class RoomInfoBasicView: UIView {
             }
             
             pillImageView?.image = federationBadgeImage()
-            roomNameLabel.numberOfLines = 2
             roomNameLabel.attributedText = roomNameWithFederationPill(roomDisplayName: viewData.roomDisplayName, font: roomNameLabel.font)
         } else {
             roomNameLabel.text = viewData.roomDisplayName
         }
         
+        roomNameLabel.numberOfLines = 0
+
         badgeImageView.image = nil
-        roomAddressLabel.text = viewData.mainRoomAlias
-        roomAddressLabel.isHidden = roomAddressLabel.text?.isEmpty ?? true
+        if BWIBuildSettings.shared.showMatrixIDinRoomInfoScreen {
+            roomAddressLabel.text = viewData.mainRoomAlias
+            roomAddressLabel.isHidden = roomAddressLabel.text?.isEmpty ?? true
+        } else {
+            roomAddressLabel.text = nil
+            roomAddressLabel.isHidden = true
+        }
         roomTopicTextView.text = viewData.roomTopic
         topicContainerView.isHidden = roomTopicTextView.text?.isEmpty ?? true
         securityTitleLabel.text = VectorL10n.securitySettingsTitle
@@ -153,6 +159,7 @@ class RoomInfoBasicView: UIView {
         } else {
             presenceIndicatorView.stopListeningPresenceUpdates()
         }
+        updateRoomNameLabelPosition()
         updateBadgeImageViewPosition(isPresenceDisplayed: viewData.directUserPresence != .unknown)
     }
     
@@ -196,6 +203,13 @@ class RoomInfoBasicView: UIView {
         return attributedString
     }
     
+    // bwi
+    private func updateRoomNameLabelPosition() {
+        let margins = self.layoutMarginsGuide
+        roomNameLabel.leadingAnchor.constraint(equalTo: margins.leadingAnchor).isActive = true
+        roomNameLabel.trailingAnchor.constraint(equalTo: margins.trailingAnchor).isActive = true
+    }
+    
     private func updateBadgeImageViewPosition(isPresenceDisplayed: Bool) {
         guard badgeImageView.image != nil else {
             badgeImageView.isHidden = true
@@ -263,6 +277,7 @@ extension RoomInfoBasicView: Themable {
 
 extension RoomInfoBasicView: PresenceIndicatorViewDelegate {
     func presenceIndicatorViewDidUpdateVisibility(_ presenceIndicatorView: PresenceIndicatorView, isHidden: Bool) {
+        updateRoomNameLabelPosition()
         updateBadgeImageViewPosition(isPresenceDisplayed: !isHidden)
     }
 }