diff --git a/RIADigiDoc/RIADigiDocApp.swift b/RIADigiDoc/RIADigiDocApp.swift index d75f9254..37ed00cb 100644 --- a/RIADigiDoc/RIADigiDocApp.swift +++ b/RIADigiDoc/RIADigiDocApp.swift @@ -109,6 +109,7 @@ struct RIADigiDocApp: App { .onAppear { onLaunchScreenViewAppear() } .environment(themeSettings) .preferredColorScheme(.light) + .environment(languageSettings) } } } diff --git a/RIADigiDoc/Supporting files/LaunchScreen.storyboard b/RIADigiDoc/Supporting files/LaunchScreen.storyboard index 2d409edc..db54db73 100644 --- a/RIADigiDoc/Supporting files/LaunchScreen.storyboard +++ b/RIADigiDoc/Supporting files/LaunchScreen.storyboard @@ -1,12 +1,17 @@ - + - + + + + RobotoCondensed-Medium + + @@ -16,18 +21,30 @@ - - - - - - + + + + + + + + + + + + + - + - - + + @@ -37,6 +54,6 @@ - + diff --git a/RIADigiDoc/Supporting files/Localizable.xcstrings b/RIADigiDoc/Supporting files/Localizable.xcstrings index 23617203..89da3b49 100644 --- a/RIADigiDoc/Supporting files/Localizable.xcstrings +++ b/RIADigiDoc/Supporting files/Localizable.xcstrings @@ -1416,23 +1416,6 @@ } } }, - "Help" : { - "extractionState" : "stale", - "localizations" : { - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Help" - } - }, - "et" : { - "stringUnit" : { - "state" : "translated", - "value" : "Abi" - } - } - } - }, "Hide password" : { "comment" : "Hide password", "extractionState" : "manual", @@ -1924,23 +1907,6 @@ } } }, - "Logo" : { - "comment" : "Accessibility label for launch screen logo", - "localizations" : { - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Logo" - } - }, - "et" : { - "stringUnit" : { - "state" : "translated", - "value" : "Logo" - } - } - } - }, "Main about 1 logo text" : { "comment" : "Main about Estonia logo text", "extractionState" : "manual", diff --git a/RIADigiDoc/UI/Component/Shared/LaunchScreenView.swift b/RIADigiDoc/UI/Component/Shared/LaunchScreenView.swift index 7bc4dcab..6f2061a5 100644 --- a/RIADigiDoc/UI/Component/Shared/LaunchScreenView.swift +++ b/RIADigiDoc/UI/Component/Shared/LaunchScreenView.swift @@ -18,15 +18,36 @@ */ import SwiftUI +import FactoryKit struct LaunchScreenView: View { + @AppTheme private var theme + @AppTypography private var typography + @Environment(LanguageSettings.self) private var languageSettings + + private var appName: String { + languageSettings.localized("App name") + } + var body: some View { ZStack { - Image("AppLogo") - .resizable() - .scaledToFit() - .frame(width: 160) - .accessibilityLabel("Logo") + AppColors.BlueBackground.ignoresSafeArea() + VStack(spacing: Dimensions.Padding.ZeroPadding) { + Image("image_eesti_shield") + .resizable() + .scaledToFit() + .frame(height: Dimensions.Icon.IconSizeXXL) + .accessibilityLabel(appName.lowercased()) + + Text(appName.uppercased()) + .font(typography.headlineMedium) + .foregroundStyle(Color.white) + .accessibilityLabel(appName.lowercased()) + .scaleEffect( + x: Dimensions.Scaling.SmallScaling, + y: Dimensions.Scaling.DefaultScaling + ) + } } .frame(maxWidth: .infinity, maxHeight: .infinity) .edgesIgnoringSafeArea(.all) @@ -35,4 +56,6 @@ struct LaunchScreenView: View { #Preview { LaunchScreenView() + .environment(Container.shared.themeSettings()) + .environment(Container.shared.languageSettings()) } diff --git a/RIADigiDoc/UI/Theme/Dimensions.swift b/RIADigiDoc/UI/Theme/Dimensions.swift index 7b8b5d30..837ecdf4 100644 --- a/RIADigiDoc/UI/Theme/Dimensions.swift +++ b/RIADigiDoc/UI/Theme/Dimensions.swift @@ -66,6 +66,7 @@ enum Dimensions { enum Scaling { static let DefaultScaling: CGFloat = 1.0 + static let SmallScaling: CGFloat = 1.1 static let WideScaling: CGFloat = 1.2 }