Merge pull request #325 from uber/develop

Merge develop into main

Author: mohssenfathi

.github/workflows/xcodebuild.yml

@@ -1,6 +1,6 @@
 on:
   pull_request:
-    branches: [ master, 2.x ]
+    branches: [ main, develop ]
 
 jobs:
   build:

Sources/UberCore/Colors.swift

@@ -35,13 +35,13 @@ public extension UIColor {
 
     static let uberButtonHighlightedDarkBackground: UIColor = UIColor(
         named: "UberButtonHighlightedDarkBackground",
-        in: .module,
+        in: .resource(for: UberButton.self),
         compatibleWith: nil
     ) ?? UIColor.darkText
 
     static let uberButtonHighlightedLightBackground: UIColor = UIColor(
         named: "UberButtonHighlightedLightBackground",
-        in: .module,
+        in: .resource(for: UberButton.self),
         compatibleWith: nil
     ) ?? UIColor.darkText
 

Sources/UberRides/RideRequestButton.swift

@@ -302,7 +302,7 @@ public class RideRequestButton: UberButton {
     }
 
     private func image(name: String) -> UIImage? {
-        UIImage(named: name, in: Bundle.module, compatibleWith: nil)
+        UIImage(named: name, in: .resource(for: RideRequestButton.self), compatibleWith: nil)
     }
 }