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

Add an app setting to disable rendering the chrome around the app logo/brand.

Browse Source
This commit is contained in:
Stefan Ceriu
2025-09-19 14:32:12 +03:00
committed by Stefan Ceriu
parent ab41783c4d
commit 94db3adf3a
10 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/Authentication/StartScreen/AuthenticationStartScreenModels.swift
+2
View File
@@ -37,6 +37,8 @@ struct AuthenticationStartScreenViewState: BindableState {
let showCreateAccountButton: Bool
let showQRCodeLoginButton: Bool
let hideBrandChrome: Bool
var bindings = AuthenticationStartScreenViewStateBindings()
var loginButtonTitle: String {
ElementX/Sources/Screens/Authentication/StartScreen/AuthenticationStartScreenViewModel.swift
+6 -3
View File
@@ -42,17 +42,20 @@ class AuthenticationStartScreenViewModel: AuthenticationStartScreenViewModelType
// The assumption here being that if you're running a custom app, your users will already be created.
AuthenticationStartScreenViewState(serverName: appSettings.accountProviders.count == 1 ? appSettings.accountProviders[0] : nil,
showCreateAccountButton: false,
showQRCodeLoginButton: isQRCodeScanningSupported)
showQRCodeLoginButton: isQRCodeScanningSupported,
hideBrandChrome: appSettings.hideBrandChrome)
} else if let provisioningParameters {
// We only show the "Sign in to …" button when using a provisioning link.
AuthenticationStartScreenViewState(serverName: provisioningParameters.accountProvider,
showCreateAccountButton: false,
showQRCodeLoginButton: false)
showQRCodeLoginButton: false,
hideBrandChrome: appSettings.hideBrandChrome)
} else {
// The default configuration.
AuthenticationStartScreenViewState(serverName: nil,
showCreateAccountButton: appSettings.showCreateAccountButton,
showQRCodeLoginButton: isQRCodeScanningSupported)
showQRCodeLoginButton: isQRCodeScanningSupported,
hideBrandChrome: appSettings.hideBrandChrome)
}
super.init(initialViewState: initialViewState)
ElementX/Sources/Screens/Authentication/StartScreen/View/AuthenticationStartScreen.swift
+14 -12
View File
@@ -62,23 +62,25 @@ struct AuthenticationStartScreen: View {
if verticalSizeClass == .regular {
Spacer()
AuthenticationStartLogo(isOnGradient: true)
AuthenticationStartLogo(isOnGradient: !context.viewState.hideBrandChrome)
}
Spacer()
VStack(spacing: 8) {
Text(L10n.screenOnboardingWelcomeTitle)
.font(.compound.headingLGBold)
.foregroundColor(.compound.textPrimary)
.multilineTextAlignment(.center)
Text(L10n.screenOnboardingWelcomeMessage(InfoPlistReader.main.productionAppName))
.font(.compound.bodyLG)
.foregroundColor(.compound.textSecondary)
.multilineTextAlignment(.center)
if !context.viewState.hideBrandChrome {
VStack(spacing: 8) {
Text(L10n.screenOnboardingWelcomeTitle)
.font(.compound.headingLGBold)
.foregroundColor(.compound.textPrimary)
.multilineTextAlignment(.center)
Text(L10n.screenOnboardingWelcomeMessage(InfoPlistReader.main.productionAppName))
.font(.compound.bodyLG)
.foregroundColor(.compound.textSecondary)
.multilineTextAlignment(.center)
}
.padding()
.fixedSize(horizontal: false, vertical: true)
}
.padding()
.fixedSize(horizontal: false, vertical: true)
Spacer()
}
ElementX/Sources/Screens/Other/PlaceholderScreenCoordinator.swift
+10 -10
View File
@@ -8,26 +8,26 @@
import SwiftUI
class PlaceholderScreenCoordinator: CoordinatorProtocol {
private let showsBackgroundGradient: Bool
private let hideBrandChrome: Bool
init(showsBackgroundGradient: Bool = false) {
self.showsBackgroundGradient = showsBackgroundGradient
init(hideBrandChrome: Bool = true) {
self.hideBrandChrome = hideBrandChrome
}
func toPresentable() -> AnyView {
AnyView(PlaceholderScreen(showsBackgroundGradient: showsBackgroundGradient))
AnyView(PlaceholderScreen(hideBrandChrome: hideBrandChrome))
}
}
/// The screen shown in split view when the detail has no content.
struct PlaceholderScreen: View {
let showsBackgroundGradient: Bool
let hideBrandChrome: Bool
var body: some View {
AuthenticationStartLogo(isOnGradient: showsBackgroundGradient)
AuthenticationStartLogo(isOnGradient: !hideBrandChrome)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background {
if showsBackgroundGradient {
if !hideBrandChrome {
AuthenticationStartScreenBackgroundImage()
}
}
@@ -40,10 +40,10 @@ struct PlaceholderScreen: View {
struct PlaceholderScreen_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
PlaceholderScreen(showsBackgroundGradient: false)
PlaceholderScreen(hideBrandChrome: true)
.previewDisplayName("Screen")
PlaceholderScreen(showsBackgroundGradient: true)
PlaceholderScreen(hideBrandChrome: false)
.previewDisplayName("With background")
NavigationSplitView {
@@ -53,7 +53,7 @@ struct PlaceholderScreen_Previews: PreviewProvider, TestablePreview {
}
}
} detail: {
PlaceholderScreen(showsBackgroundGradient: false)
PlaceholderScreen(hideBrandChrome: true)
}
.previewDisplayName("Split View")
.previewInterfaceOrientation(.landscapeLeft)