Use .element.accent instead of elementGreen colour asset. (#79)

Remove local copy of Element Green
2026-11-02 12:07:55 +00:00 · 2022-06-13 08:38:28 +01:00
parent c96ee095d0
commit 272fc5000b
18 changed files with 23 additions and 63 deletions
@@ -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)
        
@@ -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")
@@ -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)
    }
@@ -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)
@@ -32,7 +32,7 @@ struct MessageComposerTextField: View {
    }
    
    private var borderColor: Color {
-        Color(uiColor: Asset.Colors.elementGreen.color)
+        .element.accent
    }
    
    private var borderWidth: CGFloat {
@@ -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))
            }
@@ -29,7 +29,7 @@ struct FormattedBodyText: View {
                }
            }
        }
-        .tint(Color(uiColor: Asset.Colors.elementGreen.color))
+        .tint(.element.accent)
    }
 }

@@ -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)
@@ -20,7 +20,6 @@
            <subviews>
                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Images/app-logo" translatesAutoresizingMaskIntoConstraints="NO" id="ue7-fB-5XS">
                    <rect key="frame" x="87" y="328" width="240" height="240"/>
-                    <color key="tintColor" red="0.050980392156862744" green="0.74117647058823533" blue="0.54509803921568623" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                </imageView>
            </subviews>
            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>