chore: remove secondary and rename elevated color

Mastodon/Generated/Assets.swift

@@ -41,14 +41,13 @@ internal enum Asset {
       internal static let alertYellow = ColorAsset(name: "Colors/Background/alert.yellow")
       internal static let dangerBorder = ColorAsset(name: "Colors/Background/danger.border")
       internal static let danger = ColorAsset(name: "Colors/Background/danger")
-      internal static let elevatedPrimary = ColorAsset(name: "Colors/Background/elevatedPrimary")
       internal static let mediaTypeIndicotor = ColorAsset(name: "Colors/Background/media.type.indicotor")
       internal static let navigationBar = ColorAsset(name: "Colors/Background/navigationBar")
       internal static let onboardingBackground = ColorAsset(name: "Colors/Background/onboarding.background")
-      internal static let secondary = ColorAsset(name: "Colors/Background/secondary")
       internal static let secondaryGroupedSystemBackground = ColorAsset(name: "Colors/Background/secondary.grouped.system.background")
       internal static let secondarySystemBackground = ColorAsset(name: "Colors/Background/secondary.system.background")
       internal static let systemBackground = ColorAsset(name: "Colors/Background/system.background")
+      internal static let systemElevatedBackground = ColorAsset(name: "Colors/Background/system.elevated.background")
       internal static let systemGroupedBackground = ColorAsset(name: "Colors/Background/system.grouped.background")
       internal static let tertiarySystemBackground = ColorAsset(name: "Colors/Background/tertiary.system.background")
       internal static let tertiarySystemGroupedBackground = ColorAsset(name: "Colors/Background/tertiary.system.grouped.background")

Mastodon/Resources/Assets.xcassets/Colors/Background/secondary.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "254",
-          "green" : "255",
-          "red" : "254"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "46",
-          "green" : "44",
-          "red" : "44"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Mastodon/Resources/Assets.xcassets/Colors/Background/secondary.grouped.system.background.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xFE",
+          "blue" : "254",
-          "green" : "0xFF",
+          "green" : "255",
-          "red" : "0xFE"
+          "red" : "254"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x2E",
+          "blue" : "46",
-          "green" : "0x2C",
+          "green" : "44",
-          "red" : "0x2C"
+          "red" : "44"
         }
       },
       "idiom" : "universal"

Mastodon/Resources/Assets.xcassets/Colors/Background/secondary.system.background.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xE8",
+          "blue" : "232",
-          "green" : "0xE1",
+          "green" : "225",
-          "red" : "0xD9"
+          "red" : "217"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x2E",
+          "blue" : "46",
-          "green" : "0x2C",
+          "green" : "44",
-          "red" : "0x2C"
+          "red" : "44"
         }
       },
       "idiom" : "universal"

Mastodon/Resources/Assets.xcassets/Colors/Background/system.elevated.background.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "30",
+          "blue" : "0x1E",
-          "green" : "28",
+          "green" : "0x1C",
-          "red" : "28"
+          "red" : "0x1C"
         }
       },
       "idiom" : "universal"

Mastodon/Scene/Report/ReportFooterView.swift

@@ -53,7 +53,7 @@ final class ReportFooterView: UIView {
     override init(frame: CGRect) {
         super.init(frame: frame)
         
-        self.backgroundColor = Asset.Colors.Background.elevatedPrimary.color
+        self.backgroundColor = Asset.Colors.Background.systemElevatedBackground.color
         
         stackview.addArrangedSubview(nextStepButton)
         stackview.addArrangedSubview(skipButton)

Mastodon/Scene/Report/ReportHeaderView.swift

@@ -63,7 +63,7 @@ final class ReportHeaderView: UIView {
     override init(frame: CGRect) {
         super.init(frame: frame)
         
-        self.backgroundColor = Asset.Colors.Background.elevatedPrimary.color
+        self.backgroundColor = Asset.Colors.Background.systemElevatedBackground.color
         stackview.addArrangedSubview(titleLabel)
         stackview.addArrangedSubview(contentLabel)
         addSubview(stackview)

Mastodon/Scene/Report/ReportViewController.swift

@@ -46,7 +46,7 @@ class ReportViewController: UIViewController, NeedsDependency {
         let view = UIView()
         view.translatesAutoresizingMaskIntoConstraints = false
         view.setContentHuggingPriority(.defaultLow, for: .vertical)
-        view.backgroundColor = Asset.Colors.Background.elevatedPrimary.color
+        view.backgroundColor = Asset.Colors.Background.systemElevatedBackground.color
         return view
     }()