Commit 646f52a2 authored by camilo higuita's avatar camilo higuita

fix missig references to colorscheme

parent 3cbd7e95
Pipeline #6443 failed with stage
in 5 minutes and 7 seconds
......@@ -219,7 +219,7 @@ Maui.ApplicationWindow
checkable: false
checked: currentView === viewsIndex.artists
icon.name: "view-media-artist"
Kirigami.Theme.textColor: currentView === viewsIndex.artists ? babeColor : altColorText
// Kirigami.Theme.textColor: currentView === viewsIndex.artists ? babeColor : altColorText
onTriggered: currentView = viewsIndex.artists
// colorScheme.highlightColor: babeColor
// showIndicator: true
......@@ -313,7 +313,7 @@ Maui.ApplicationWindow
icon.name: "headphones"
visible: _drawer.modal
checked: _drawer.visible
icon.color: _drawer.visible ? babeColor : textColor
icon.color: _drawer.visible ? babeColor : Kirigami.Theme.textColor
onClicked: _drawer.visible = !_drawer.visible
Kirigami.Theme.highlightColor: babeColor
// text: qsTr("Now")
......@@ -325,7 +325,7 @@ Maui.ApplicationWindow
id: babeBtnIcon
icon.name: "love"
enabled: currentTrackIndex >= 0
icon.color: currentBabe ? babeColor : textColor
icon.color: currentBabe ? babeColor : Kirigami.Theme.textColor
onClicked: if (!mainlistEmpty)
{
mainPlaylist.list.fav(currentTrackIndex, !(mainPlaylist.list.get(currentTrackIndex).fav == "1"))
......@@ -336,7 +336,7 @@ Maui.ApplicationWindow
ToolButton
{
icon.name: "media-skip-backward"
icon.color: textColor
icon.color: Kirigami.Theme.textColor
onClicked: Player.previousTrack()
onPressAndHold: Player.playAt(prevTrackIndex)
},
......@@ -345,7 +345,7 @@ Maui.ApplicationWindow
{
id: playIcon
enabled: currentTrackIndex >= 0
icon.color: textColor
icon.color: Kirigami.Theme.textColor
icon.name: isPlaying ? "media-playback-pause" : "media-playback-start"
onClicked: player.playing = !player.playing
},
......@@ -353,7 +353,7 @@ Maui.ApplicationWindow
ToolButton
{
id: nextBtn
icon.color: textColor
icon.color: Kirigami.Theme.textColor
icon.name: "media-skip-forward"
onClicked: Player.nextTrack()
onPressAndHold: Player.playAt(Player.shuffle())
......@@ -606,7 +606,7 @@ Maui.ApplicationWindow
text: infoMsg
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
color: textColor
color: Kirigami.Theme.textColor
SequentialAnimation
{
......@@ -625,7 +625,7 @@ Maui.ApplicationWindow
target: infoTxt
property: "color"
easing.type: Easing.InOutQuad
to: textColor
to: Kirigami.Theme.textColor
duration: 500
}
}
......
......@@ -125,7 +125,7 @@ ItemDelegate
width: img.adapt ? img.width : Math.min(img.width, img.height)
height: img.adapt ? img.height : width
radius: albumRadius
border.color: borderColor
// border.color: borderColor
}
}
}
......
......@@ -17,7 +17,7 @@ Menu
property int rate : 0
property bool fav : false
property string starColor : "#FFC107"
property string starReg : textColor
property string starReg : Kirigami.Theme.textColor
property string starIcon: "draw-star"
signal removeClicked()
......
......@@ -26,7 +26,7 @@ Item
height: recSize
color: vvave.moodColor(0)
radius: recRadius
border.color: altColor
border.color: color
border.width: 1
}
......@@ -46,7 +46,7 @@ Item
height: recSize
color: vvave.moodColor(1)
radius: recRadius
border.color: altColor
border.color: color
border.width: 1
}
......@@ -65,7 +65,7 @@ Item
height: recSize
color: vvave.moodColor(2)
radius: recRadius
border.color: altColor
border.color: color
border.width: 1
}
......@@ -84,7 +84,7 @@ Item
height: recSize
color: vvave.moodColor(3)
radius: recRadius
border.color: altColor
border.color: color
border.width: 1
}
......@@ -104,7 +104,7 @@ Item
height: recSize
color: vvave.moodColor(4)
radius: recRadius
border.color: altColor
border.color: color
border.width: 1
}
......
......@@ -127,4 +127,18 @@ include(install.pri)
# QMAKE_POST_LINK += $$copyToBuilddir($$PWD/library/cat)
#}
DISTFILES += \
3rdparty/mauikit/src/android/AndroidManifest.xml \
3rdparty/mauikit/src/android/build.gradle \
3rdparty/mauikit/src/android/gradle/wrapper/gradle-wrapper.jar \
3rdparty/mauikit/src/android/gradle/wrapper/gradle-wrapper.properties \
3rdparty/mauikit/src/android/gradlew \
3rdparty/mauikit/src/android/gradlew.bat \
3rdparty/mauikit/src/android/res/values/libs.xml
contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
ANDROID_PACKAGE_SOURCE_DIR = \
$$PWD/3rdparty/mauikit/src/android
}
......@@ -8,7 +8,7 @@ import "../utils/Help.js" as H
import "../utils/Player.js" as Player
import "../view_models"
import org.kde.kirigami 2.6 as Kirigami
import org.kde.kirigami 2.7 as Kirigami
import org.kde.mauikit 1.0 as Maui
Menu
......@@ -18,7 +18,7 @@ Menu
property int rate : 0
property string starColor : "#FFC107"
property string starReg : textColor
property string starReg : Kirigami.Theme.textColor
property string starIcon: "draw-star"
signal rateClicked(int rate)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment