From 8b3815baac565701741486aee42b990cacbf1fbf Mon Sep 17 00:00:00 2001
From: greek <a@b.c>
Date: Sat, 1 Jun 2024 14:46:10 +0100
Subject: [PATCH] Convinient use of repeaters.

---
 PlayerAreaModel.cpp |  2 +-
 PlayerAreaView.qml  | 57 +++++++++++++++---------------
 StreetBetsView.qml  | 84 ++++++++++++++++++++++-----------------------
 3 files changed, 70 insertions(+), 73 deletions(-)

diff --git a/PlayerAreaModel.cpp b/PlayerAreaModel.cpp
index c11f532..cd5ff49 100644
--- a/PlayerAreaModel.cpp
+++ b/PlayerAreaModel.cpp
@@ -3,7 +3,7 @@
 PlayerAreaModel::PlayerAreaModel(QObject *parent)
 {
     for(int i = 0; i < 7; i++){
-        playerNames.append("Click to edit");
+        playerNames.append("N/A");
     }
 }
 
diff --git a/PlayerAreaView.qml b/PlayerAreaView.qml
index 02796e7..3f185f6 100644
--- a/PlayerAreaView.qml
+++ b/PlayerAreaView.qml
@@ -5,37 +5,36 @@ import QtQuick.Layouts
 import roulette
 
 Item {
+    Text {
+        id: croupier
+        text: "Croupier"
+    }
+
     ColumnLayout {
-        Text {
-            text: "Croupier"
+        anchors {
+            top: croupier.bottom
+            topMargin: 20
         }
-        TextField {
-            onTextEdited: PlayerAreaModel.setPlayerName(text, 0)
-            onActiveFocusChanged: PlayerAreaModel.setFocusedPlayer(0)
-        }
-        TextField {
-            onTextEdited: PlayerAreaModel.setPlayerName(text, 1)
-            onActiveFocusChanged: PlayerAreaModel.setFocusedPlayer(1)
-        }
-        TextField {
-            onTextEdited: PlayerAreaModel.setPlayerName(text, 2)
-            onActiveFocusChanged: PlayerAreaModel.setFocusedPlayer(2)
-        }
-        TextField {
-            onTextEdited: PlayerAreaModel.setPlayerName(text, 3)
-            onActiveFocusChanged: PlayerAreaModel.setFocusedPlayer(3)
-        }
-        TextField {
-            onTextEdited: PlayerAreaModel.setPlayerName(text, 4)
-            onActiveFocusChanged: PlayerAreaModel.setFocusedPlayer(4)
-        }
-        TextField {
-            onTextEdited: PlayerAreaModel.setPlayerName(text, 5)
-            onActiveFocusChanged: PlayerAreaModel.setFocusedPlayer(5)
-        }
-        TextField {
-            onTextEdited: PlayerAreaModel.setPlayerName(text, 6)
-            onActiveFocusChanged: PlayerAreaModel.setFocusedPlayer(6)
+
+        spacing: 60
+
+        Repeater {
+            model: 7
+
+            Item {
+                Text {
+                    id: label
+                    text: "Player " + (index + 1)
+                }
+
+                TextField {
+                    anchors.top: label.bottom
+                    anchors.topMargin: 6
+
+                    onTextEdited: PlayerAreaModel.setPlayerName(text, index)
+                    onActiveFocusChanged: PlayerAreaModel.setFocusedPlayer(index)
+                }
+            }
         }
     }
 }
diff --git a/StreetBetsView.qml b/StreetBetsView.qml
index 251b7be..35fb5c7 100644
--- a/StreetBetsView.qml
+++ b/StreetBetsView.qml
@@ -1,4 +1,5 @@
 import QtQuick
+import QtQuick.Layouts
 
 import roulette
 
@@ -8,59 +9,56 @@ Item {
         id: streetBetsModel
     }
 
-    Repeater {
-        model: 12
+    RowLayout {
+        anchors {
+            left: parent.left
+            leftMargin: 90
+            top: parent.top
+            topMargin: 22
+        }
 
-        Rectangle {
-            visible: true
-            color: tapHandler1.pressed ? "#999999" : "#EEEEEE"
-            opacity: hoverHandler.hovered ? 0.4 : 0
-            height: 45
-            width: 35
+        spacing: 1.8
 
-            anchors {
-                left: parent.left
-                leftMargin: 90 + (index * (width + 1.8))
-                top: parent.top
-                topMargin: 22
-            }
+        Repeater {
+            model: 12
 
-            HoverHandler {
-                id: hoverHandler
-            }
-            TapHandler {
-                id: tapHandler1
+            Rectangle {
+                visible: true
+                color: tapHandler1.pressed ? "#999999" : "#EEEEEE"
+                opacity: hoverHandler.hovered ? 0.4 : 0
+                height: 45
+                width: 35
+
+                HoverHandler {
+                    id: hoverHandler
+                }
+                TapHandler {
+                    id: tapHandler1
+                }
             }
         }
-    }
 
-    Repeater {
-        model: 12
+        Repeater {
+            model: 12
 
-        delegate: Rectangle {
-            visible: true
-            color: "transparent"
-            height: 44
-            width: 35
-            border.color: "blue"
-            border.width: 0
+            delegate: Rectangle {
+                visible: true
+                color: "transparent"
+                height: 44
+                width: 35
+                border.color: "blue"
+                border.width: 0
 
-            anchors {
-                left: parent.left
-                leftMargin: 90 + (index * (width + 1.8))
-                top: parent.top
-                topMargin: 22
-            }
+                TapHandler {
 
-            TapHandler {
-
-                onTapped: ()=> {
-                    if (parent.border.width == 0) {
-                        parent.border.width = 2
-                    } else {
-                        parent.border.width = 0
+                    onTapped: ()=> {
+                        if (parent.border.width == 0) {
+                            parent.border.width = 2
+                        } else {
+                            parent.border.width = 0
+                        }
+                        PlayerAreaModel.bet(PlayerAreaModel.STREET, index)
                     }
-                    PlayerAreaModel.bet(PlayerAreaModel.STREET, index)
                 }
             }
         }