Merge pull request #12007 from zfox23/commerce_moreSecurityImages

Commerce: More security images!

interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml

@@ -25,10 +25,6 @@ Item {
 
     id: root;
 
-    SecurityImageModel {
-        id: securityImageModel;
-    }
-
     // Username Text
     RalewayRegular {
         id: usernameText;

interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml

@@ -26,10 +26,6 @@ Item {
     id: root;
     property bool justSubmitted: false;
 
-    SecurityImageModel {
-        id: securityImageModel;
-    }
-
     Hifi.QmlCommerce {
         id: commerce;
         
@@ -213,4 +209,8 @@ Item {
         securityImageSubmitButton.enabled = true;
         securityImageSubmitButton.text = "Submit";
     }
+
+    function initModel() {
+        securityImageSelection.initModel();
+    }
 }

interface/resources/qml/hifi/commerce/wallet/SecurityImageModel.qml

@@ -15,29 +15,28 @@ import QtQuick 2.5
 
 ListModel {
     id: root;
-    ListElement{
+
-        sourcePath: "images/01.jpg"
+    function initModel() {
-        securityImageEnumValue: 1;
+        var array = [];
+        while (array.length < 6) {
+            // We currently have 34 security images to choose from
+            var randomNumber = Math.floor(Math.random() * 34) + 1;
+            if (array.indexOf(randomNumber) > -1) {
+                continue;
+            }
+            array[array.length] = randomNumber;
+        }
+
+        var modelElement;
+
+        for (var i = 0; i < 6; i++) {
+            modelElement = { "sourcePath":"images/" + addLeadingZero(array[i]) + ".jpg", "securityImageEnumValue": (i + 1) }
+            root.insert(i, modelElement);
+        }
     }
-    ListElement{
+
-        sourcePath: "images/02.jpg"
+    function addLeadingZero(n) {
-        securityImageEnumValue: 2;
+        return n < 10 ? '0' + n : '' + n;
-    }
-    ListElement{
-        sourcePath: "images/03.jpg"
-        securityImageEnumValue: 3;
-    }
-    ListElement{
-        sourcePath: "images/04.jpg"
-        securityImageEnumValue: 4;
-    }
-    ListElement{
-        sourcePath: "images/05.jpg"
-        securityImageEnumValue: 5;
-    }
-    ListElement{
-        sourcePath: "images/06.jpg"
-        securityImageEnumValue: 6;
     }
 
     function getImagePathFromImageID(imageID) {

interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml

@@ -95,6 +95,10 @@ Item {
     function getSelectedImageIndex() {
         return gridModel.get(securityImageGrid.currentIndex).securityImageEnumValue;
     }
+
+    function initModel() {
+        gridModel.initModel();
+    }
     //
     // FUNCTION DEFINITIONS END
     //

interface/resources/qml/hifi/commerce/wallet/Wallet.qml

@@ -82,10 +82,6 @@ Rectangle {
         }
     }
 
-    SecurityImageModel {
-        id: securityImageModel;
-    }
-
     HifiCommerceCommon.CommerceLightbox {
         id: lightboxPopup;
         visible: false;
@@ -342,6 +338,7 @@ Rectangle {
                     passphraseChange.clearPassphraseFields();
                     passphraseChange.resetSubmitButton();
                 } else if (msg.method === 'walletSecurity_changeSecurityImage') {
+                    securityImageChange.initModel();
                     root.activeView = "securityImageChange";
                 }
             }

interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml

@@ -236,6 +236,7 @@ Item {
             height: 50;
             text: "Set Up Wallet";
             onClicked: {
+                securityImageSelection.initModel();
                 root.activeView = "step_2";
             }
         }