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

Remove the requiresExtraAccountSetup badge. (#5921)

Browse Source 
It is no longer part of the designs, we only badge the item in Settings.
This commit is contained in:
Doug
2026-07-23 09:06:25 +01:00
committed by GitHub
parent bf498a5d18
commit d4849a2a79
9 changed files with 20 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/SwiftUI/Views/AvatarSettingsButtonLabel.swift
-14
View File
@@ -10,7 +10,6 @@ import SwiftUI
struct AvatarSettingsButtonLabel: View {
let userProfile: UserProfile
var requiresExtraAccountSetup = false
let mediaProvider: MediaProviderProtocol?
var body: some View {
@@ -20,7 +19,6 @@ struct AvatarSettingsButtonLabel: View {
avatarSize: .user(on: .chats),
mediaProvider: mediaProvider)
.accessibilityIdentifier(A11yIdentifiers.homeScreen.userAvatar)
.overlayBadge(10, isBadged: requiresExtraAccountSetup)
.modifier(StatusEmojiModifier(statusEmoji: userProfile.status.displayed?.emoji))
.geometryGroup()
}
@@ -61,23 +59,11 @@ struct AvatarSettingsButtonLabel_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
HStack(spacing: 16) {
AvatarSettingsButtonLabel(userProfile: .mockAlice,
requiresExtraAccountSetup: false,
mediaProvider: MediaProviderMock(.init()))
AvatarSettingsButtonLabel(userProfile: .mockAlice,
requiresExtraAccountSetup: true,
mediaProvider: MediaProviderMock(.init()))
AvatarSettingsButtonLabel(userProfile: .init(userID: "",
avatarURL: .mockMXCUserAvatar,
status: .mock(text: "", emoji: "🌴")),
requiresExtraAccountSetup: false,
mediaProvider: MediaProviderMock(.init()))
AvatarSettingsButtonLabel(userProfile: .init(userID: "",
avatarURL: .mockMXCUserAvatar,
status: .mock(text: "", emoji: "🌴")),
requiresExtraAccountSetup: true,
mediaProvider: MediaProviderMock(.init()))
}
.padding(16)
ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift
-2
View File
@@ -95,8 +95,6 @@ struct HomeScreenViewState: BindableState {
var securityBannerMode = HomeScreenSecurityBannerMode.none
var shouldShowNewSoundBanner = false
var requiresExtraAccountSetup = false
var rooms: [HomeScreenRoom] = []
var roomListMode: HomeScreenRoomListMode = .skeletons
ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
-3
View File
@@ -65,16 +65,13 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
switch securityState.recoveryState {
case .disabled:
state.requiresExtraAccountSetup = true
if !state.securityBannerMode.isDismissed {
state.securityBannerMode = .show(.setUpRecovery)
}
case .incomplete:
state.requiresExtraAccountSetup = true
state.securityBannerMode = .show(.recoveryOutOfSync)
default:
state.securityBannerMode = .none
state.requiresExtraAccountSetup = false
}
}
.store(in: &cancellables)
ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
-1
View File
@@ -86,7 +86,6 @@ struct HomeScreen: View {
context.send(viewAction: .showSettings)
} label: {
AvatarSettingsButtonLabel(userProfile: context.viewState.userProfile,
requiresExtraAccountSetup: context.viewState.requiresExtraAccountSetup,
mediaProvider: context.mediaProvider)
}
.accessibilityLabel(L10n.commonSettings)