diff --git a/Core/Core/View/Base/AlertView.swift b/Core/Core/View/Base/AlertView.swift index 388c70c5..286fdd2e 100644 --- a/Core/Core/View/Base/AlertView.swift +++ b/Core/Core/View/Base/AlertView.swift @@ -109,15 +109,8 @@ public struct AlertView: View { .fixedSize(horizontal: false, vertical: false) ) .overlay( - RoundedRectangle(cornerRadius: 12) - .stroke( - style: .init( - lineWidth: 1, - lineCap: .round, - lineJoin: .round, - miterLimit: 1 - ) - ) + Theme.Shapes.buttonShape + .stroke(lineWidth: 1) .foregroundColor(Theme.Colors.backgroundStroke) .fixedSize(horizontal: false, vertical: false) ) @@ -256,7 +249,7 @@ public struct AlertView: View { .frame(maxWidth: 215) } UnitButtonView(type: .custom(action), - bgColor: .clear, + bgColor: Theme.Colors.secondaryButtonBGColor, action: { okTapped() }) .frame(maxWidth: 215) @@ -417,7 +410,7 @@ public struct AlertView: View { } label: { ZStack { Text(primaryButtonTitle) - .foregroundColor(Theme.Colors.primaryButtonTextColor) + .foregroundColor(Theme.Colors.styledButtonText) .font(Theme.Fonts.labelLarge) .frame(maxWidth: .infinity) .padding(.horizontal, 16) @@ -426,7 +419,7 @@ public struct AlertView: View { } .background( Theme.Shapes.buttonShape - .fill(Theme.Colors.accentColor) + .fill(Theme.Colors.accentButtonColor) ) .overlay( RoundedRectangle(cornerRadius: 8) @@ -454,7 +447,7 @@ public struct AlertView: View { }) .background( Theme.Shapes.buttonShape - .fill(.clear) + .fill(Theme.Colors.secondaryButtonBGColor) ) .overlay( RoundedRectangle(cornerRadius: 8) diff --git a/Core/Core/View/Base/CourseCellView.swift b/Core/Core/View/Base/CourseCellView.swift index 72f02b2b..a996c338 100644 --- a/Core/Core/View/Base/CourseCellView.swift +++ b/Core/Core/View/Base/CourseCellView.swift @@ -116,7 +116,7 @@ public struct CourseCellView: View { .overlay(Theme.Colors.cardViewStroke) .padding(.vertical, 18) .padding(.horizontal, 3) - .accessibilityIdentifier("devider") + .accessibilityIdentifier("divider") } } } diff --git a/Core/Core/View/Base/LogistrationBottomView.swift b/Core/Core/View/Base/LogistrationBottomView.swift index fca95cc0..fc0aa0ef 100644 --- a/Core/Core/View/Base/LogistrationBottomView.swift +++ b/Core/Core/View/Base/LogistrationBottomView.swift @@ -48,7 +48,7 @@ public struct LogistrationBottomView: View { action: { action(.signIn) }, - color: Theme.Colors.background, + color: Theme.Colors.secondaryButtonBGColor, textColor: Theme.Colors.secondaryButtonTextColor, borderColor: Theme.Colors.secondaryButtonBorderColor ) diff --git a/Core/Core/View/Base/PickerView.swift b/Core/Core/View/Base/PickerView.swift index d0655ddb..e0403b82 100644 --- a/Core/Core/View/Base/PickerView.swift +++ b/Core/Core/View/Base/PickerView.swift @@ -64,7 +64,7 @@ public struct PickerView: View { .stroke(lineWidth: 1) .fill(config.error == "" ? Theme.Colors.textInputStroke - : Theme.Colors.alert) + : Theme.Colors.irreversibleAlert) ) .shake($config.shake) Text(config.error == "" ? config.field.instructions @@ -72,7 +72,7 @@ public struct PickerView: View { .font(Theme.Fonts.labelMedium) .foregroundColor(config.error == "" ? Theme.Colors.textPrimary - : Theme.Colors.alert) + : Theme.Colors.irreversibleAlert) .accessibilityIdentifier("\(config.field.name)_instructions_text") } } diff --git a/Core/Core/View/Base/RegistrationTextField.swift b/Core/Core/View/Base/RegistrationTextField.swift index 9ed03976..45a8345c 100644 --- a/Core/Core/View/Base/RegistrationTextField.swift +++ b/Core/Core/View/Base/RegistrationTextField.swift @@ -60,7 +60,7 @@ public struct RegistrationTextField: View { .fill( config.error == "" ? Theme.Colors.textInputStroke - : Theme.Colors.alert + : Theme.Colors.irreversibleAlert ) ) .shake($config.shake) @@ -83,7 +83,7 @@ public struct RegistrationTextField: View { .fill( config.error == "" ? Theme.Colors.textInputStroke - : Theme.Colors.alert + : Theme.Colors.irreversibleAlert ) ) .shake($config.shake) @@ -107,7 +107,7 @@ public struct RegistrationTextField: View { .fill( config.error == "" ? Theme.Colors.textInputStroke - : Theme.Colors.alert + : Theme.Colors.irreversibleAlert ) ) .shake($config.shake) @@ -119,7 +119,7 @@ public struct RegistrationTextField: View { .font(Theme.Fonts.bodySmall) .foregroundColor(config.error == "" ? Theme.Colors.textSecondaryLight - : Theme.Colors.alert) + : Theme.Colors.irreversibleAlert) .accessibilityIdentifier("\(config.field.name)_instructions_text") } } diff --git a/Core/Core/View/Base/UnitButtonView.swift b/Core/Core/View/Base/UnitButtonView.swift index d347cde9..6778bb8d 100644 --- a/Core/Core/View/Base/UnitButtonView.swift +++ b/Core/Core/View/Base/UnitButtonView.swift @@ -75,23 +75,23 @@ public struct UnitButtonView: View { case .first: HStack { Text(type.stringValue()) - .foregroundColor(Theme.Colors.styledButtonText) + .foregroundColor(Theme.Colors.primaryButtonTextColor) .font(Theme.Fonts.labelLarge) CoreAssets.arrowLeft.swiftUIImage.renderingMode(.template) - .foregroundColor(Theme.Colors.styledButtonText) + .foregroundColor(Theme.Colors.primaryButtonTextColor) .rotationEffect(Angle.degrees(nextButtonDegrees)) }.padding(.horizontal, 16) case .next, .nextBig: HStack { Text(type.stringValue()) - .foregroundColor(Theme.Colors.styledButtonText) + .foregroundColor(Theme.Colors.primaryButtonTextColor) .padding(.leading, 20) .font(Theme.Fonts.labelLarge) if type != .nextBig { Spacer() } CoreAssets.arrowLeft.swiftUIImage.renderingMode(.template) - .foregroundColor(Theme.Colors.styledButtonText) + .foregroundColor(Theme.Colors.primaryButtonTextColor) .rotationEffect(Angle.degrees(nextButtonDegrees)) .padding(.trailing, 20) } @@ -99,19 +99,19 @@ public struct UnitButtonView: View { HStack { if isVerticalNavigation { Text(type.stringValue()) - .foregroundColor(Theme.Colors.secondaryButtonTextColor) + .foregroundColor(Theme.Colors.accentColor) .font(Theme.Fonts.labelLarge) .padding(.leading, 20) CoreAssets.arrowLeft.swiftUIImage.renderingMode(.template) .rotationEffect(Angle.degrees(90)) .padding(.trailing, 20) - .foregroundColor(Theme.Colors.secondaryButtonTextColor) + .foregroundColor(Theme.Colors.accentColor) } else { CoreAssets.arrowLeft.swiftUIImage.renderingMode(.template) .padding(.leading, 20) - .foregroundColor(Theme.Colors.secondaryButtonTextColor) + .foregroundColor(Theme.Colors.accentColor) Text(type.stringValue()) - .foregroundColor(Theme.Colors.secondaryButtonTextColor) + .foregroundColor(Theme.Colors.accentColor) .font(Theme.Fonts.labelLarge) .padding(.trailing, 20) } @@ -119,22 +119,22 @@ public struct UnitButtonView: View { case .last: HStack { Text(type.stringValue()) - .foregroundColor(Theme.Colors.styledButtonText) + .foregroundColor(Theme.Colors.primaryButtonTextColor) .padding(.leading, 8) .font(Theme.Fonts.labelLarge) .scaledToFit() Spacer() CoreAssets.check.swiftUIImage.renderingMode(.template) - .foregroundColor(Theme.Colors.styledButtonText) + .foregroundColor(Theme.Colors.primaryButtonTextColor) .padding(.trailing, 8) } case .finish: HStack { Text(type.stringValue()) - .foregroundColor(Theme.Colors.styledButtonText) + .foregroundColor(Theme.Colors.primaryButtonTextColor) .font(Theme.Fonts.labelLarge) CoreAssets.check.swiftUIImage.renderingMode(.template) - .foregroundColor(Theme.Colors.styledButtonText) + .foregroundColor(Theme.Colors.primaryButtonTextColor) }.padding(.horizontal, 16) case .reload, .custom: VStack(alignment: .center) { @@ -163,7 +163,7 @@ public struct UnitButtonView: View { Theme.Shapes.buttonShape .fill(type == .previous ? Theme.Colors.background - : Theme.Colors.accentButtonColor) + : Theme.Colors.accentColor) .shadow(color: Color.black.opacity(0.25), radius: 21, y: 4) .overlay( Theme.Shapes.buttonShape @@ -174,8 +174,7 @@ public struct UnitButtonView: View { miterLimit: 1) ) .foregroundColor( - type == .previous ? Theme.Colors.secondaryButtonBorderColor - : Theme.Colors.accentButtonColor + Theme.Colors.accentColor ) ) diff --git a/Course/Course/Presentation/Handouts/HandoutsView.swift b/Course/Course/Presentation/Handouts/HandoutsView.swift index c9f7460d..c9a2ed6c 100644 --- a/Course/Course/Presentation/Handouts/HandoutsView.swift +++ b/Course/Course/Presentation/Handouts/HandoutsView.swift @@ -61,6 +61,9 @@ struct HandoutsView: View { ) }) Divider() + .frame(height: 1) + .overlay(Theme.Colors.cardViewStroke) + .accessibilityIdentifier("divider") HandoutsItemCell(type: .announcements, onTapAction: { if !viewModel.updates.isEmpty { viewModel.router.showHandoutsUpdatesView( diff --git a/Course/Course/Presentation/Subviews/CustomDisclosureGroup.swift b/Course/Course/Presentation/Subviews/CustomDisclosureGroup.swift index 10ab5062..8f152fdd 100644 --- a/Course/Course/Presentation/Subviews/CustomDisclosureGroup.swift +++ b/Course/Course/Presentation/Subviews/CustomDisclosureGroup.swift @@ -174,7 +174,7 @@ struct CustomDisclosureGroup: View { .padding(.vertical, 12) .background( RoundedRectangle(cornerRadius: 8) - .fill(Theme.Colors.tabbarColor) + .fill(Theme.Colors.datesSectionBackground) ) .overlay( RoundedRectangle(cornerRadius: 8) diff --git a/Dashboard/Dashboard/Presentation/Elements/CourseCardView.swift b/Dashboard/Dashboard/Presentation/Elements/CourseCardView.swift index 53a0911d..2c93c7d3 100644 --- a/Dashboard/Dashboard/Presentation/Elements/CourseCardView.swift +++ b/Dashboard/Dashboard/Presentation/Elements/CourseCardView.swift @@ -66,7 +66,7 @@ struct CourseCardView: View { .padding(8) } } - .background(Theme.Colors.background) + .background(Theme.Colors.courseCardBackground) .cornerRadius(8) .shadow(color: Theme.Colors.courseCardShadow, radius: 6, x: 2, y: 2) } diff --git a/Dashboard/Dashboard/Presentation/Elements/DropDownMenu.swift b/Dashboard/Dashboard/Presentation/Elements/DropDownMenu.swift index 85ba1054..beaf3bec 100644 --- a/Dashboard/Dashboard/Presentation/Elements/DropDownMenu.swift +++ b/Dashboard/Dashboard/Presentation/Elements/DropDownMenu.swift @@ -58,7 +58,8 @@ struct DropDownMenu: View { Text(option.text) .font(Theme.Fonts.titleSmall) .foregroundColor( - option == selectedOption ? Theme.Colors.white : Theme.Colors.textPrimary + option == selectedOption ? Theme.Colors.primaryButtonTextColor : + Theme.Colors.textPrimary ) Spacer() } diff --git a/Dashboard/Dashboard/Presentation/Elements/PrimaryCardView.swift b/Dashboard/Dashboard/Presentation/Elements/PrimaryCardView.swift index 27e2abfb..fc18526a 100644 --- a/Dashboard/Dashboard/Presentation/Elements/PrimaryCardView.swift +++ b/Dashboard/Dashboard/Presentation/Elements/PrimaryCardView.swift @@ -73,7 +73,7 @@ public struct PrimaryCardView: View { assignments } } - .background(Theme.Colors.background) + .background(Theme.Colors.courseCardBackground) .cornerRadius(8) .shadow(color: Theme.Colors.courseCardShadow, radius: 4, x: 0, y: 3) .padding(20) @@ -206,12 +206,12 @@ public struct PrimaryCardView: View { } .padding(.top, 8) .padding(.bottom, selected ? 10 : 0) - }.background(selected ? Theme.Colors.accentColor : .clear) + }.background(selected ? Theme.Colors.accentButtonColor : .clear) }) } private func foregroundColor(_ selected: Bool) -> SwiftUI.Color { - return selected ? Theme.Colors.primaryButtonTextColor : Theme.Colors.textPrimary + return selected ? Theme.Colors.white : Theme.Colors.textPrimary } private var courseBanner: some View { diff --git a/Dashboard/Dashboard/Presentation/Elements/ProgressLineView.swift b/Dashboard/Dashboard/Presentation/Elements/ProgressLineView.swift index 611ddbcb..80ef325a 100644 --- a/Dashboard/Dashboard/Presentation/Elements/ProgressLineView.swift +++ b/Dashboard/Dashboard/Presentation/Elements/ProgressLineView.swift @@ -30,7 +30,7 @@ struct ProgressLineView: View { Rectangle() .foregroundStyle(Theme.Colors.cardViewStroke) Rectangle() - .foregroundStyle(Theme.Colors.accentColor) + .foregroundStyle(Theme.Colors.accentButtonColor) .frame(width: geometry.size.width * progressValue) }.frame(height: height) } diff --git a/Discussion/Discussion/Presentation/Comments/Base/CommentCell.swift b/Discussion/Discussion/Presentation/Comments/Base/CommentCell.swift index ff11baed..7d8c8b15 100644 --- a/Discussion/Discussion/Presentation/Comments/Base/CommentCell.swift +++ b/Discussion/Discussion/Presentation/Comments/Base/CommentCell.swift @@ -118,13 +118,13 @@ public struct CommentCell: View { onLikeTap() }, label: { comment.voted - ? CoreAssets.voted.swiftUIImage - : CoreAssets.vote.swiftUIImage + ? (CoreAssets.voted.swiftUIImage.renderingMode(.template)) + : CoreAssets.vote.swiftUIImage.renderingMode(.template) Text("\(comment.votesCount)") Text(DiscussionLocalization.votesCount(comment.votesCount)) .font(Theme.Fonts.labelLarge) }).foregroundColor(comment.voted - ? Theme.Colors.accentColor + ? Theme.Colors.accentXColor : Theme.Colors.textSecondary) Spacer() diff --git a/Discussion/Discussion/Presentation/Comments/Base/ParentCommentView.swift b/Discussion/Discussion/Presentation/Comments/Base/ParentCommentView.swift index 23aae3d5..3594f26c 100644 --- a/Discussion/Discussion/Presentation/Comments/Base/ParentCommentView.swift +++ b/Discussion/Discussion/Presentation/Comments/Base/ParentCommentView.swift @@ -107,15 +107,15 @@ public struct ParentCommentView: View { onLikeTap() }, label: { comments.voted - ? CoreAssets.voted.swiftUIImage - : CoreAssets.vote.swiftUIImage + ? (CoreAssets.voted.swiftUIImage.renderingMode(.template)) + : (CoreAssets.vote.swiftUIImage.renderingMode(.template)) Text("\(comments.votesCount)") .foregroundColor(Theme.Colors.textPrimary) Text(DiscussionLocalization.votesCount(comments.votesCount)) .font(Theme.Fonts.labelLarge) .foregroundColor(Theme.Colors.textPrimary) }).foregroundColor(comments.voted - ? Theme.Colors.accentColor + ? Theme.Colors.accentXColor : Theme.Colors.textSecondaryLight) Spacer() Button(action: { diff --git a/Discussion/Discussion/Presentation/Comments/Thread/ThreadView.swift b/Discussion/Discussion/Presentation/Comments/Thread/ThreadView.swift index 84f2b681..b764ed0d 100644 --- a/Discussion/Discussion/Presentation/Comments/Thread/ThreadView.swift +++ b/Discussion/Discussion/Presentation/Comments/Thread/ThreadView.swift @@ -210,7 +210,7 @@ public struct ThreadView: View { Text(viewModel.alertMessage ?? "") .shadowCardStyle( bgColor: Theme.Colors.accentColor, - textColor: Theme.Colors.white + textColor: Theme.Colors.primaryButtonTextColor ) .padding(.top, 80) Spacer() diff --git a/Profile/Profile/Presentation/DatesAndCalendar/Elements/NewCalendarView.swift b/Profile/Profile/Presentation/DatesAndCalendar/Elements/NewCalendarView.swift index 64d9342a..264914c7 100644 --- a/Profile/Profile/Presentation/DatesAndCalendar/Elements/NewCalendarView.swift +++ b/Profile/Profile/Presentation/DatesAndCalendar/Elements/NewCalendarView.swift @@ -112,13 +112,14 @@ struct NewCalendarView: View { ) VStack(spacing: 16) { - StyledButton(ProfileLocalization.Calendar.cancel, - action: { - onCloseTapped() - }, - color: Theme.Colors.background, - textColor: Theme.Colors.accentColor, - borderColor: Theme.Colors.accentColor + StyledButton( + ProfileLocalization.Calendar.cancel, + action: { + onCloseTapped() + }, + color: Theme.Colors.background, + textColor: Theme.Colors.accentColor, + borderColor: Theme.Colors.accentColor ) StyledButton(ProfileLocalization.Calendar.beginSyncing) { diff --git a/Profile/Profile/Presentation/Profile/ProfileView.swift b/Profile/Profile/Presentation/Profile/ProfileView.swift index 5b2a04c7..37a23c6d 100644 --- a/Profile/Profile/Presentation/Profile/ProfileView.swift +++ b/Profile/Profile/Presentation/Profile/ProfileView.swift @@ -106,7 +106,7 @@ public struct ProfileView: View { } ) }, - color: .clear, + color: Theme.Colors.background, textColor: Theme.Colors.accentColor, borderColor: Theme.Colors.accentColor ).padding(.all, 24) diff --git a/Profile/Profile/Presentation/Settings/ManageAccountView.swift b/Profile/Profile/Presentation/Settings/ManageAccountView.swift index f4a38ab3..7f9475f7 100644 --- a/Profile/Profile/Presentation/Settings/ManageAccountView.swift +++ b/Profile/Profile/Presentation/Settings/ManageAccountView.swift @@ -182,7 +182,7 @@ public struct ManageAccountView: View { } ) }, - color: .clear, + color: Theme.Colors.background, textColor: Theme.Colors.accentColor, borderColor: Theme.Colors.accentColor ).padding(.horizontal, 24) diff --git a/Theme/Theme/Assets.xcassets/Colors/CourseCardBackground.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/CourseCardBackground.colorset/Contents.json new file mode 100644 index 00000000..8fef18d0 --- /dev/null +++ b/Theme/Theme/Assets.xcassets/Colors/CourseCardBackground.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "1.000", + "green" : "1.000", + "red" : "1.000" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.184", + "green" : "0.129", + "red" : "0.098" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Theme/Theme/Assets.xcassets/Colors/SecondaryButton/Contents.json b/Theme/Theme/Assets.xcassets/Colors/SecondaryButton/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/Theme/Theme/Assets.xcassets/Colors/SecondaryButton/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Theme/Theme/Assets.xcassets/Colors/SecondaryButton/SecondaryButtonBGColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/SecondaryButton/SecondaryButtonBGColor.colorset/Contents.json new file mode 100644 index 00000000..8fef18d0 --- /dev/null +++ b/Theme/Theme/Assets.xcassets/Colors/SecondaryButton/SecondaryButtonBGColor.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "1.000", + "green" : "1.000", + "red" : "1.000" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.184", + "green" : "0.129", + "red" : "0.098" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Theme/Theme/Assets.xcassets/Colors/SecondaryButtonBorderColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/SecondaryButton/SecondaryButtonBorderColor.colorset/Contents.json similarity index 100% rename from Theme/Theme/Assets.xcassets/Colors/SecondaryButtonBorderColor.colorset/Contents.json rename to Theme/Theme/Assets.xcassets/Colors/SecondaryButton/SecondaryButtonBorderColor.colorset/Contents.json diff --git a/Theme/Theme/Assets.xcassets/Colors/SecondaryButtonTextColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/SecondaryButton/SecondaryButtonTextColor.colorset/Contents.json similarity index 100% rename from Theme/Theme/Assets.xcassets/Colors/SecondaryButtonTextColor.colorset/Contents.json rename to Theme/Theme/Assets.xcassets/Colors/SecondaryButton/SecondaryButtonTextColor.colorset/Contents.json diff --git a/Theme/Theme/SwiftGen/ThemeAssets.swift b/Theme/Theme/SwiftGen/ThemeAssets.swift index 2daf3d16..5a9ed5fe 100644 --- a/Theme/Theme/SwiftGen/ThemeAssets.swift +++ b/Theme/Theme/SwiftGen/ThemeAssets.swift @@ -35,6 +35,7 @@ public enum ThemeAssets { public static let cardViewStroke = ColorAsset(name: "CardViewStroke") public static let certificateForeground = ColorAsset(name: "CertificateForeground") public static let commentCellBackground = ColorAsset(name: "CommentCellBackground") + public static let courseCardBackground = ColorAsset(name: "CourseCardBackground") public static let courseCardShadow = ColorAsset(name: "CourseCardShadow") public static let datesSectionBackground = ColorAsset(name: "DatesSectionBackground") public static let datesSectionStroke = ColorAsset(name: "DatesSectionStroke") @@ -54,6 +55,7 @@ public enum ThemeAssets { public static let progressDone = ColorAsset(name: "ProgressDone") public static let progressSkip = ColorAsset(name: "ProgressSkip") public static let selectedAndDone = ColorAsset(name: "SelectedAndDone") + public static let secondaryButtonBGColor = ColorAsset(name: "SecondaryButtonBGColor") public static let secondaryButtonBorderColor = ColorAsset(name: "SecondaryButtonBorderColor") public static let secondaryButtonTextColor = ColorAsset(name: "SecondaryButtonTextColor") public static let shadowColor = ColorAsset(name: "ShadowColor") diff --git a/Theme/Theme/Theme.swift b/Theme/Theme/Theme.swift index 73a4b493..50fa7587 100644 --- a/Theme/Theme/Theme.swift +++ b/Theme/Theme/Theme.swift @@ -57,6 +57,7 @@ public struct Theme { public private(set) static var navigationBarTintColor = ThemeAssets.navigationBarTintColor.swiftUIColor public private(set) static var secondaryButtonBorderColor = ThemeAssets.secondaryButtonBorderColor.swiftUIColor public private(set) static var secondaryButtonTextColor = ThemeAssets.secondaryButtonTextColor.swiftUIColor + public private(set) static var secondaryButtonBGColor = ThemeAssets.secondaryButtonBGColor.swiftUIColor public private(set) static var success = ThemeAssets.success.swiftUIColor public private(set) static var tabbarColor = ThemeAssets.tabbarColor.swiftUIColor public private(set) static var primaryButtonTextColor = ThemeAssets.primaryButtonTextColor.swiftUIColor @@ -71,6 +72,7 @@ public struct Theme { public private(set) static var primaryHeaderColor = ThemeAssets.primaryHeaderColor.swiftUIColor public private(set) static var secondaryHeaderColor = ThemeAssets.secondaryHeaderColor.swiftUIColor public private(set) static var courseCardShadow = ThemeAssets.courseCardShadow.swiftUIColor + public private(set) static var courseCardBackground = ThemeAssets.courseCardBackground.swiftUIColor public static func update( accentColor: Color = ThemeAssets.accentColor.swiftUIColor, diff --git a/WhatsNew/WhatsNew/Presentation/Elements/WhatsNewNavigationButton.swift b/WhatsNew/WhatsNew/Presentation/Elements/WhatsNewNavigationButton.swift index 640aa554..d439058b 100644 --- a/WhatsNew/WhatsNew/Presentation/Elements/WhatsNewNavigationButton.swift +++ b/WhatsNew/WhatsNew/Presentation/Elements/WhatsNewNavigationButton.swift @@ -50,7 +50,7 @@ struct WhatsNewNavigationButton: View { Theme.Shapes.buttonShape .fill( type == .previous - ? Theme.Colors.background + ? Theme.Colors.secondaryButtonBGColor : Theme.Colors.accentButtonColor ) )