[UI] Make printer controls action more visible

3DprintFIT · Jun 6, 2017 · ecf2d8d · ecf2d8d
1 parent 823980b
commit ecf2d8d
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/OctoPhone/View Related/Controls/ControlsView.swift b/OctoPhone/View Related/Controls/ControlsView.swift
@@ -132,26 +132,38 @@ class ControlsView: UIView {
 
     // MARK: Internal logic
 
-    private static func moveButton(icon: FontAwesomeIcon) -> UIButton {
+    private static func genericButton(icon: FontAwesomeIcon, normalColor: UIColor?,
+                                      tintColor: UIColor?) -> UIButton {
+
         let button = UIButton(type: .custom)
 
+        button.layer.cornerRadius = 30
+        button.layer.masksToBounds = true
+        button.backgroundColor = normalColor
+
         button.setIconImage(withIcon: icon, size: CGSize(width: 18, height: 18),
                             color: Colors.Pallete.greyHue4, forState: .normal)
 
+        button.reactive.controlEvents(.touchDown).observeValues { selectedButton in
+            selectedButton.backgroundColor = tintColor
+        }
+
+        button.reactive.controlEvents([.touchUpInside, .touchUpOutside]).observeValues { selectedButton in
+            selectedButton.backgroundColor = normalColor
+        }
+
         button.snp.makeConstraints { make in
             make.width.height.equalTo(60)
         }
 
         return button
     }
 
-    private static func homeButton() -> UIButton {
-        let button = moveButton(icon: .homeIcon)
-
-        button.layer.cornerRadius = 30
-        button.layer.masksToBounds = true
-        button.backgroundColor = .white
+    private static func moveButton(icon: FontAwesomeIcon) -> UIButton {
+        return genericButton(icon: icon, normalColor: nil, tintColor: .white)
+    }
 
-        return button
+    private static func homeButton() -> UIButton {
+        return genericButton(icon: .homeIcon, normalColor: .white, tintColor: Colors.Pallete.greyHue3)
     }
 }