diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/images/DefaultAvatar_Blue.png b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Blue.png similarity index 100% rename from scripts/simplifiedUI/ui/simplifiedFTUE/images/DefaultAvatar_Blue.png rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Blue.png diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/images/DefaultAvatar_Cyan.png b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Cyan.png similarity index 100% rename from scripts/simplifiedUI/ui/simplifiedFTUE/images/DefaultAvatar_Cyan.png rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Cyan.png diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/images/DefaultAvatar_Green.png b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Green.png similarity index 100% rename from scripts/simplifiedUI/ui/simplifiedFTUE/images/DefaultAvatar_Green.png rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Green.png diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/images/DefaultAvatar_Magenta.png b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Magenta.png similarity index 100% rename from scripts/simplifiedUI/ui/simplifiedFTUE/images/DefaultAvatar_Magenta.png rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Magenta.png diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/images/DefaultAvatar_Red.png b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Red.png similarity index 100% rename from scripts/simplifiedUI/ui/simplifiedFTUE/images/DefaultAvatar_Red.png rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Red.png diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/images/DefaultAvatar_Yellow.png b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Yellow.png similarity index 100% rename from scripts/simplifiedUI/ui/simplifiedFTUE/images/DefaultAvatar_Yellow.png rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Yellow.png diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/images/hero.png b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/hero.png similarity index 100% rename from scripts/simplifiedUI/ui/simplifiedFTUE/images/hero.png rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/hero.png diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/images/qrCode.jpg b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/qrCode.jpg similarity index 100% rename from scripts/simplifiedUI/ui/simplifiedFTUE/images/qrCode.jpg rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/qrCode.jpg diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml index d8d0a45d48..6747608de9 100644 --- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml +++ b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml @@ -129,6 +129,10 @@ Rectangle { // If we have never auto-selected and the user is still using a default avatar or if the current avatar is not valid (fst), or if // the current avatar is the old default (Woody), use top avatar from inventory or one of the new defaults. + + // FOR TESTING__________REMOVE + userHasValidAvatarInInventory = false; + if (!currentAvatarIsValid || userHasOldDefaultAvatar || (!avatarHasBeenAutoSelectedBefore && userIsWearingDefaultAvatar)) { if (userHasValidAvatarInInventory) { MyAvatar.useFullAvatarURL(topBarInventoryModel.get(0).download_url); diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml b/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml index 4c3583b947..935ad83997 100644 --- a/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml +++ b/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml @@ -56,13 +56,19 @@ Rectangle { id: tempAvatarPageContainer visible: true + SimplifiedControls.VerticalScrollBar { + parent: tempAvatarPageContainer + } + GridLayout { id: tempAvatarPageGrid anchors.fill: parent anchors.leftMargin: 180 anchors.topMargin: 50 anchors.rightMargin: 100 - columns: 2 + columns: root.width > root.height ? 2 : 1 + rows: root.width > root.height ? 1 : 2 + flow: root.width > root.height ? GridLayout.LeftToRight : GridLayout.TopToBottom Item { id: textAndQRContainer @@ -75,7 +81,7 @@ Rectangle { HifiStylesUit.RalewayBold { id: headerText text: "We know this isn't you..." - color: simplifiedUI.colors.darkGray + color: simplifiedUI.colors.text.darkGray size: 48 wrapMode: Text.WordWrap anchors.left: parent.left @@ -93,7 +99,7 @@ Rectangle { We want you to be you so we've built an Avatar Creator App that's as easy as taking a selfie and picking your outfits! Available now on iOS and Android Platforms." - color: simplifiedUI.colors.darkGray + color: simplifiedUI.colors.text.darkGray size: 22 anchors.left: parent.left anchors.right: parent.right @@ -111,7 +117,7 @@ Rectangle { Image { id: avatarAppQRCodeImage - source: "images/qrCode.jpg" + source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/qrCode.jpg" height: 190 width: 190 } @@ -122,10 +128,9 @@ Rectangle { anchors.top: avatarAppQRCodeImage.top anchors.bottom: avatarAppQRCodeImage.bottom anchors.right: parent.right - anchors.verticalCenter: avatarAppQRCodeImage.verticalCenter anchors.leftMargin: 30 text: "Use your mobile phone to scan this QR code." - color: simplifiedUI.colors.darkGray + color: simplifiedUI.colors.text.darkGray size: 22 wrapMode: Text.WordWrap } @@ -151,6 +156,7 @@ Rectangle { onClicked: { Tablet.playSound(TabletEnums.ButtonClick); + print("_____________________________________", bottomRightAccentImage.source); tempAvatarPageContainer.visible = false; controlsContainer.visible = true; } @@ -166,10 +172,12 @@ Rectangle { Image { id: tempAvatarImage - width: 428 - height: 800 - source: "images/DefaultAvatar_" + MyAvatar.skeletonModelURL.substring(123, MyAvatar.skeletonModelURL.length - 11) + ".png" + width: root.width > root.height ? 428 : 320 + height: root.width > root.height ? 800 : 598 + source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_" + + MyAvatar.skeletonModelURL.substring(123, MyAvatar.skeletonModelURL.length - 11) + ".png" } + // TODO move this to be above the rest of the grid layout stuff in landscape mode } } } @@ -179,6 +187,10 @@ Rectangle { visible: false anchors.fill: parent + SimplifiedControls.VerticalScrollBar { + parent: tempAvatarPageContainer + } + HifiStylesUit.RalewayRegular { id: controlsDescriptionText text: "These are your avatar controls to

diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/SecondLaunchWindow.qml b/scripts/simplifiedUI/ui/simplifiedFTUE/SecondLaunchWindow.qml index 8aaff38eb9..702bfaa92a 100644 --- a/scripts/simplifiedUI/ui/simplifiedFTUE/SecondLaunchWindow.qml +++ b/scripts/simplifiedUI/ui/simplifiedFTUE/SecondLaunchWindow.qml @@ -99,7 +99,7 @@ Rectangle { Image { id: avatarAppQRCodeImage anchors.horizontalCenter: instructionText.horizontalCenter - source: "images/qrCode.jpg" + source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/qrCode.jpg" height: 220 width: 220 } @@ -155,10 +155,15 @@ Rectangle { id: heroImage width: 428 height: 800 - source: "images/hero.png" + source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/hero.png" } + // TODO move this to be above the rest of the grid layout stuff in landscape mode } } + + SimplifiedControls.VerticalScrollBar { + parent: root + } } signal sendToScript(var message); diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 159f6778cd..c1a76f5b3e 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -358,6 +358,7 @@ function setOutputMuted(outputMuted) { } } +var TOP_BAR_HEIGHT_PX = 48; var INITIAL_LAUNCH_QML_PATH = Script.resolvePath("./simplifiedFTUE/InitialLaunchWindow.qml"); var INITIAL_LAUNCH_WINDOW_TITLE = "Initial Launch"; var INITIAL_LAUNCH_PRESENTATION_MODE = Desktop.PresentationMode.NATIVE;