From 43d967329cdd903e01cb6261ccaedf05df57b940 Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Mon, 14 Jan 2019 10:13:12 -0700
Subject: [PATCH] Change Avatar App design for avatar collisions

---
 .../resources/qml/hifi/avatarapp/Settings.qml | 94 +++++++++++++++----
 1 file changed, 75 insertions(+), 19 deletions(-)

diff --git a/interface/resources/qml/hifi/avatarapp/Settings.qml b/interface/resources/qml/hifi/avatarapp/Settings.qml
index d212186c5e..0dd8315c1a 100644
--- a/interface/resources/qml/hifi/avatarapp/Settings.qml
+++ b/interface/resources/qml/hifi/avatarapp/Settings.qml
@@ -35,8 +35,8 @@ Rectangle {
 
     property real scaleValue: scaleSlider.value / 10
     property alias dominantHandIsLeft: leftHandRadioButton.checked
-    property alias otherAvatarsCollisionsOn: otherAvatarsCollisionsEnabledCheckBox.checked
-    property alias environmentCollisionsOn: environmentCollisionsEnabledCheckBox.checked
+    property alias otherAvatarsCollisionsOn: otherAvatarsCollisionsEnabledRadiobutton.checked
+    property alias environmentCollisionsOn: environmentCollisionsEnabledRadiobutton.checked
     property alias avatarAnimationOverrideJSON: avatarAnimationUrlInputText.text
     property alias avatarAnimationJSON: avatarAnimationUrlInputText.placeholderText
     property alias avatarCollisionSoundUrl: avatarCollisionSoundUrlInputText.text
@@ -56,10 +56,10 @@ Rectangle {
             rightHandRadioButton.checked = true;
         }
         if (settings.otherAvatarsCollisionsEnabled) {
-            otherAvatarsCollisionsEnabledCheckBox.checked = true;
+            otherAvatarsCollisionsEnabledRadiobutton.checked = true;
         }
         if (settings.collisionsEnabled) {
-            environmentCollisionsEnabledCheckBox.checked = true;
+            environmentCollisionsEnabledRadiobutton.checked = true;
         }
 
         avatarAnimationJSON = settings.animGraphUrl;
@@ -229,7 +229,7 @@ Rectangle {
 
                 Layout.row: 0
                 Layout.column: 1
-                Layout.leftMargin: -40
+                Layout.leftMargin: -20
 
                 ButtonGroup.group: leftRight
                 checked: true
@@ -245,8 +245,8 @@ Rectangle {
                 id: rightHandRadioButton
 
                 Layout.row: 0
-                Layout.column: 2
-                Layout.rightMargin: 20
+                Layout.column: 3
+                Layout.rightMargin: -15
 
                 ButtonGroup.group: leftRight
 
@@ -266,16 +266,44 @@ Rectangle {
                 size: 17;
                 Layout.row: 1
                 Layout.column: 0
-                text: "Avatar collides with other avatars"
+                text: "Avatar to avatar collision"
+            }
+            
+            ButtonGroup {
+                id: otherAvatarsOnOff
+            }
+            
+            HifiControlsUit.RadioButton {
+                id: otherAvatarsCollisionsEnabledRadiobutton
+
+                Layout.row: 1
+                Layout.column: 1
+                Layout.leftMargin: -20
+
+                ButtonGroup.group: otherAvatarsOnOff
+                checked: true
+
+                colorScheme: hifi.colorSchemes.light
+                fontSize: 17
+                letterSpacing: 1.4
+                text: "On"
+                boxSize: 20
             }
 
-            HifiControlsUit.CheckBox {
-                id: otherAvatarsCollisionsEnabledCheckBox;
-                boxSize: 20;
+            HifiControlsUit.RadioButton {
+                id: otherAvatarsCollisionsDisabledRadiobutton
+
                 Layout.row: 1
-                Layout.column: 2
-                Layout.leftMargin: 60
+                Layout.column: 3
+                Layout.rightMargin: -15
+
+                ButtonGroup.group: otherAvatarsOnOff
+
                 colorScheme: hifi.colorSchemes.light
+                fontSize: 17
+                letterSpacing: 1.4
+                text: "Off"
+                boxSize: 20
             }
 
             // TextStyle9
@@ -283,16 +311,44 @@ Rectangle {
                 size: 17;
                 Layout.row: 2
                 Layout.column: 0
-                text: "Avatar collides with environment"
+                text: "Avatar to environment collision"
             }
 
-            HifiControlsUit.CheckBox {
-                id: environmentCollisionsEnabledCheckBox;
-                boxSize: 20;
+            ButtonGroup {
+                id: worldOnOff
+            }
+            
+            HifiControlsUit.RadioButton {
+                id: environmentCollisionsEnabledRadiobutton
+
                 Layout.row: 2
-                Layout.column: 2
-                Layout.leftMargin: 60
+                Layout.column: 1
+                Layout.leftMargin: -20
+
+                ButtonGroup.group: worldOnOff
+                checked: true
+
                 colorScheme: hifi.colorSchemes.light
+                fontSize: 17
+                letterSpacing: 1.4
+                text: "On"
+                boxSize: 20
+            }
+
+            HifiControlsUit.RadioButton {
+                id: environmentCollisionsDisabledRadiobutton
+
+                Layout.row: 2
+                Layout.column: 3
+                Layout.rightMargin: -15
+
+                ButtonGroup.group: worldOnOff
+
+                colorScheme: hifi.colorSchemes.light
+                fontSize: 17
+                letterSpacing: 1.4
+                text: "Off"
+                boxSize: 20
             }
         }