fix error using removed iconName func from fmstatic from mauyikitfile…

…browsing. rework the apppage header layout
Nitrux · Jan 4, 2024 · 87beb02 · 87beb02
1 parent b5c4ad6
commit 87beb02
Showing 1 changed file with 25 additions and 36 deletions.
diff --git a/src/ui/templates/AppPage.qml b/src/ui/templates/AppPage.qml
@@ -107,102 +107,91 @@ Maui.Page
                     Layout.fillWidth: true
                     clip: true
 
-                    Maui.FlexListItem
+                    GridLayout
                     {
                         id: _bannerInfo
                         width: parent.width
-                        padding: Maui.Style.space.medium
                         //                    anchors.fill: parent
+                        columns: root.isWide ? 3 : 2
                         anchors.centerIn: parent
-                        wide: root.isWide
+                        rowSpacing: Maui.Style.space.big
+
+                       Maui.ListItemTemplate
+                       {
+                           Layout.fillWidth: true
+                           // Layout.column: 0
+                           // Layout.row: 0
                         iconSource: "package"
                         iconSizeHint: Maui.Style.iconSizes.huge
                         imageSource: appInfo.smallpic
-                        template.fillMode: Image.PreserveAspectFit
+                        fillMode: Image.PreserveAspectFit
                         label1.text: appInfo.name
                         label1.elide: Text.ElideMiddle
                         label1.wrapMode: Text.WrapAnywhere
                         label1.font.weight: Font.Bold
                         label1.font.bold: true
-                        label1.font.pointSize: Maui.Style.fontSizes.enormous *2
+                        label1.font.pointSize: Maui.Style.fontSizes.enormous
                         label2.text: String("<a href='%1'>%1</a>").arg(appInfo.personid)
                         label2.textFormat: Text.RichText
-                        template.leftLabels.spacing: Maui.Style.space.medium
-                        rowSpacing: Maui.Style.space.big
-                        template.spacing: Maui.Style.space.huge
+                        leftLabels.spacing: Maui.Style.space.medium
+                        spacing: Maui.Style.space.huge
                         //                    label3.text: appInfo.personid
 
-                        template.leftLabels.data: Row
+                        leftLabels.data: Row
                         {
                             id: _actionButtons
                             //                        Layout.fillWidth: parent.wide
                             //                        Layout.margins: Maui.Style.space.big
                             //                        spacing: Maui.Style.space.medium
                             Layout.preferredHeight: implicitHeight
                         }
+                       }
 
                         Maui.Chip
                         {
-
                             color: "#21be2b"
                             label.text: appInfo.server
-
-
                         }
 
                         RowLayout
                         {
-                            Layout.fillWidth: true
-                            Layout.alignment: Qt.AlignCenter
-                            spacing: Maui.Style.space.big
+                            // Layout.fillWidth: true
+                            // Layout.alignment: Qt.AlignCenter
+                            spacing: Maui.Style.space.medium
 
                             Maui.GridItemTemplate
                             {
-                                Layout.fillWidth: true
-                                implicitWidth:  64
-                                implicitHeight: 64
+                                implicitWidth:  58
+                                implicitHeight: 58
                                 isMask: true
 
                                 iconSource: "rating"
                                 iconSizeHint: Maui.Style.iconSizes.medium
                                 labelSizeHint: 22
                                 label1.text: appInfo.score
-                                label1.font.bold: true
-                                label1.font.weight: Font.Bold
-                                label1.font.pointSize: Maui.Style.fontSizes.big
                             }
 
                             Maui.GridItemTemplate
                             {
-                                Layout.fillWidth: true
-                                implicitWidth:  64
-                                implicitHeight: 64
+                                implicitWidth:  58
+                                implicitHeight: 58
                                 iconSource: "download"
                                 iconSizeHint: Maui.Style.iconSizes.medium
                                 labelSizeHint: 22
                                 isMask: true
                                 label1.text: appInfo.totaldownloads
-                                label1.font.bold: true
-                                label1.font.weight: Font.Bold
-                                label1.font.pointSize: Maui.Style.fontSizes.big
                             }
 
                             Maui.GridItemTemplate
                             {
-                                Layout.fillWidth: true
-
-                                implicitWidth:  64
-                                implicitHeight: 64
+                                implicitWidth:  58
+                                implicitHeight: 58
                                 isMask: true
 
                                 iconSource: "license"
                                 iconSizeHint: Maui.Style.iconSizes.medium
                                 labelSizeHint: 22
                                 label1.text: appInfo.license || i18n("Unknown")
-                                label1.font.bold: true
-                                label1.font.weight: Font.Bold
-                                label1.font.pointSize: Maui.Style.fontSizes.big
-
                             }
                         }
                     }
@@ -258,7 +247,7 @@ Maui.Page
                                 label1.font.bold: true
                                 label3.text: info.packageArch
                                 label2.text: Maui.Handy.formatSize(info.size)
-                                iconSource: FB.FM.iconName(info.name)
+                                iconSource: FB.FM.getIconName(info.name)
                                 iconSizeHint: Maui.Style.iconSizes.large
 
                                 onClicked: