From 8a01c0d3dd049fb885bb724b5d32dfc6f965c7ea Mon Sep 17 00:00:00 2001 From: Marten Rebane Date: Mon, 31 Aug 2026 12:37:05 +0300 Subject: [PATCH] Add new colors --- RIADigiDoc/UI/Theme/AppColors.swift | 70 ++++++++++---------- RIADigiDoc/UI/Theme/Model/ColorPalette.swift | 1 + 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/RIADigiDoc/UI/Theme/AppColors.swift b/RIADigiDoc/UI/Theme/AppColors.swift index a773916e..135fd5ce 100644 --- a/RIADigiDoc/UI/Theme/AppColors.swift +++ b/RIADigiDoc/UI/Theme/AppColors.swift @@ -21,30 +21,30 @@ import SwiftUI enum AppColors { - static let initialLaunchScreenBackground = Color(hex: 0x103064) + static let initialLaunchScreenBackground = Color(hex: 0x003168) static let light: ColorPalette = { - let primary = Color(hex: 0x002048) - let primaryContainer = Color(hex: 0x194178) - let secondary = Color(hex: 0x535F77) - let secondaryContainer = Color(hex: 0xD9E4FF) + let primary = Color(hex: 0x003168) + let primaryContainer = Color(hex: 0xDDE8F3) + let secondary = Color(hex: 0x747781) + let secondaryContainer = Color(hex: 0xE2E2E7) let error = Color(hex: 0xB00020) - let errorContainer = Color(hex: 0xFFDAD6) - let success = Color(hex: 0x0F6B38) - let successContainer = Color(hex: 0xD6F5E3) + let errorContainer = Color(hex: 0xF6DBE0) + let success = Color(hex: 0x2FB631) + let successContainer = Color(hex: 0xE0F4E0) let warning = Color(hex: 0x7A3E00) - let warningContainer = Color(hex: 0xFFDEA6) + let warningContainer = Color(hex: 0xFAE7C9) let onPrimary = Color.white - let onPrimaryContainer = Color(hex: 0xC5D7FF) - let onSecondaryContainer = Color(hex: 0x3D4960) + let onPrimaryContainer = Color(hex: 0x0C2246) let onSecondary = Color.white + let onSecondaryContainer = Color(hex: 0x282A2E) let onError = Color.white - let onErrorContainer = Color(hex: 0x410002) + let onErrorContainer = Color(hex: 0x710015) let onSuccess = Color.white - let onSuccessContainer = Color(hex: 0x00210F) + let onSuccessContainer = Color(hex: 0x144C15) let onWarning = Color.white - let onWarningContainer = Color(hex: 0x2A1400) + let onWarningContainer = Color(hex: 0x5A2E00) let outline = Color(hex: 0x747781) let outlineVariant = Color(hex: 0xC3C6D1) @@ -60,7 +60,7 @@ enum AppColors { let inversePrimary = Color(hex: 0xAAC7FF) let inverseSurface = Color(hex: 0x2F3034) - let inverseOnSurface = Color(hex: 0xF1F0F5) + let inverseOnSurface = Color(hex: 0xF4F3F8) return ColorPalette( primary: primary, @@ -75,6 +75,7 @@ enum AppColors { warningContainer: warningContainer, onPrimary: onPrimary, onPrimaryContainer: onPrimaryContainer, + onSecondary: onSecondary, onSecondaryContainer: onSecondaryContainer, onError: onError, onErrorContainer: onErrorContainer, @@ -101,26 +102,26 @@ enum AppColors { static let dark: ColorPalette = { let primary = Color(hex: 0xAAC7FF) - let primaryContainer = Color(hex: 0x002958) - let secondary = Color(hex: 0xBAC7E3) - let secondaryContainer = Color(hex: 0x313D54) - let error = Color(hex: 0xFF6F70) - let errorContainer = Color(hex: 0x7A1818) - let success = Color(hex: 0x4DD17A) - let successContainer = Color(hex: 0x1A4D2E) - let warning = Color(hex: 0xFFBC57) + let primaryContainer = Color(hex: 0x0F2C5A) + let secondary = Color(hex: 0xE0E2ED) + let secondaryContainer = Color(hex: 0x2F3034) + let error = Color(hex: 0xFF5C79) + let errorContainer = Color(hex: 0x50000F) + let success = Color(hex: 0x74CE75) + let successContainer = Color(hex: 0x0C2E0C) + let warning = Color(hex: 0xFBAE38) let warningContainer = Color(hex: 0x5A2E00) - let onPrimary = Color(hex: 0x002F65) - let onPrimaryContainer = Color(hex: 0x95B6F5) - let onSecondary = Color(hex: 0x253146) - let onSecondaryContainer = Color(hex: 0xC4D1ED) - let onError = Color(hex: 0x690005) - let onErrorContainer = Color(hex: 0xFFB0B0) - let onSuccess = Color(hex: 0x00210F) - let onSuccessContainer = Color(hex: 0xB0EEBF) - let onWarning = Color(hex: 0x2A1400) - let onWarningContainer = Color(hex: 0xFFC87A) + let onPrimary = Color(hex: 0x0C2246) + let onPrimaryContainer = Color(hex: 0xB5BFCF) + let onSecondary = Color(hex: 0x2F3034) + let onSecondaryContainer = Color(hex: 0xFAF9FE) + let onError = Color(hex: 0x34000A) + let onErrorContainer = Color(hex: 0xEFCCD2) + let onSuccess = Color(hex: 0x144C15) + let onSuccessContainer = Color(hex: 0x74CE75) + let onWarning = Color(hex: 0x5A2E00) + let onWarningContainer = Color(hex: 0xF2C174) let outline = Color(hex: 0x8D909B) let outlineVariant = Color(hex: 0x434750) @@ -134,7 +135,7 @@ enum AppColors { let onSurface = Color(hex: 0xE2E2E7) let onSurfaceVariant = Color(hex: 0xC3C6D1) - let inversePrimary = Color(hex: 0x3B5E97) + let inversePrimary = Color(hex: 0x003168) let inverseSurface = Color(hex: 0xE2E2E7) let inverseOnSurface = Color(hex: 0x2F3034) @@ -151,6 +152,7 @@ enum AppColors { warningContainer: warningContainer, onPrimary: onPrimary, onPrimaryContainer: onPrimaryContainer, + onSecondary: onSecondary, onSecondaryContainer: onSecondaryContainer, onError: onError, onErrorContainer: onErrorContainer, diff --git a/RIADigiDoc/UI/Theme/Model/ColorPalette.swift b/RIADigiDoc/UI/Theme/Model/ColorPalette.swift index 81f742e9..89515539 100644 --- a/RIADigiDoc/UI/Theme/Model/ColorPalette.swift +++ b/RIADigiDoc/UI/Theme/Model/ColorPalette.swift @@ -35,6 +35,7 @@ struct ColorPalette { let onPrimary: Color let onPrimaryContainer: Color + let onSecondary: Color let onSecondaryContainer: Color let onError: Color let onErrorContainer: Color