Ready for Zach to add default avatar changes

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);

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 {
                     <b>We want you to be you</b> 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
+                    width: root.width > root.height ? 428 : 320
-                    height: 800
+                    height: root.width > root.height ? 800 : 598
-                    source: "images/DefaultAvatar_" + MyAvatar.skeletonModelURL.substring(123, MyAvatar.skeletonModelURL.length - 11) + ".png"
+                    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 <br></br>

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,9 +155,14 @@ 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
         }
     }
 

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;