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

Merge develop in 6081_lls_screen_integration

Browse Source
This commit is contained in:
SBiOSoftWhare
2022-05-04 16:53:49 +02:00
parent 8d8161b545 5f0fd38754
commit b2a2dba2ba
18 changed files with 263 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift
+10 -1
View File
@@ -25,12 +25,20 @@ enum LocationSharingCoordinateType {
case pin
}
enum LiveLocationSharingTimeout: TimeInterval {
// Timer are in milliseconde because timestamp are in millisecond in Matrix SDK
case short = 900000 // 15 minutes
case medium = 3600000 // 1 hour
case long = 28800000 // 8 hours
}
enum LocationSharingViewAction {
case cancel
case share
case sharePinLocation
case goToUserLocation
case shareLiveLocation
case startLiveSharing
case shareLiveLocation(timeout: LiveLocationSharingTimeout)
}
enum LocationSharingViewModelResult {
@@ -87,6 +95,7 @@ struct LocationSharingViewStateBindings {
var alertInfo: AlertInfo<LocationSharingAlertType>?
var userLocation: CLLocationCoordinate2D?
var pinLocation: CLLocationCoordinate2D?
var showingTimerSelector = false
}
enum LocationSharingAlertType {
RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
+5 -8
View File
@@ -25,12 +25,6 @@ typealias LocationSharingViewModelType = StateStoreViewModel<LocationSharingView
@available(iOS 14, *)
class LocationSharingViewModel: LocationSharingViewModelType, LocationSharingViewModelProtocol {
// MARK: - Constants
private enum Constants {
static let liveLocationSharingDefaultTimeout: TimeInterval = 300 // 5 minutes
}
// MARK: - Properties
// MARK: Private
@@ -80,8 +74,11 @@ class LocationSharingViewModel: LocationSharingViewModelType, LocationSharingVie
completion?(.share(latitude: pinLocation.latitude, longitude: pinLocation.longitude, coordinateType: .pin))
case .goToUserLocation:
state.bindings.pinLocation = nil
case .shareLiveLocation:
completion?(.shareLiveLocation(timeout: Constants.liveLocationSharingDefaultTimeout))
case .startLiveSharing:
state.bindings.showingTimerSelector = true
case .shareLiveLocation(let timeout):
state.bindings.showingTimerSelector = false
completion?(.shareLiveLocation(timeout: timeout.rawValue))
}
}
RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
+19 -1
View File
@@ -112,7 +112,7 @@ struct LocationSharingView: View {
// Hide for now until live location sharing is finished
if context.viewState.isLiveLocationSharingEnabled {
LocationSharingOptionButton(text: VectorL10n.locationSharingLiveShareTitle) {
context.send(viewAction: .shareLiveLocation)
context.send(viewAction: .startLiveSharing)
} buttonIcon: {
Image(uiImage: Asset.Images.locationLiveIcon.image)
.resizable()
@@ -129,6 +129,24 @@ struct LocationSharingView: View {
.disabled(!context.viewState.shareButtonEnabled)
}
}
.actionSheet(isPresented: $context.showingTimerSelector) {
ActionSheet(title: Text(VectorL10n.locationSharingLiveTimerSelectorTitle),
buttons: [
.default(Text(VectorL10n.locationSharingLiveTimerSelectorShort)) {
context.send(viewAction: .shareLiveLocation(timeout: .short))
},
.default(Text(VectorL10n.locationSharingLiveTimerSelectorMedium)) {
context.send(viewAction: .shareLiveLocation(timeout: .medium))
},
.default(Text(VectorL10n.locationSharingLiveTimerSelectorLong)) {
context.send(viewAction: .shareLiveLocation(timeout: .long))
},
.cancel()
])
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding()
}