Commit f96a4cad authored by camilo higuita's avatar camilo higuita

some fixes

parent a6784a7c
......@@ -143,6 +143,7 @@ Maui.ApplicationWindow
}
}
<<<<<<< Updated upstream
headBar.middleContent : Kirigami.ActionToolBar
{
display: isWide ? ToolButton.TextBesideIcon : ToolButton.IconOnly
......@@ -168,6 +169,91 @@ Maui.ApplicationWindow
onTriggered: currentView = viewsIndex.youtube
}
=======
<<<<<<< Updated upstream
BabeNotify
{
id: babeNotify //todo
}
=======
headBar.middleContent : Maui.ActionGroup
{
currentIndex : currentView
hiddenActions: [
Kirigami.Action
{
text: qsTr("Folders")
icon.name: "folder"
checked: currentView === viewsIndex.folders
checkable: false
onTriggered: currentView = viewsIndex.folders
},
Kirigami.Action
{
text: qsTr("YouTube")
checkable: false
icon.name: "internet-services"
checked: currentView === viewsIndex.youtube
onTriggered: currentView = viewsIndex.youtube
>>>>>>> Stashed changes
<<<<<<< Updated upstream
/* UI */
property bool accent : pageStack.wideMode || (!pageStack.wideMode && pageStack.currentIndex === 1)
altToolBars: false
accentColor: bae.babeColor()
headBarFGColor: altColorText
headBarBGColor: currentView === viewsIndex.vvave ? "#7e57c2" : "#212121"
colorSchemeName: "vvave"
altColorText: darkTextColor
floatingBar: false
headBar.middleContent : [
Maui.ToolButton
{
iconName: "headphones"
iconColor: !accent || isPlaying ? babeColor : altColorText
onClicked: pageStack.currentIndex = 0
colorScheme.highlightColor: babeColor
text: qsTr("Now")
},
=======
]
Action
{
icon.name: "view-media-track"
onTriggered: currentView = viewsIndex.tracks
text: qsTr("Tracks")
}
Action
{
text: qsTr("Albums")
icon.name: /*"album"*/ "view-media-album-cover"
onTriggered: currentView = viewsIndex.albums
}
Action
{
text: qsTr("Artists")
icon.name: "view-media-artist"
onTriggered: currentView = viewsIndex.artists
}
Action
{
text: qsTr("Playlists")
icon.name: "view-media-playlist"
onTriggered: currentView = viewsIndex.playlists
}
}
>>>>>>> Stashed changes
>>>>>>> Stashed changes
]
actions: [
......@@ -677,13 +763,25 @@ Maui.ApplicationWindow
SwipeView
{
<<<<<<< Updated upstream
=======
<<<<<<< Updated upstream
anchors.fill: parent
=======
>>>>>>> Stashed changes
id: swipeView
Layout.fillHeight: true
Layout.fillWidth: true
interactive: isMobile
currentIndex: currentView
<<<<<<< Updated upstream
onCurrentItemChanged: currentItem.forceActiveFocus()
=======
clip: true
onCurrentItemChanged: currentItem.forceActiveFocus()
>>>>>>> Stashed changes
>>>>>>> Stashed changes
onCurrentIndexChanged:
{
......@@ -1038,4 +1136,13 @@ Maui.ApplicationWindow
Player.playAt(0)
}
}
Component.onCompleted:
{
if(isAndroid)
{
Maui.Android.statusbarColor(Kirigami.Theme.backgroundColor, true)
Maui.Android.navBarColor(Kirigami.Theme.backgroundColor, true)
}
}
}
......@@ -3,8 +3,21 @@
#include "utils/brain.h"
#include <QtConcurrent>
<<<<<<< Updated upstream
AlbumsModel::AlbumsModel(QObject *parent) : MauiList(parent),
db(CollectionDB::getInstance())
=======
<<<<<<< Updated upstream
AlbumsModel::AlbumsModel(QObject *parent) : BaseList(parent)
=======
AlbumsModel::AlbumsModel(QObject *parent) : MauiList(parent),
db(CollectionDB::getInstance())
{}
void AlbumsModel::componentComplete()
>>>>>>> Stashed changes
>>>>>>> Stashed changes
{
connect(this, &AlbumsModel::queryChanged, this, &AlbumsModel::setList);
}
......
......@@ -35,7 +35,14 @@ public:
Q_ENUM(QUERY)
explicit AlbumsModel(QObject *parent = nullptr);
<<<<<<< Updated upstream
~AlbumsModel();
=======
<<<<<<< Updated upstream
=======
void componentComplete() override final;
>>>>>>> Stashed changes
>>>>>>> Stashed changes
FMH::MODEL_LIST items() const override;
......
......@@ -2,8 +2,19 @@
#include "db/collectionDB.h"
<<<<<<< Updated upstream
TracksModel::TracksModel(QObject *parent) : MauiList(parent),
db(CollectionDB::getInstance())
=======
<<<<<<< Updated upstream
TracksModel::TracksModel(QObject *parent) : BaseList(parent)
=======
TracksModel::TracksModel(QObject *parent) : MauiList(parent),
db(CollectionDB::getInstance()) {}
void TracksModel::componentComplete()
>>>>>>> Stashed changes
>>>>>>> Stashed changes
{
connect(this, &TracksModel::queryChanged, this, &TracksModel::setList);
}
......
......@@ -38,6 +38,8 @@ public:
explicit TracksModel(QObject *parent = nullptr);
void componentComplete() override final;
FMH::MODEL_LIST items() const override;
void setQuery(const QString &query);
......
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