Skip to content

Add new app colors #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martenrebane merged 1 commit into from
Mar 20, 2026
Merged

Add new app colors #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions RIADigiDoc/Assets.xcassets/ic_m3_error_48pt_wght400.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "ic_m3_error_48pt_wght400.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
1 change: 1 addition & 0 deletions .../Assets.xcassets/ic_m3_error_48pt_wght400.imageset/ic_m3_error_48pt_wght400.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 0 additions & 11 deletions RIADigiDoc/Domain/Model/Error/FileOpeningErrors.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,3 @@ public enum FileOpeningError: Error {
case emptyFile
case noDataFiles
}

extension FileOpeningError: LocalizedError {
public var errorDescription: String? {
switch self {
case .unableToRetrieveFileSize, .invalidFileSize:
return NSLocalizedString("Invalid file size", comment: "")
case .emptyFile, .noDataFiles:
return NSLocalizedString("Could not load selected files", comment: "")
}
}
}
2 changes: 1 addition & 1 deletion RIADigiDoc/Supporting files/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@
"et" : {
"stringUnit" : {
"state" : "translated",
"value" : "Palun kontrolli internetiühendust ja võrgu sätteid"
"value" : "Palun kontrolli internetiühendust ja võrgusätteid"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Container/ContainerNameView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ struct ContainerNameView: View {
width: Dimensions.Icon.IconSizeXXS,
height: Dimensions.Icon.IconSizeXXS
)
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
})
.accessibilityFocusRestore(
focusedField: $focusedField,
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Container/ContainerNotificationsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ struct ContainerNotificationsView: View {
Image("ic_m3_notifications_48pt_wght400")
.resizable()
.scaledToFit()
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
.frame(width: Dimensions.Icon.IconSizeXXS, height: Dimensions.Icon.IconSizeXXS)
.padding(Dimensions.Padding.XSPadding)
.accessibilityHidden(true)
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Container/Crypto/CryptoDataFilesView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ struct CryptoDataFilesView: View {
.resizable()
.scaledToFit()
.frame(width: Dimensions.Icon.IconSizeXXS, height: Dimensions.Icon.IconSizeXXS)
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
.accessibilityLabel(
Text(
verbatim: "\(languageSettings.localized("File")) " +
Expand Down
55 changes: 40 additions & 15 deletions RIADigiDoc/UI/Component/Container/Crypto/Recipient/EncryptRecipientView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ struct EncryptRecipientView: View {
viewModel.searchText.isEmpty
}

var encryptLabel: String {
languageSettings.localized("Encrypt")
}

var body: some View {
TopBarContainer(
isTopBarHidden: isSearchExpanded,
Expand Down Expand Up @@ -244,27 +248,48 @@ struct EncryptRecipientView: View {
}
}
.safeAreaInset(edge: .bottom) {
UnsignedBottomBarView(
showLeftButton: false,
leftButtonIconName: "ic_m3_add_48pt_wght400",
leftButtonLabel: "",
leftButtonAccessibilityLabel: "",
leftButtonAction: {
// do nothing
},

rightButtonEnabled: encryptionButtonEnabled,
rightButtonIconName: "ic_m3_encrypted_48pt_wght400",
rightButtonLabel: languageSettings.localized("Encrypt"),
rightButtonAccessibilityLabel: languageSettings.localized("Encrypt").lowercased(),
rightButtonAction: {
HStack(spacing: Dimensions.Padding.XSPadding) {
Button(action: {
if encryptionButtonEnabled {
encryptionButtonEnabled = false
pathManager.replaceLast(to: .encryptView(isWithEncryption: true))
encryptionButtonEnabled = true
}
}
}, label: {
HStack(spacing: Dimensions.Padding.XSPadding) {
Image("ic_m3_encrypted_48pt_wght400")
.resizable()
.scaledToFit()
.frame(
width: Dimensions.Icon.IconSizeXXS,
height: Dimensions.Icon.IconSizeXXS
)
.foregroundStyle(theme.onPrimaryContainer)
.accessibilityHidden(true)

Text(verbatim: encryptLabel)
.foregroundStyle(theme.onPrimaryContainer)
.font(typography.bodyLarge)
.accessibilityHidden(true)
}
})
}
.padding(Dimensions.Padding.MSPadding)
.background(
RoundedRectangle(cornerRadius: Dimensions.Corner.MSCornerRadius)
.fill(theme.primaryContainer)
.shadow(
color: theme.onSurfaceVariant.opacity(Dimensions.Shadow.SOpacity),
radius: Dimensions.Shadow.radius,
x: Dimensions.Shadow.xOffset,
y: Dimensions.Shadow.yOffset
)
)
.frame(maxWidth: .infinity, alignment: .trailing)
.padding(Dimensions.Padding.MPadding)
.accessibilityElement(children: .ignore)
.accessibilityLabel(encryptLabel.lowercased())
.accessibilityIdentifier("bottomEncryptButton")
}
.onAppear {
Task { @MainActor in
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Container/Crypto/RecipientView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ struct RecipientView: View {
.resizable()
.scaledToFit()
.frame(width: Dimensions.Icon.IconSizeXXS, height: Dimensions.Icon.IconSizeXXS)
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
.accessibilityLabel(
Text(verbatim:
"\(languageSettings.localized("Recipient")) " +
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Container/DataFilesView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ struct DataFilesView: View {
.resizable()
.scaledToFit()
.frame(width: Dimensions.Icon.IconSizeXXS, height: Dimensions.Icon.IconSizeXXS)
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
.accessibilityLabel(
Text(
verbatim: "\(languageSettings.localized("File")) " +
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Container/Signing/ActionInputScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ struct ActionInputScreen<Content: View>: View {
width: Dimensions.Icon.IconSizeXXS,
height: Dimensions.Icon.IconSizeXXS
)
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
.accessibilityHidden(true)
}
}
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Container/Signing/ControlCodeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct ControlCodeView: View {
Image(icon)
.resizable()
.scaledToFit()
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
.frame(width: Dimensions.Icon.IconSizeXXL, height: Dimensions.Icon.IconSizeXXL)
.padding(.vertical, Dimensions.Padding.LPadding)
.padding(.top, Dimensions.Padding.SPadding)
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Container/Signing/IdCard/IdCardActionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct IdCardActionView: View {
Image(icon)
.resizable()
.scaledToFit()
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
.frame(
width: Dimensions.Icon.IconSizeXXL,
height: Dimensions.Icon.IconSizeXXL
Expand Down
4 changes: 2 additions & 2 deletions RIADigiDoc/UI/Component/Container/Signing/NFC/NFCActionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ struct NFCActionView: View {
Image(leftIcon)
.resizable()
.scaledToFit()
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
.frame(width: Dimensions.Icon.IconSizeXXL, height: Dimensions.Icon.IconSizeXXL)
.accessibilityHidden(true)

Image(rightIcon)
.resizable()
.scaledToFit()
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
.frame(width: Dimensions.Icon.IconSizeXXL, height: Dimensions.Icon.IconSizeXXL)
.accessibilityHidden(true)
}
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Container/Signing/SignatureView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ struct SignatureView: View {
.resizable()
.scaledToFit()
.frame(width: Dimensions.Icon.IconSizeXXS, height: Dimensions.Icon.IconSizeXXS)
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
.accessibilityLabel(
Text(verbatim:
"\(languageSettings.localized(isTimestamp ? "Timestamp" : "Signature")) " +
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Container/Signing/SignerDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ struct SignerDetailView: View {
.resizable()
.scaledToFit()
.frame(width: Dimensions.Icon.IconSizeXXS, height: Dimensions.Icon.IconSizeXXS)
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
.accessibilityHidden(true)
}
}
Expand Down
3 changes: 2 additions & 1 deletion RIADigiDoc/UI/Component/Container/UnsignedBottomBarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ struct UnsignedBottomBarView: View {
.disabled(!rightButtonEnabled)
.foregroundStyle(theme.surfaceContainer)
}
.padding(Dimensions.Padding.SPadding)
.padding(.vertical,Dimensions.Padding.SPadding)
.padding(.horizontal,Dimensions.Padding.MPadding)
.background(theme.surfaceContainer)
}
}
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/DiagnosticsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ struct DiagnosticsView: View {

let updateMessage = languageSettings.localized(messageKey)

Toast.show(updateMessage, type: .success)
Toast.show(updateMessage, type: isUpdated ? .success : .error)

if voiceOverEnabled {
var saveButtonAccessibilityAnnouncement = AttributedString(updateMessage)
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/InitView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct InitView: View {

var body: some View {
ZStack {
AppColors.BlueBackground.ignoresSafeArea()
AppColors.initialLaunchScreenBackground.ignoresSafeArea()
GeometryReader { geometry in
ScrollView {
VStack(
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/My eID/MyEidPinChangeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ struct MyEidPinChangeView: View {
width: Dimensions.Icon.IconSizeM,
height: Dimensions.Icon.IconSizeM
)
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
.accessibilityHidden(true)

Text(verbatim: stepTitle)
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Shared/LaunchScreenView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct LaunchScreenView: View {

var body: some View {
ZStack {
AppColors.BlueBackground.ignoresSafeArea()
AppColors.initialLaunchScreenBackground.ignoresSafeArea()
VStack(spacing: Dimensions.Padding.ZeroPadding) {
Image("image_eesti_shield")
.resizable()
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Shared/SaveButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct SaveButton: View {
.resizable()
.scaledToFit()
.frame(width: Dimensions.Icon.IconSizeXXS, height: Dimensions.Icon.IconSizeXXS)
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
.accessibilityLabel(languageSettings.localized("Save"))
}
.foregroundStyle(theme.onSurface)
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Shared/ShareButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ struct ShareButton: View {
RoundedRectangle(cornerRadius: Dimensions.Corner.MSCornerRadius)
.fill(theme.surfaceContainerHigh)
.shadow(
color: theme.onBackground.opacity(Dimensions.Shadow.SOpacity),
color: theme.onSurfaceVariant.opacity(Dimensions.Shadow.SOpacity),
radius: Dimensions.Shadow.radius,
x: Dimensions.Shadow.xOffset,
y: Dimensions.Shadow.yOffset
Expand Down
2 changes: 1 addition & 1 deletion RIADigiDoc/UI/Component/Shared/ShareButtonBottomBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ struct ShareButtonBottomBar: View {
)
}
}
.padding(.horizontal, Dimensions.Padding.SPadding)
.padding(.horizontal, Dimensions.Padding.MPadding)
.padding(.top, Dimensions.Padding.XSPadding)
.padding(.bottom, Dimensions.Padding.SPadding)
.sheet(isPresented: $showingShareSheet) {
Expand Down
8 changes: 4 additions & 4 deletions RIADigiDoc/UI/Component/Shared/TopBar/TopBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ struct TopBar: View {
.resizable()
.scaledToFit()
.frame(width: Dimensions.Icon.IconSizeXXS, height: Dimensions.Icon.IconSizeXXS)
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
}
.accessibilityLabel(languageSettings.localized(leftIconAccessibility))
.accessibilityInputLabels(getInputLabels(leftIconAccessibilityInput, leftIconAccessibility))
Expand All @@ -237,7 +237,7 @@ struct TopBar: View {
.resizable()
.scaledToFit()
.frame(width: Dimensions.Icon.IconSizeXXS, height: Dimensions.Icon.IconSizeXXS)
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
if extraBadgeCount > 0 {
Text(verbatim: "\(extraBadgeCount)")
.frame(
Expand All @@ -264,7 +264,7 @@ struct TopBar: View {
.resizable()
.scaledToFit()
.frame(width: Dimensions.Icon.IconSizeXXS, height: Dimensions.Icon.IconSizeXXS)
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
}
.accessibilityLabel(languageSettings.localized(rightPrimaryIconAccessibility))
.accessibilityInputLabels(getInputLabels(rightPrimaryIconAccessibilityInput,
Expand All @@ -278,7 +278,7 @@ struct TopBar: View {
.resizable()
.scaledToFit()
.frame(width: Dimensions.Icon.IconSizeXXS, height: Dimensions.Icon.IconSizeXXS)
.foregroundStyle(theme.onBackground)
.foregroundStyle(theme.onSurfaceVariant)
}
.accessibilityLabel(languageSettings.localized(rightSecondaryIconAccessibility))
.accessibilityInputLabels(getInputLabels(rightSecondaryIconAccessibilityInput,
Expand Down
Loading
Loading