improving multiaccount support

Author: Janis Erdmanis

Manifest.toml

@@ -1,7 +1,7 @@
 name = "PeaceFounderClient"
 uuid = "e27653ee-9918-43bd-96c3-a19beeb55963"
 authors = ["Janis Erdmanis <janiserdmanis@protonmail.ch>"]
-version = "0.1.2"
+version = "0.1.3"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

Project.toml

@@ -88,7 +88,7 @@ Item {
     signal castBallot
     signal resetBallot
 
-    signal setDeme(string uuid)
+    signal setDeme(string uuid, int memberIndex)
     signal setProposal(int index)
 
     signal refreshHome
@@ -114,8 +114,8 @@ Item {
 
             onRefresh : app.refreshHome() 
 
-            onDemeCard : uuid => {
-                app.setDeme(uuid)
+            onDemeCard : (uuid, memberIndex) => {
+                app.setDeme(uuid, memberIndex)
                 app.page = 2
             }
 

qml/App.qml

@@ -8,7 +8,7 @@ App {
 
     onAddDeme : invite => Julia.addDeme(invite)
 
-    onSetDeme : uuid => Julia.setDeme(uuid)
+    onSetDeme : (uuid, memberIndex) => Julia.setDeme(uuid, memberIndex)
 
     onSetProposal : index => Julia.setProposal(index)
 

qml/Bridge.qml

@@ -130,7 +130,6 @@ Rectangle {
             Text {
 
                 anchors.bottom : parent.bottom
-
                 text : "Member: " + card.memberIndex
                 color : Style.verified //"#20741C"
                 font.pointSize: 14

qml/DemeStatus.qml

@@ -11,7 +11,7 @@ AppPage {
     title : "Home"
     backVisible : false
 
-    signal demeCard(string uuid)
+    signal demeCard(string uuid, int memberIndex) // add int memberIndex, page.memberIndex
     signal addDeme(string invite)
 
     property alias userDemes : demes_view.model
@@ -85,13 +85,53 @@ AppPage {
                         anchors.right: parent.right
                         font.pointSize: 9 
                         //text: model.uuid
-                        text : uuid
+                        text : uuid  // I can add memberIndex
                         anchors.topMargin: 4
                         anchors.rightMargin: 4
                         color : Style.textTeritary
                     }
 
 
+                    /* Text { */
+                    /*     anchors.bottom: parent.bottom */
+                    /*     anchors.left: parent.left */
+                    /*     font.pointSize: 9  */
+                    /*     text : memberIndex   */
+                    /*     anchors.bottomMargin: 5 */
+                    /*     anchors.leftMargin: 5 */
+                    /*     color : Style.textTeritary */
+                    /* } */
+
+
+                    Row {
+                        
+                        anchors.left: parent.left
+                        anchors.bottom: parent.bottom
+                        anchors.bottomMargin: 5
+                        anchors.leftMargin: 5
+
+                        spacing : 2
+
+                        height : 12
+
+                        Icon {
+                            anchors.bottom : parent.bottom
+                            anchors.bottomMargin: 2
+                            height: 14
+                            source: "images/Member.png"
+                            color : Style.textSecondary
+                        }
+
+                        Text {
+                            anchors.bottom : parent.bottom
+                            font.pointSize: 12
+                            color : Style.textSecondary
+                            text : memberIndex
+                        }
+
+                    }
+
+
                     Row {
 
                         anchors.right: parent.right
@@ -104,6 +144,7 @@ AppPage {
                         height : 12
 
                         Text {
+                            anchors.bottom : parent.bottom
                             font.pointSize: 12
                             color : Style.textSecondary
                             //text: "" + model.groupsize
@@ -112,18 +153,18 @@ AppPage {
 
                         Icon {
                             anchors.bottom : parent.bottom
+                            anchors.bottomMargin: 3
                             source : "images/GroupSize.png"
                             height : 10
                             color : Style.textSecondary
                         }
 
-
                     }
 
 
                     MouseArea {
                         anchors.fill : parent
-                        onClicked : demeCard(uuid)
+                        onClicked : demeCard(uuid, memberIndex)
                     }
 
                 }