From 272fc5000bfe6e15a0f0ea669ef3088c7d163ce7 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Mon, 13 Jun 2022 08:38:28 +0100 Subject: [PATCH] Use .element.accent instead of elementGreen colour asset. (#79) Remove local copy of Element Green --- ElementX.xcodeproj/project.pbxproj | 4 +- .../ElementGreen.colorset/Contents.json | 38 ------------------ .../Contents.json | 19 +++------ .../send_message_icon.png | Bin 960 -> 0 bytes .../send_message_icon@2x.png | Bin 1745 -> 0 bytes .../send_message_icon@3x.png | Bin 2561 -> 0 bytes .../timelineComposerSendMessage.svg | 5 +++ ElementX/Sources/AppCoordinator.swift | 1 + ElementX/Sources/Generated/Assets.swift | 1 - .../SwiftUI/Views/ElementToggleStyle.swift | 2 +- .../RoomScreen/View/MessageComposer.swift | 4 ++ .../View/MessageComposerTextField.swift | 2 +- .../Timeline/EventBasedTimelineView.swift | 2 +- .../View/Timeline/FormattedBodyText.swift | 2 +- .../Timeline/PlaceholderAvatarImage.swift | 2 +- .../Screens/Splash/SplashViewController.xib | 1 - changelog.d/43.change | 2 +- project.yml | 1 - 18 files changed, 23 insertions(+), 63 deletions(-) delete mode 100644 ElementX/Resources/Assets.xcassets/Colors/ElementGreen.colorset/Contents.json delete mode 100644 ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/send_message_icon.png delete mode 100644 ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/send_message_icon@2x.png delete mode 100644 ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/send_message_icon@3x.png create mode 100644 ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/timelineComposerSendMessage.svg diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 4adc63833..e0375169d 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -2009,7 +2009,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = Colors/ElementGreen; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -2069,7 +2068,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = Colors/ElementGreen; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; diff --git a/ElementX/Resources/Assets.xcassets/Colors/ElementGreen.colorset/Contents.json b/ElementX/Resources/Assets.xcassets/Colors/ElementGreen.colorset/Contents.json deleted file mode 100644 index 67097973b..000000000 --- a/ElementX/Resources/Assets.xcassets/Colors/ElementGreen.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "139", - "green" : "189", - "red" : "13" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "139", - "green" : "198", - "red" : "13" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/Contents.json index 533ee1b36..538eaa5da 100644 --- a/ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/Contents.json +++ b/ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/Contents.json @@ -1,23 +1,16 @@ { "images" : [ { - "filename" : "send_message_icon.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "send_message_icon@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "send_message_icon@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "timelineComposerSendMessage.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "template" } } diff --git a/ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/send_message_icon.png b/ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/send_message_icon.png deleted file mode 100644 index 02dc65a0bce2d4973ab9ed04eedfa025fd951e1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 960 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 diff --git a/ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/send_message_icon@3x.png b/ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/send_message_icon@3x.png deleted file mode 100644 index 4e3719595a010183f8d343d3165f2456fb2fee02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2561 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 X{+Ezuej0eF00000NkvXXu0mjfRp+Kt diff --git a/ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/timelineComposerSendMessage.svg b/ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/timelineComposerSendMessage.svg new file mode 100644 index 000000000..a9d140d06 --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/Images/timelineComposerSendMessage.imageset/timelineComposerSendMessage.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/ElementX/Sources/AppCoordinator.swift b/ElementX/Sources/AppCoordinator.swift index 3c5483074..0851e1ab7 100644 --- a/ElementX/Sources/AppCoordinator.swift +++ b/ElementX/Sources/AppCoordinator.swift @@ -49,6 +49,7 @@ class AppCoordinator: AuthenticationCoordinatorDelegate, Coordinator { mainNavigationController = UINavigationController(rootViewController: splashViewController) window = UIWindow(frame: UIScreen.main.bounds) window.rootViewController = mainNavigationController + window.tintColor = .element.accent navigationRouter = NavigationRouter(navigationController: mainNavigationController) diff --git a/ElementX/Sources/Generated/Assets.swift b/ElementX/Sources/Generated/Assets.swift index de517a621..2958ff274 100644 --- a/ElementX/Sources/Generated/Assets.swift +++ b/ElementX/Sources/Generated/Assets.swift @@ -23,7 +23,6 @@ internal typealias AssetImageTypeAlias = ImageAsset.Image internal enum Asset { internal enum Colors { internal static let codeBlockBackground = ColorAsset(name: "Colors/CodeBlockBackground") - internal static let elementGreen = ColorAsset(name: "Colors/ElementGreen") } internal enum Images { internal static let appLogo = ImageAsset(name: "Images/app-logo") diff --git a/ElementX/Sources/Other/SwiftUI/Views/ElementToggleStyle.swift b/ElementX/Sources/Other/SwiftUI/Views/ElementToggleStyle.swift index ce2acd1ed..200a61726 100644 --- a/ElementX/Sources/Other/SwiftUI/Views/ElementToggleStyle.swift +++ b/ElementX/Sources/Other/SwiftUI/Views/ElementToggleStyle.swift @@ -16,7 +16,7 @@ struct ElementToggleStyle: ToggleStyle { Image(systemName: configuration.isOn ? "checkmark.square.fill" : "square") .font(.title3.weight(.regular)) .imageScale(.large) - .foregroundColor(Color(uiColor: Asset.Colors.elementGreen.color)) + .foregroundColor(.element.accent) } .buttonStyle(.plain) } diff --git a/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift b/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift index e5c3bd332..0d487e925 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift @@ -21,6 +21,10 @@ struct MessageComposer: View { action() } label: { Image(uiImage: Asset.Images.timelineComposerSendMessage.image) + .background(Circle() + .foregroundColor(.element.globalWhite) + .padding(2) + ) } .padding(.bottom, 6.0) .disabled(disabled) diff --git a/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift b/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift index e761918f8..f525c42d4 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift @@ -32,7 +32,7 @@ struct MessageComposerTextField: View { } private var borderColor: Color { - Color(uiColor: Asset.Colors.elementGreen.color) + .element.accent } private var borderWidth: CGFloat { diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EventBasedTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EventBasedTimelineView.swift index f95a3d933..4a8e6ef68 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EventBasedTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EventBasedTimelineView.swift @@ -31,7 +31,7 @@ struct EventBasedTimelineView: View { Image(uiImage: avatar) .resizable() .scaledToFill() - .overlay(Circle().stroke(Color(uiColor: Asset.Colors.elementGreen.color))) + .overlay(Circle().stroke(Color.element.accent)) } else { PlaceholderAvatarImage(firstCharacter: String(firstLetter)) } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift index ce8676b96..13aaba784 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift @@ -29,7 +29,7 @@ struct FormattedBodyText: View { } } } - .tint(Color(uiColor: Asset.Colors.elementGreen.color)) + .tint(.element.accent) } } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/PlaceholderAvatarImage.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/PlaceholderAvatarImage.swift index 09737d5c2..508a16481 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/PlaceholderAvatarImage.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/PlaceholderAvatarImage.swift @@ -22,7 +22,7 @@ struct PlaceholderAvatarImage: View { var body: some View { ZStack { - Color(.sRGB, red: 0.05, green: 0.74, blue: 0.55, opacity: 1.0) + Color.element.accent Text(firstCharacter) .padding(4) .foregroundColor(.white) diff --git a/ElementX/Sources/Screens/Splash/SplashViewController.xib b/ElementX/Sources/Screens/Splash/SplashViewController.xib index 33d458e55..ae27f9387 100644 --- a/ElementX/Sources/Screens/Splash/SplashViewController.xib +++ b/ElementX/Sources/Screens/Splash/SplashViewController.xib @@ -20,7 +20,6 @@ - diff --git a/changelog.d/43.change b/changelog.d/43.change index 65e2931e4..04f62c8eb 100644 --- a/changelog.d/43.change +++ b/changelog.d/43.change @@ -1 +1 @@ -DesignKit: Add DesignKit to the ElementX project and style the login screen with it. +DesignKit: Add DesignKit to the ElementX project, style the login screen with it and tint the whole app. diff --git a/project.yml b/project.yml index 29a3279cf..ec131bc64 100644 --- a/project.yml +++ b/project.yml @@ -20,7 +20,6 @@ options: settings: CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED: YES - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME: "Colors/ElementGreen" ENABLE_BITCODE: NO