From 6b546535728fd21eafc5ce504143697d857e00df Mon Sep 17 00:00:00 2001 From: restitux Date: Wed, 31 Aug 2022 21:28:02 -0400 Subject: [PATCH] Update ContentView to show selected show metadata --- ikinuki_client/__main__.py | 4 ++ layouts/components/ContentView.qml | 61 +++++++++++++++++----- layouts/components/ContentView/Element.qml | 19 ++++--- 3 files changed, 65 insertions(+), 19 deletions(-) diff --git a/ikinuki_client/__main__.py b/ikinuki_client/__main__.py index e5dd191..f398de6 100644 --- a/ikinuki_client/__main__.py +++ b/ikinuki_client/__main__.py @@ -32,6 +32,10 @@ class Show(QObject): def year(self) -> int: return self._source["year"] + @pyqtProperty("QString") + def description(self) -> str: + return self._source["description"] + @pyqtProperty(int) def episodes(self) -> int: return self._source["episodes"] diff --git a/layouts/components/ContentView.qml b/layouts/components/ContentView.qml index 8462807..ca19346 100644 --- a/layouts/components/ContentView.qml +++ b/layouts/components/ContentView.qml @@ -30,20 +30,55 @@ TabView { width: 40 } Column { - spacing: 20 - Element { - title: "In Progress" - provider: modelData - repeaterModel: modelData.inProgress - elemSelected: viewSelected && (0 == ySelect) - xIndex: xSelect + Row { + Item { + height: parent.height + width: 16 + } + Column { + spacing: 20 + Item { + height: 20 + width: parent.width + } + Text { + text: elementColumn.children[ySelect].provider.getShow(xSelect).title + font.pointSize: 30 + color: "#cdd7d9" + } + Text { + text: elementColumn.children[ySelect].provider.getShow(xSelect).year + font.pointSize: 15 + color: "#99afb4" + } + Text { + text: elementColumn.children[ySelect].provider.getShow(xSelect).description + font.pointSize: 13 + color: "#cdd7d9" + } + } } - Element { - title: "Recently Added" - provider: modelData - repeaterModel: modelData.recentlyAdded - elemSelected: viewSelected && (1 == ySelect) - xIndex: xSelect + Item { + height: 40 + width: parent.width + } + Column { + id: elementColumn + spacing: 20 + Element { + title: "In Progress" + provider: modelData + repeaterModel: modelData.inProgress + elemSelected: viewSelected && (0 == ySelect) + xIndex: xSelect + } + Element { + title: "Recently Added" + provider: modelData + repeaterModel: modelData.recentlyAdded + elemSelected: viewSelected && (1 == ySelect) + xIndex: xSelect + } } } } diff --git a/layouts/components/ContentView/Element.qml b/layouts/components/ContentView/Element.qml index ddb03e1..1e59cd3 100644 --- a/layouts/components/ContentView/Element.qml +++ b/layouts/components/ContentView/Element.qml @@ -10,19 +10,26 @@ Column { property int xIndex Item { width: 10 - height: 40 + height: 20 } - Text { - text: title - font.pointSize: 30 - color: "white" + Row { + Item { + height: parent.height + width: 16 + } + Text { + text: title + font.pointSize: 15 + color: "#cdd7d9" + } } Item { width: 10 - height: 40 + height: 15 } Row { Repeater { + id: repeater property var provider: modelData model: repeaterModel Show {