Some Code Refactor

Author: adesh777

GameScreens/HomeScreen.qml

@@ -6,8 +6,6 @@ import "../ScreensComponents"
 import "../Settings"
 ScreenPage{
     anchors.fill: parent
-    property int buttonWidth:root.width *0.20
-    property int buttonHeight:root.height *0.25
     SplitView {
         id: splitView
         anchors.fill: parent

GameScreens/ScreenPage.qml

@@ -1,8 +1,7 @@
 import QtQuick 2.15
+import QtQuick.Controls 2.5
 Item {
     anchors.fill: parent
-    Rectangle{
-        anchors.fill: parent
-        color:backgroundColor
-    }
+    property var stack: StackView.view
+    StackView.visible: true
 }

Settings/GeneralSettingsPage.qml

@@ -8,8 +8,11 @@ ScreenPage{
     anchors.fill: parent
     ColumnLayout{
         Layout.fillWidth: true
+        spacing: 50
         PrefsComboBox{
-            anchors.centerIn: parent
+            model: SideListModel{}//["Adesh","Kabir","Raj","Adesh","Kabir","Raj","Adesh","Kabir","Raj"]
+        }
+        PrefsComboBoxLabel{
             model: SideListModel{}//["Adesh","Kabir","Raj","Adesh","Kabir","Raj","Adesh","Kabir","Raj"]
         }
     }

Settings/Settings.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.3
-
+import "../GameScreens"
 ApplicationWindow {
     id:root
     visible: true
@@ -82,11 +82,16 @@ ApplicationWindow {
             SplitView.fillWidth: true
             color: "#fafbfb"
             clip: true
-            Text {
-                anchors.centerIn: parent
-                font.pixelSize: 24
-                text: "NOT COLLAPSED"
-                Behavior on rotation { NumberAnimation { duration: 100 } }
+            Loader{
+                id:mainLoader
+                anchors.fill: parent
+                StackView{
+                    id:mainStack
+                    anchors.fill: parent
+                    initialItem: GeneralSettingsPage{
+                        anchors.fill: parent
+                    }
+                }
             }
         }
     }

common/PrefsComboBox.qml

@@ -10,13 +10,13 @@ ComboBox {
         property string iconRectColor: iconColor ? iconColor : ""
         property string iconRectIcon: iconName ? iconName : ""
 
-        width: root.width * 1.4
+        width: root.width * 1.2
         height: 40
         hoverEnabled: true
         focus: true
 
         background: Rectangle{
-            color: itemDelegate.hovered ? "blue" : "transparent"
+            color: itemDelegate.hovered ? "#0437F2" : "transparent"
             anchors.fill: parent
             radius: 8
         }
@@ -145,12 +145,14 @@ ComboBox {
         implicitWidth: 200
         implicitHeight: 41
         color: root.down ? Qt.darker(root.checkedColor, 1.2) : root.checkedColor
-        radius: 4
+        radius: 6
+        border.width: 0.6
+        border.color: "grey"
     }
 
     popup: Popup {
         y: root.height - 1
-        width: root.width * 1.5
+        width: root.width * 1.3
         implicitHeight: contentItem.implicitHeight > 250 ? 250 : contentItem.implicitHeight
         padding: 4
         contentItem: ListView {
@@ -165,8 +167,10 @@ ComboBox {
 
         background: Rectangle {
             anchors.fill: parent
-            color: "#dde4de"
-            radius: 4
+            color: "white"
+            radius: 6
+            border.width: 0.6
+            border.color: "grey"
             clip: true
         }
     }

common/PrefsComboBoxLabel.qml

@@ -15,7 +15,7 @@ ComboBox {
         focus: true
 
         background: Rectangle{
-            color: itemDelegate.hovered ? "blue" : "transparent"
+            color: itemDelegate.hovered ? "#0437F2" : "transparent"
             anchors.fill: parent
             radius: 8
         }
@@ -110,7 +110,9 @@ ComboBox {
         implicitWidth: 200
         implicitHeight: 41
         color: root.down ? Qt.darker(root.checkedColor, 1.2) : root.checkedColor
-        radius: 4
+        radius: 6
+        border.width: 0.6
+        border.color: "grey"
     }
 
     popup: Popup {
@@ -130,8 +132,9 @@ ComboBox {
 
         background: Rectangle {
             anchors.fill: parent
-            color: "#dde4de"
-            radius: 4
+            radius: 6
+            border.width: 0.6
+            border.color: "grey"
             clip: true
         }
     }

qml.qrc

@@ -593,5 +593,8 @@
         <file>Settings/Settings.qml</file>
         <file>Settings/SideListDelegate.qml</file>
         <file>Settings/SideListModel.qml</file>
+        <file>Settings/GeneralSettingsPage.qml</file>
+        <file>common/PrefsComboBox.qml</file>
+        <file>common/PrefsComboBoxLabel.qml</file>
     </qresource>
 </RCC>