felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-24 02:22:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into steve/5210_bubble_polls

Browse Source
This commit is contained in:
SBiOSoftWhare
2022-02-04 16:32:33 +01:00
parent 719f900045 d8df62ec70
commit e090fef42e
87 changed files with 1698 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/Views/BubbleCells/Location/LocationBubbleCell.swift
+4 -2
View File
@@ -37,6 +37,8 @@ class LocationBubbleCell: SizableBaseBubbleCell, BubbleCellReactionsDisplayable
let location = CLLocationCoordinate2D(latitude: locationContent.latitude, longitude: locationContent.longitude)
let mapStyleURL = bubbleData.mxSession.vc_homeserverConfiguration().tileServer.mapStyleURL
if locationContent.assetType == .user {
let avatarViewData = AvatarViewData(matrixItemId: bubbleData.senderId,
displayName: bubbleData.senderDisplayName,
@@ -44,9 +46,9 @@ class LocationBubbleCell: SizableBaseBubbleCell, BubbleCellReactionsDisplayable
mediaManager: bubbleData.mxSession.mediaManager,
fallbackImage: .matrixItem(bubbleData.senderId, bubbleData.senderDisplayName))
locationView.displayLocation(location, userAvatarData: avatarViewData)
locationView.displayLocation(location, userAvatarData: avatarViewData, mapStyleURL: mapStyleURL)
} else {
locationView.displayLocation(location)
locationView.displayLocation(location, mapStyleURL: mapStyleURL)
}
}
Riot/Modules/Room/Views/Threads/Summary/ThreadSummaryView.xib
+1 -1
View File
@@ -42,7 +42,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9wW-1f-f69" customClass="UserAvatarView" customModule="Riot" customModuleProvider="target">
<view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9wW-1f-f69" customClass="UserAvatarView" customModule="Riot" customModuleProvider="target">
<rect key="frame" x="44" y="4" width="24" height="24"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>