Commit be425afc authored by Kateryna Kostiuk's avatar Kateryna Kostiuk Committed by Andreas Traczyk

UI: fix buttons appearance in image picker

This patch fixes two problems:
- when user select a picture for profile, cancel button is not visible.
- all other system provided buttons have default ring background color,
although they was designed to be transparent.

Change-Id: Ia182feaaf52c3aed69446d858ad9454b18e7bd8f
Reviewed-by: Andreas Traczyk's avatarAndreas Traczyk <andreas.traczyk@savoirfairelinux.com>
parent 59dd6dd2
...@@ -41,9 +41,6 @@ extension Chameleon { ...@@ -41,9 +41,6 @@ extension Chameleon {
UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self]).tintColor = UIColor.flatGray() UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self]).tintColor = UIColor.flatGray()
ButtonTransparentBackground.appearance().tintColor = secondaryColor
ButtonTransparentBackground.appearance().backgroundColor = UIColor.clear
MessageBubble.appearance().tintColor = secondaryContentColor MessageBubble.appearance().tintColor = secondaryContentColor
MessageBubble.appearance().backgroundColor = secondaryColor MessageBubble.appearance().backgroundColor = secondaryColor
...@@ -57,5 +54,11 @@ extension Chameleon { ...@@ -57,5 +54,11 @@ extension Chameleon {
MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellGenerated.self]).tintColor = UIColor.clear MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellGenerated.self]).tintColor = UIColor.clear
MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellGenerated.self]).backgroundColor = UIColor.clear MessageBubble.appearance(whenContainedInInstancesOf: [MessageCellGenerated.self]).backgroundColor = UIColor.clear
UIButton.appearance().backgroundColor = UIColor.clear
DesignableButton.appearance().backgroundColor = secondaryColor
ButtonTransparentBackground.appearance().tintColor = secondaryColor
ButtonTransparentBackground.appearance().backgroundColor = UIColor.clear
UIButton.appearance(whenContainedInInstancesOf: [UIView.self, UIImagePickerController.self]).tintColor = UIColor.white
} }
} }
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hEG-05-68q"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hEG-05-68q" customClass="DesignableButton" customModule="Ring" customModuleProvider="target">
<rect key="frame" x="10" y="210" width="60" height="30"/> <rect key="frame" x="10" y="210" width="60" height="30"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="30" id="6vg-8H-tbE"/> <constraint firstAttribute="height" constant="30" id="6vg-8H-tbE"/>
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tLd-d1-Onw"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tLd-d1-Onw" customClass="DesignableButton" customModule="Ring" customModuleProvider="target">
<rect key="frame" x="180" y="210" width="60" height="30"/> <rect key="frame" x="180" y="210" width="60" height="30"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="30" id="3tg-dw-XKp"/> <constraint firstAttribute="height" constant="30" id="3tg-dw-XKp"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment