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

5720: Update from develop

Browse Source
This commit is contained in:
MaximeE
2022-03-22 09:41:25 +01:00
parent 5706478900 7e39b92907
commit ea83927c74
104 changed files with 2599 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingOptionButton.swift
+1 -1
View File
@@ -54,7 +54,7 @@ struct LocationSharingOptionButton_Previews: PreviewProvider {
LocationSharingOptionButton(text: "Share live location") {
} content: {
LocationSharingOptionButtonIcon(fillColor: Color.purple, image: Asset.Images.locationLiveIcon.image)
LocationSharingOptionButtonIcon(fillColor: Color.purple, image: Asset.Images.liveLocationIcon.image)
}
}
}
RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
+1 -1
View File
@@ -99,7 +99,7 @@ struct LocationSharingView: View {
LocationSharingOptionButton(text: VectorL10n.locationSharingLiveShareTitle) {
// TODO: - Start live location sharing
} content: {
LocationSharingOptionButtonIcon(fillColor: Color.purple, image: Asset.Images.locationLiveIcon.image)
LocationSharingOptionButtonIcon(fillColor: Color.purple, image: Asset.Images.liveLocationIcon.image)
}
.disabled(!context.viewState.shareButtonEnabled)
}
RiotSwiftUI/Modules/Room/UserSuggestion/UserSuggestionViewModel.swift
+2 -2
View File
@@ -46,8 +46,8 @@ class UserSuggestionViewModel: UserSuggestionViewModelType, UserSuggestionViewMo
super.init(initialViewState: UserSuggestionViewState(items: items))
userSuggestionService.items.sink { items in
self.state.items = items.map({ item in
userSuggestionService.items.sink { [weak self] items in
self?.state.items = items.map({ item in
UserSuggestionViewStateItem(id: item.userId, avatar: item, displayName: item.displayName)
})
}.store(in: &cancellables)