diff --git a/src/qml/common/InformationTable.qml b/src/qml/common/InformationTable.qml --- a/src/qml/common/InformationTable.qml +++ b/src/qml/common/InformationTable.qml @@ -26,6 +26,13 @@ id: root height: childrenRect.height + KColorScheme { + id: colorScheme + colorGroup: KColorScheme.Active + colorSet: KColorScheme.View + } + + Column { id: column spacing: 3 @@ -58,6 +65,7 @@ text: model.modelData.text wrapMode: Text.Wrap height: Math.max(paintedHeight, titleLabel.paintedHeight) + color: colorScheme.normalText } } } diff --git a/src/qml/homescreen/ProfileDetailsItem.qml b/src/qml/homescreen/ProfileDetailsItem.qml --- a/src/qml/homescreen/ProfileDetailsItem.qml +++ b/src/qml/homescreen/ProfileDetailsItem.qml @@ -50,6 +50,12 @@ colorGroup: SystemPalette.Active } + KColorScheme { + id: colorScheme + colorGroup: KColorScheme.Active + colorSet: KColorScheme.View + } + Item { id: infoContainer @@ -100,7 +106,8 @@ anchors.horizontalCenter: parent.horizontalCenter width: parent.width height: parent.height - legend.height - parent.spacing - + backgroundColor: colorScheme.normalBackground + textColor: colorScheme.normalText model: learningProgressModel } @@ -110,11 +117,11 @@ spacing: 20 Charts.LegendItem { dimension: learningProgressChart.accuracy - textColor: activePalette.text + textColor: colorScheme.normalText } Charts.LegendItem { dimension: learningProgressChart.charactersPerMinute - textColor: activePalette.text + textColor: colorScheme.normalText } } } diff --git a/src/qml/homescreen/StatPopupDialog.qml b/src/qml/homescreen/StatPopupDialog.qml --- a/src/qml/homescreen/StatPopupDialog.qml +++ b/src/qml/homescreen/StatPopupDialog.qml @@ -63,6 +63,7 @@ Layout.fillHeight: true Layout.fillWidth: true backgroundColor: colorScheme.normalBackground + textColor: colorScheme.normalText model: LearningProgressModel { id: learningProgressModel } @@ -74,10 +75,12 @@ Charts.LegendItem { id: accuracyLegend dimension: learningProgressChart.accuracy + textColor: colorScheme.normalText } Charts.LegendItem { id: charactersPerMinuteLegend dimension: learningProgressChart.charactersPerMinute + textColor: colorScheme.normalText } } } diff --git a/src/qml/scorescreen/ScoreScreen.qml b/src/qml/scorescreen/ScoreScreen.qml --- a/src/qml/scorescreen/ScoreScreen.qml +++ b/src/qml/scorescreen/ScoreScreen.qml @@ -108,7 +108,6 @@ } - LearningProgressModel { property bool filterByLesson: learningProgressFilterComboBox.currentIndex == 1 id: learningProgressModel @@ -371,6 +370,7 @@ property string iconName: "office-chart-area" model: learningProgressModel backgroundColor: colorScheme.normalBackground + textColor: colorScheme.normalText Component.onCompleted: { accuracyLegend.dimension = learningProgressTab.accuracy