[ADD] titleColor, titleShadowColor, backgroundImage to Button.State

Author: kostassite

Sources/Models/Views/Controls/Button.swift

@@ -50,17 +50,23 @@ public struct Button: IBDecodable, ControlProtocol, IBIdentifiable {
     public struct State: IBDecodable, IBKeyable {
         public let key: String?
         public let title: String?
-        public let color: Color?
+        public let titleColor: Color?
+        public let titleShadowColor: Color?
         public let image: String?
+        public let backgroundImage: String?
         public let catalog: String?
 
         static func decode(_ xml: XMLIndexerType) throws -> Button.State {
             let container = xml.container(keys: CodingKeys.self)
+            let colorsContainer = xml.container(keys: ExternalCodingKeys.self)
+                .nestedContainerIfPresent(of: .color, keys: ColorsCodingKeys.self)
             return State.init(
                 key: try container.attribute(of: .key),
                 title: container.attributeIfPresent(of: .title),
-                color: container.elementIfPresent(of: .color),
+                titleColor: colorsContainer?.withAttributeElement(.key, CodingKeys.titleColor.stringValue),
+                titleShadowColor: colorsContainer?.withAttributeElement(.key, CodingKeys.titleShadowColor.stringValue),
                 image: container.attributeIfPresent(of: .image),
+                backgroundImage: container.attributeIfPresent(of: .backgroundImage),
                 catalog: container.attributeIfPresent(of: .catalog)
             )
         }

Tests/IBDecodableTests/Tests.swift

@@ -452,6 +452,41 @@ class Tests: XCTestCase {
         }
     }
 
+    func testButtonStates() {
+        let url = self.url(forResource: "Button", withExtension: "xib")
+        
+        do {
+            let file = try XibFile(url: url)
+
+            let rootView = file.document.views?.first?.view
+            XCTAssertNotNil(rootView, "There should be a root view")
+
+            let button = rootView as? Button
+            XCTAssertNotNil(button, "There should be a button")
+            XCTAssertEqual(button?.elementClass, "UIButton")
+
+            let states = button?.state
+            XCTAssertEqual(states?.count, 2, "Should find 2 states")
+            
+            let normalState = states?.first(where: {$0.key == "normal"})
+            XCTAssertEqual(normalState?.title, "Normal title")
+            XCTAssertNil(normalState?.image)
+            XCTAssertNil(normalState?.backgroundImage)
+            XCTAssertNotNil(normalState?.titleColor)
+            XCTAssertNotNil(normalState?.titleShadowColor)
+            
+            let selectedState = states?.first(where: {$0.key == "selected"})
+            XCTAssertEqual(selectedState?.title, "selected text")
+            XCTAssertEqual(selectedState?.image, "testImage.png")
+            XCTAssertEqual(selectedState?.backgroundImage, "backImage.png")
+            XCTAssertNil(selectedState?.titleColor)
+            XCTAssertNil(selectedState?.titleShadowColor)
+            
+        } catch {
+            XCTFail("\(error)  \(url)")
+        }
+    }
+    
     func testActivityIndicatorView() {
         let url = self.url(forResource: "ViewWithActivityIndicatorView", withExtension: "xib")
         do {

Tests/Resources/Button.xib

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="NLs-WP-EeK">
+            <rect key="frame" x="0.0" y="0.0" width="93" height="34"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <fontDescription key="fontDescription" type="system" pointSize="19"/>
+            <state key="normal" title="Normal title">
+                <color key="titleColor" red="0.70451136999999997" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                <color key="titleShadowColor" red="0.70451136999999997" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+            </state>
+            <state key="selected" title="selected text" image="testImage.png" backgroundImage="backImage.png"/>
+            <point key="canvasLocation" x="-154" y="-3"/>
+        </button>
+    </objects>
+    <resources>
+        <image name="backImage.png" width="128" height="128"/>
+        <image name="square.and.arrow.down" catalog="system" width="121" height="128"/>
+        <image name="square.and.arrow.up" catalog="system" width="115" height="128"/>
+        <image name="testImage.png" width="128" height="128"/>
+    </resources>
+</document>