Fix alpha button override issues in configuration

mullvad · Oct 22, 2024 · cf1b66d · cf1b66d
1 parent 081f9ab
commit cf1b66d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/ios/MullvadVPN/Extensions/UIImage+Helpers.swift b/ios/MullvadVPN/Extensions/UIImage+Helpers.swift
@@ -26,4 +26,23 @@ extension UIImage {
 
         return resizedImage.withRenderingMode(renderingMode)
     }
+
+    func withAlpha(_ alpha: CGFloat) -> UIImage? {
+        UIGraphicsBeginImageContextWithOptions(self.size, false, self.scale)
+        guard let context = UIGraphicsGetCurrentContext(), let cgImage = self.cgImage else { return nil }
+
+        let rect = CGRect(origin: .zero, size: self.size)
+
+        context.scaleBy(x: 1.0, y: -1.0) // Flip vertically
+        context.translateBy(x: 0, y: -rect.size.height)
+
+        context.setBlendMode(.normal)
+        context.setAlpha(alpha) // Set the alpha
+        context.draw(cgImage, in: rect)
+
+        let newImage = UIGraphicsGetImageFromCurrentImageContext()
+        UIGraphicsEndImageContext()
+
+        return newImage
+    }
 }
diff --git a/ios/MullvadVPN/Views/AppButton.swift b/ios/MullvadVPN/Views/AppButton.swift
@@ -119,16 +119,23 @@ class AppButton: CustomButton {
                 return updatedAttributeContainer
             }
 
-        let configurationHandler: UIButton.ConfigurationUpdateHandler = { button in
-            button.alpha = !button.isEnabled ? 0.5 : 1.0
+        let configurationHandler: UIButton.ConfigurationUpdateHandler = { [weak self] button in
+            guard let self else { return }
             button.configuration?.baseForegroundColor = button.state.customButtonTitleColor
+            updateButtonBackground()
         }
         configuration = config
         configurationUpdateHandler = configurationHandler
     }
 
     /// Set background image based on current style.
     private func updateButtonBackground() {
-        configuration?.background.image = style.backgroundImage
+        if isEnabled {
+            // Load the normal image and set it as the background
+            configuration?.background.image = style.backgroundImage
+        } else {
+            // Adjust the image for the disabled state
+            configuration?.background.image = style.backgroundImage.withAlpha(0.5)
+        }
     }
 }
diff --git a/ios/MullvadVPN/Views/CustomButton.swift b/ios/MullvadVPN/Views/CustomButton.swift
@@ -14,7 +14,7 @@ extension UIControl.State {
         case .normal:
             return UIColor.AppButton.normalTitleColor
         case .disabled:
-            return UIColor.AppButton.disabledTitleColor
+            return UIColor.AppButton.disabledTitleColor.withAlphaComponent(0.5)
         case .highlighted:
             return UIColor.AppButton.highlightedTitleColor
         default: