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

Merge branch 'develop' into maximee/6029_lls_timeline_cell and apply comments

Browse Source
This commit is contained in:
MaximeE
2022-04-25 15:53:58 +02:00
parent a86bffce34 97a74c2cd7
commit 928b7a4e97
57 changed files with 1680 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/Location/RoomTimelineLocationView.swift
+16 -9
View File
@@ -20,8 +20,8 @@ import Mapbox
import SwiftUI
protocol RoomTimelineLocationViewDelegate: AnyObject {
func didTapStopButton()
func didTapRetryButton()
func roomTimelineLocationViewDidTapStopButton(_ roomTimelineLocationView: RoomTimelineLocationView)
func roomTimelineLocationViewDidTapRetryButton(_ roomTimelineLocationView: RoomTimelineLocationView)
}
struct RoomTimelineLocationViewData {
@@ -66,6 +66,7 @@ enum OutgoingLiveLocationSharingStatus {
}
enum IncomingLiveLocationSharingStatus {
case starting
case started(_ timeleft: TimeInterval)
case stopped
}
@@ -221,8 +222,13 @@ class RoomTimelineLocationView: UIView, NibLoadable, Themable, MGLMapViewDelegat
switch viewState {
case .incoming(let liveLocationSharingStatus):
switch liveLocationSharingStatus {
case .starting:
iconTint = theme.roomCellLocalisationEndedColor
title = VectorL10n.locationSharingLiveLoading
titleColor = theme.roomCellLocalisationEndedColor
placeholderImage = Asset.Images.locationLiveCellLoadingImage.image
case .started(let timeLeft):
iconTint = theme.roomCellLocalisationStartedColor
iconTint = theme.roomCellLocalisationIconStartedColor
title = VectorL10n.liveLocationSharingBannerTitle
timeLeftString = generateTimerString(for: timeLeft, isIncomingLocation: true)
case .stopped:
@@ -239,7 +245,7 @@ class RoomTimelineLocationView: UIView, NibLoadable, Themable, MGLMapViewDelegat
titleColor = theme.roomCellLocalisationEndedColor
placeholderImage = Asset.Images.locationLiveCellLoadingImage.image
case .started(let timeLeft):
iconTint = theme.roomCellLocalisationStartedColor
iconTint = theme.roomCellLocalisationIconStartedColor
title = VectorL10n.liveLocationSharingBannerTitle
timeLeftString = generateTimerString(for: timeLeft, isIncomingLocation: false)
rightButtonTitle = VectorL10n.stop
@@ -262,11 +268,12 @@ class RoomTimelineLocationView: UIView, NibLoadable, Themable, MGLMapViewDelegat
private func generateTimerString(for timestamp: Double,
isIncomingLocation: Bool) -> String? {
let timerInSec = timestamp / 1000 // Timestamp is in millisecond in the SDK
let timerString: String?
if isIncomingLocation {
timerString = VectorL10n.locationSharingLiveTimerIncoming(incomingTimerFormatter.string(from: Date(timeIntervalSince1970: timestamp)))
} else if let outgoingTimer = outgoingTimerFormatter.string(from: Date(timeIntervalSince1970: timestamp).timeIntervalSinceNow) {
timerString = VectorL10n.locationSharingLiveTimerOutgoing(outgoingTimer)
timerString = VectorL10n.locationSharingLiveTimerIncoming(incomingTimerFormatter.string(from: Date(timeIntervalSince1970: timerInSec)))
} else if let outgoingTimer = outgoingTimerFormatter.string(from: Date(timeIntervalSince1970: timerInSec).timeIntervalSinceNow) {
timerString = VectorL10n.locationSharingLiveListItemTimeLeft(outgoingTimer)
} else {
timerString = nil
}
@@ -313,9 +320,9 @@ class RoomTimelineLocationView: UIView, NibLoadable, Themable, MGLMapViewDelegat
@IBAction private func didTapTightButton(_ sender: Any) {
if rightButton.tag == RightButtonTag.stopSharing.rawValue {
delegate?.didTapStopButton()
delegate?.roomTimelineLocationViewDidTapStopButton(self)
} else if rightButton.tag == RightButtonTag.retrySharing.rawValue {
delegate?.didTapRetryButton()
delegate?.roomTimelineLocationViewDidTapRetryButton(self)
}
}
}
Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Location/LocationPlainCell.swift
+4 -4
View File
@@ -87,10 +87,10 @@ class LocationPlainCell: SizableBaseRoomCell, RoomCellReactionsDisplayable, Room
avatarUrl: bubbleData.senderAvatarUrl,
mediaManager: bubbleData.mxSession.mediaManager,
fallbackImage: .matrixItem(bubbleData.senderId, bubbleData.senderDisplayName))
let futurDateTimeInterval = Date(timeIntervalSinceNow: 3734).timeIntervalSince1970
let futurDateTimeInterval = Date(timeIntervalSinceNow: 3734).timeIntervalSince1970 * 1000
locationView.displayLiveLocation(with: RoomTimelineLocationViewData(location: location, userAvatarData: avatarViewData, mapStyleURL: mapStyleURL),
liveLocationViewState: .outgoing(.failure))
liveLocationViewState: .outgoing(.started(futurDateTimeInterval)))
}
override func setupViews() {
@@ -112,7 +112,7 @@ class LocationPlainCell: SizableBaseRoomCell, RoomCellReactionsDisplayable, Room
}
extension LocationPlainCell: RoomTimelineLocationViewDelegate {
func didTapStopButton() {
func roomTimelineLocationViewDidTapStopButton(_ roomTimelineLocationView: RoomTimelineLocationView) {
guard let event = self.event else {
return
}
@@ -120,7 +120,7 @@ extension LocationPlainCell: RoomTimelineLocationViewDelegate {
delegate.cell(self, didRecognizeAction: kMXKRoomBubbleCellStopShareButtonPressed, userInfo: [kMXKRoomBubbleCellEventKey: event])
}
func didTapRetryButton() {
func roomTimelineLocationViewDidTapRetryButton(_ roomTimelineLocationView: RoomTimelineLocationView) {
guard let event = self.event else {
return
}