diff --git a/interface/resources/icons/+android/myview-a.svg b/interface/resources/icons/+android/myview-a.svg index f8becb3850..e2c183caf2 100755 --- a/interface/resources/icons/+android/myview-a.svg +++ b/interface/resources/icons/+android/myview-a.svg @@ -3,17 +3,17 @@ - + - - - + + + diff --git a/interface/resources/images/fly.png b/interface/resources/images/fly.png index 02f72d5689..b8b96645f8 100644 Binary files a/interface/resources/images/fly.png and b/interface/resources/images/fly.png differ diff --git a/interface/resources/qml/hifi/+android/ActionBar.qml b/interface/resources/qml/hifi/+android/ActionBar.qml index 3bc4785e02..d487901d6f 100644 --- a/interface/resources/qml/hifi/+android/ActionBar.qml +++ b/interface/resources/qml/hifi/+android/ActionBar.qml @@ -40,8 +40,8 @@ Item { Component.onCompleted: { // put on bottom - x = 30; - y = 0; + x = 7; + y = 7; width = 300; height = 300; } diff --git a/interface/resources/qml/hifi/+android/AudioBar.qml b/interface/resources/qml/hifi/+android/AudioBar.qml index 0480d4ee4f..6cc17fccf7 100644 --- a/interface/resources/qml/hifi/+android/AudioBar.qml +++ b/interface/resources/qml/hifi/+android/AudioBar.qml @@ -38,13 +38,26 @@ Item { } } - Component.onCompleted: { - // put on bottom - x = parent.width-315; - y = 5; + function relocateAndResize(newWindowWidth, newWindowHeight) { + x = newWindowWidth-328; + y = 19; width = 300; height = 300; } + + function onWindowGeometryChanged(rect) { + relocateAndResize(rect.width, rect.height); + } + + Component.onCompleted: { + relocateAndResize(parent.width, parent.height); + Window.geometryChanged.connect(onWindowGeometryChanged); // In devices with bars appearing at startup we should listen for this + } + + Component.onDestruction: { + Window.geometryChanged.disconnect(onWindowGeometryChanged); + } + function addButton(properties) { var component = Qt.createComponent("button.qml"); diff --git a/interface/resources/qml/hifi/+android/button.qml b/interface/resources/qml/hifi/+android/button.qml index 3e9ce39351..a4c65b3c6f 100644 --- a/interface/resources/qml/hifi/+android/button.qml +++ b/interface/resources/qml/hifi/+android/button.qml @@ -32,6 +32,9 @@ Item { property string hoverTextColor: "#ffffff" property string activeTextColor: "#ffffff" property string activeHoverTextColor: "#ffffff" + property string fontFamily: "FiraSans" + property bool fontBold: false + property int bottomMargin: 30 property bool isEntered: false @@ -92,8 +95,8 @@ Item { id: text color: "#ffffff" text: button.text - font.family: "FiraSans" - //font.bold: true + font.family: button.fontFamily + font.bold: button.fontBold font.pixelSize: textSize anchors.bottom: parent.bottom anchors.bottomMargin: bottomMargin @@ -143,15 +146,12 @@ Item { PropertyChanges { target: buttonBg - //color: "#cfcfcf" - //opacity: 1 color: button.hoverBgColor opacity: button.hoverBgOpacity } PropertyChanges { target: text - //color: "#ffffff" color: button.hoverTextColor text: button.hoverText } @@ -166,15 +166,12 @@ Item { PropertyChanges { target: buttonBg - //color: "#1fc6a6" - //opacity: 1 color: button.activeBgColor opacity: button.activeBgOpacity } PropertyChanges { target: text - //color: "#333333" color: button.activeTextColor text: button.activeText } @@ -189,15 +186,12 @@ Item { PropertyChanges { target: buttonBg - //color: "#ff0000" - //opacity: 1 color: button.activeHoverBgColor opacity: button.activeHoverBgOpacity } PropertyChanges { target: text - //color: "#333333" color: button.activeHoverTextColor text: button.activeHoverText } @@ -212,15 +206,12 @@ Item { PropertyChanges { target: buttonBg - //color: "#9A9A9A" - //opacity: 0.1 color: button.bgColor opacity: button.bgOpacity } PropertyChanges { target: text - //color: "#ffffff" color: button.textColor text: button.text } diff --git a/interface/resources/qml/hifi/+android/modesbar.qml b/interface/resources/qml/hifi/+android/modesbar.qml index 7736c589a1..98973f1edb 100644 --- a/interface/resources/qml/hifi/+android/modesbar.qml +++ b/interface/resources/qml/hifi/+android/modesbar.qml @@ -10,12 +10,25 @@ import ".." Item { id: modesbar - y:20 + y:5 + + function relocateAndResize(newWindowWidth, newWindowHeight) { + width = 300; + height = 300; + x=newWindowWidth - 565; + } + + function onWindowGeometryChanged(rect) { + relocateAndResize(rect.width, rect.height); + } Component.onCompleted: { - width = 300; // That 30 is extra regardless the qty of items shown - height = 300; - x=parent.width - 555; + relocateAndResize(parent.width, parent.height); + Window.geometryChanged.connect(onWindowGeometryChanged); // In devices with bars appearing at startup we should listen for this + } + + Component.onDestruction: { + Window.geometryChanged.disconnect(onWindowGeometryChanged); } function addButton(properties) { diff --git a/libraries/ui/src/VirtualPadManager.cpp b/libraries/ui/src/VirtualPadManager.cpp index 1c76672827..dae19b52c2 100644 --- a/libraries/ui/src/VirtualPadManager.cpp +++ b/libraries/ui/src/VirtualPadManager.cpp @@ -40,8 +40,8 @@ namespace VirtualPad { const float Manager::STICK_RADIUS_PIXELS = 105.0f; const float Manager::JUMP_BTN_TRIMMED_RADIUS_PIXELS = 67.0f; const float Manager::JUMP_BTN_FULL_PIXELS = 164.0f; - const float Manager::JUMP_BTN_BOTTOM_MARGIN_PIXELS = 67.0f; - const float Manager::JUMP_BTN_RIGHT_MARGIN_PIXELS = 20.0f; + const float Manager::JUMP_BTN_BOTTOM_MARGIN_PIXELS = 80.0f; + const float Manager::JUMP_BTN_RIGHT_MARGIN_PIXELS = 13.0f; Manager::Manager() { diff --git a/scripts/system/+android/actionbar.js b/scripts/system/+android/actionbar.js index 9aed1e6cf9..7e1b27720e 100644 --- a/scripts/system/+android/actionbar.js +++ b/scripts/system/+android/actionbar.js @@ -30,8 +30,8 @@ function init() { activeIcon: "icons/+android/backward.svg", text: "", bgOpacity: 0.0, - activeBgOpacity: 0.0, - bgColor: "#FFFFFF" + hoverBgOpacity: 0.0, + activeBgOpacity: 0.0 }); backButton.clicked.connect(onBackPressed); diff --git a/scripts/system/+android/audio.js b/scripts/system/+android/audio.js index 955f74d63a..4d6d8db008 100644 --- a/scripts/system/+android/audio.js +++ b/scripts/system/+android/audio.js @@ -32,8 +32,9 @@ function init() { activeIcon: "icons/mic-mute-a.svg", text: "", bgOpacity: 0.0, - activeBgOpacity: 0.0, - bgColor: "#FFFFFF" + hoverBgOpacity: 0.0, + activeHoverBgOpacity: 0.0, + activeBgOpacity: 0.0 }); onMuteToggled(); diff --git a/scripts/system/+android/modes.js b/scripts/system/+android/modes.js index a7c1060ffb..3e855da115 100644 --- a/scripts/system/+android/modes.js +++ b/scripts/system/+android/modes.js @@ -49,8 +49,11 @@ function init() { activeHoverBgOpacity: 0.0, text: "MODE", height:240, - bottomMargin: 6, - textSize: 45 + bottomMargin: 16, + textSize: 38, + fontFamily: "Raleway", + fontBold: true + }); switchToMode(getCurrentModeSetting());