ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 12:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1640 - Prevent loading skeletons from being dismissed too soon. Avoid weird animations caused by the session verification banner.

Browse Source
This commit is contained in:
Stefan Ceriu
2023-09-12 17:00:27 +03:00
committed by Stefan Ceriu
parent 97aa930852
commit d5e74907ad
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
+4 -2
View File
@@ -148,8 +148,10 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
.sink { [weak self] state, rooms in .sink { [weak self] state, rooms in
guard let self else { return } guard let self else { return }
let isLoadingData = !state.isLoaded && rooms.isEmpty // Rust sends back loaded even when no rooms are loaded yet, check room for empty to be sure
let hasNoRooms = (state.isLoaded && state.totalNumberOfRooms == 0 && rooms.isEmpty) let isLoadingData = !state.isLoaded || (state.totalNumberOfRooms != 0 && rooms.isEmpty)
let hasNoRooms = state.isLoaded && state.totalNumberOfRooms == 0 && rooms.isEmpty
var roomListMode = self.state.roomListMode var roomListMode = self.state.roomListMode
if isLoadingData { if isLoadingData {
ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
-1
View File
@@ -82,7 +82,6 @@ struct HomeScreen: View {
.scrollDismissesKeyboard(.immediately) .scrollDismissesKeyboard(.immediately)
.scrollDisabled(context.viewState.roomListMode == .skeletons) .scrollDisabled(context.viewState.roomListMode == .skeletons)
.scrollBounceBehavior(context.viewState.roomListMode == .empty ? .basedOnSize : .automatic) .scrollBounceBehavior(context.viewState.roomListMode == .empty ? .basedOnSize : .automatic)
.animation(.elementDefault, value: context.viewState.showSessionVerificationBanner)
.animation(.elementDefault, value: context.viewState.roomListMode) .animation(.elementDefault, value: context.viewState.roomListMode)
.animation(.none, value: context.viewState.visibleRooms) .animation(.none, value: context.viewState.visibleRooms)
} }