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

Use readableFrame and OnboardingIconImage everywhere.

Browse Source 
Fix order of accentColor modifier.
This commit is contained in:
Doug
2022-05-10 15:30:03 +01:00
committed by Doug
parent dcc6e0d3df
commit 870fc616c5
8 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Onboarding/Avatar/View/OnboardingAvatarScreen.swift
+3 -3
View File
@@ -43,14 +43,14 @@ struct OnboardingAvatarScreen: View {
buttons
}
.frame(maxWidth: OnboardingMetrics.maxContentWidth)
.readableFrame()
.padding(.horizontal)
.padding(.top, OnboardingMetrics.topPaddingToNavigationBar)
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
.accentColor(theme.colors.accent)
.frame(maxHeight: .infinity)
.background(theme.colors.background.ignoresSafeArea())
.alert(item: $viewModel.alertInfo) { $0.alert }
.accentColor(theme.colors.accent)
}
RiotSwiftUI/Modules/Onboarding/Celebration/View/OnboardingCelebrationScreen.swift
+4 -5
View File
@@ -39,19 +39,18 @@ struct OnboardingCelebrationScreen: View {
var body: some View {
GeometryReader { geometry in
VStack {
ScrollView(showsIndicators: false) {
ScrollView {
Spacer()
.frame(height: OnboardingMetrics.spacerHeight(in: geometry))
mainContent
.frame(maxWidth: OnboardingMetrics.maxContentWidth)
.readableFrame()
.padding(.top, OnboardingMetrics.breakerScreenTopPadding)
.padding(.horizontal, horizontalPadding)
}
.frame(maxWidth: .infinity)
buttons
.frame(maxWidth: OnboardingMetrics.maxContentWidth)
.readableFrame()
.padding(.horizontal, horizontalPadding)
.padding(.bottom, OnboardingMetrics.actionButtonBottomPadding)
.padding(.bottom, geometry.safeAreaInsets.bottom > 0 ? 0 : 16)
@@ -59,7 +58,7 @@ struct OnboardingCelebrationScreen: View {
Spacer()
.frame(height: OnboardingMetrics.spacerHeight(in: geometry))
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
.frame(maxHeight: .infinity)
}
.overlay(effects.ignoresSafeArea())
.background(theme.colors.background.ignoresSafeArea())
RiotSwiftUI/Modules/Onboarding/Congratulations/View/OnboardingCongratulationsScreen.swift
+3 -4
View File
@@ -43,14 +43,13 @@ struct OnboardingCongratulationsScreen: View {
.frame(height: OnboardingMetrics.spacerHeight(in: geometry))
mainContent
.frame(maxWidth: OnboardingMetrics.maxContentWidth)
.readableFrame()
.padding(.top, OnboardingMetrics.breakerScreenTopPadding)
.padding(.horizontal, horizontalPadding)
}
.frame(maxWidth: .infinity)
footer
.frame(maxWidth: OnboardingMetrics.maxContentWidth)
.readableFrame()
.padding(.horizontal, horizontalPadding)
.padding(.bottom, OnboardingMetrics.actionButtonBottomPadding)
.padding(.bottom, geometry.safeAreaInsets.bottom > 0 ? 0 : 16)
@@ -62,9 +61,9 @@ struct OnboardingCongratulationsScreen: View {
}
.overlay(effects.ignoresSafeArea())
.background(theme.colors.accent.ignoresSafeArea())
.accentColor(.white)
.navigationBarHidden(true)
.preferredColorScheme(.dark) // make the status bar white
.accentColor(.white)
}
/// The main content of the view to be shown in a scroll view.
RiotSwiftUI/Modules/Onboarding/DisplayName/View/OnboardingDisplayNameScreen.swift
+3 -3
View File
@@ -48,14 +48,14 @@ struct OnboardingDisplayNameScreen: View {
buttons
}
.frame(maxWidth: OnboardingMetrics.maxContentWidth)
.readableFrame()
.padding(.horizontal)
.padding(.top, OnboardingMetrics.topPaddingToNavigationBar)
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
.accentColor(theme.colors.accent)
.frame(maxHeight: .infinity)
.background(theme.colors.background.ignoresSafeArea())
.alert(item: $viewModel.alertInfo) { $0.alert }
.accentColor(theme.colors.accent)
.onChange(of: viewModel.displayName) { _ in
viewModel.send(viewAction: .validateDisplayName)
}
RiotSwiftUI/Modules/Onboarding/UseCase/View/OnboardingUseCaseSelectionScreen.swift
+3 -2
View File
@@ -102,12 +102,11 @@ struct OnboardingUseCaseSelectionScreen: View {
useCaseButtons
}
.frame(maxWidth: OnboardingMetrics.maxContentWidth)
.readableFrame()
.padding(.top, OnboardingMetrics.topPaddingToNavigationBar)
.padding(.bottom, 8)
.padding(.horizontal, 16)
}
.frame(maxWidth: .infinity)
serverFooter
.padding(.horizontal, 16)
@@ -128,7 +127,9 @@ struct OnboardingUseCase_Previews: PreviewProvider {
static var previews: some View {
stateRenderer.screenGroup(addNavigation: true)
.theme(.light).preferredColorScheme(.light)
.navigationViewStyle(.stack)
stateRenderer.screenGroup(addNavigation: true)
.theme(.dark).preferredColorScheme(.dark)
.navigationViewStyle(.stack)
}
}