diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,8 +42,23 @@
 
 if (ANDROID)
     find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS AndroidExtras)
+    set_package_properties(Qt5AndroidExtras PROPERTIES
+        DESCRIPTION "Qt5 AndroidExtras is needed to provide the Android integration."
+        TYPE REQUIRED)
 endif()
 
+find_package(KF5Kirigami2 ${REQUIRED_KF5_VERSION} CONFIG QUIET)
+
+if (ANDROID)
+    set(KIRIGAMI_DEPENDENCY_TYPE REQUIRED)
+else()
+    set(KIRIGAMI_DEPENDENCY_TYPE RECOMMENDED)
+endif()
+
+set_package_properties(KF5Kirigami2 PROPERTIES
+    DESCRIPTION "KF5 Kirigami 2 is needed to provide the mobile UI components."
+    TYPE ${KIRIGAMI_DEPENDENCY_TYPE})
+
 find_package(KF5I18n ${REQUIRED_KF5_VERSION} CONFIG QUIET)
 set_package_properties(KF5I18n PROPERTIES
     DESCRIPTION "KF5 text internationalization library."
diff --git a/data/AndroidManifest.xml b/data/AndroidManifest.xml
--- a/data/AndroidManifest.xml
+++ b/data/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.0.3" package="org.kde.elisa" android:installLocation="auto" android:versionCode="7">
-        <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Elisa" android:icon="@drawable/icon">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.2.80" package="org.kde.elisa" android:installLocation="auto" android:versionCode="7">
+        <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Elisa" android:icon="@drawable/kde">
                 <activity android:name="org.qtproject.qt5.android.bindings.QtActivity" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:label="Elisa" android:screenOrientation="unspecified" android:windowSoftInputMode="adjustResize" android:launchMode="singleTop">
                         <intent-filter>
                                 <action android:name="android.intent.action.MAIN"/>
@@ -33,7 +33,7 @@
                         <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
                 </activity>
 
-                <service android:process=":qt" android:name="org.kde.elisa.ElisaService">
+                <service android:process=":qtElisaService" android:name="org.kde.elisa.ElisaService">
                     <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
 
                     <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
@@ -63,7 +63,7 @@
                 </service>
         </application>
         <supports-screens android:anyDensity="true" android:normalScreens="true" android:smallScreens="true" android:largeScreens="true"/>
-        <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16"/>
+        <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="19"/>
 
 
     <!--
diff --git a/data/src/org/kde/elisa/ElisaAndroidMusicScanner.java b/data/src/org/kde/elisa/ElisaAndroidMusicScanner.java
new file mode 100644
--- /dev/null
+++ b/data/src/org/kde/elisa/ElisaAndroidMusicScanner.java
@@ -0,0 +1,87 @@
+package org.kde.elisa;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.content.Intent;
+import android.provider.MediaStore;
+
+/**
+ * Created by mgallien on 02/05/17.
+ */
+
+public class ElisaAndroidMusicScanner {
+    private static String[] tracksRequestedColumns = {
+        MediaStore.Audio.Media._ID,
+        MediaStore.Audio.Media.TITLE,
+        MediaStore.Audio.Media.TRACK,
+        MediaStore.Audio.Media.YEAR,
+        MediaStore.Audio.Media.DURATION,
+        MediaStore.Audio.Media.DATA,
+        MediaStore.Audio.Media.ARTIST,
+        MediaStore.Audio.Media.ARTIST_ID,
+        MediaStore.Audio.Media.ALBUM,
+        MediaStore.Audio.Media.ALBUM_ID,
+        MediaStore.Audio.Media.COMPOSER,
+    };
+
+    private static String[] albumsRequestedColumns = {
+        MediaStore.Audio.Albums._ID,
+        MediaStore.Audio.Albums.ALBUM,
+        MediaStore.Audio.Albums.ALBUM_ART,
+        MediaStore.Audio.Albums.ARTIST,
+        MediaStore.Audio.Albums.NUMBER_OF_SONGS,
+    };
+
+    public static void listAudioFiles(Context ctx)
+    {
+        androidMusicScanTracksStarting();
+
+        //Some audio may be explicitly marked as not being music
+        String tracksSelection = MediaStore.Audio.Media.IS_MUSIC + " != 0";
+        String tracksSortOrder = MediaStore.Audio.Media.DEFAULT_SORT_ORDER + " ASC";
+
+        Cursor tracksCursor = ctx.getContentResolver().query(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, tracksRequestedColumns, tracksSelection, null, tracksSortOrder);
+
+        tracksCursor.moveToFirst();
+        
+        while(tracksCursor.moveToNext()) {
+            sendMusicFile(tracksCursor.getString(0) + "||" + tracksCursor.getString(1) + "||" +
+                tracksCursor.getString(2) + "||" + tracksCursor.getString(3) + "||" + 
+                tracksCursor.getString(4) + "||" + tracksCursor.getString(5) + "||" + 
+                tracksCursor.getString(6) + "||" + tracksCursor.getString(7) + "||" + 
+                tracksCursor.getString(8) + "||" + tracksCursor.getString(9) + "||" + 
+                tracksCursor.getString(10));
+        }
+
+        androidMusicScanTracksFinishing();
+
+        androidMusicScanAlbumsStarting();
+
+        //Some audio may be explicitly marked as not being music
+        String albumsSortOrder = MediaStore.Audio.Albums.DEFAULT_SORT_ORDER + " ASC";
+
+        Cursor albumsCursor = ctx.getContentResolver().query(MediaStore.Audio.Albums.EXTERNAL_CONTENT_URI, albumsRequestedColumns, null, null, albumsSortOrder);
+
+        albumsCursor.moveToFirst();
+        
+        while(albumsCursor.moveToNext()) {
+            sendMusicAlbum(albumsCursor.getString(0) + "||" + albumsCursor.getString(1) + "||" + 
+            albumsCursor.getString(2) + "||" + albumsCursor.getString(3) + "||" + albumsCursor.getString(4));
+        }
+        
+        androidMusicScanAlbumsFinishing();
+    }
+
+    private static native void androidMusicScanTracksStarting();
+
+    private static native void sendMusicFile(String musicFile);
+
+    private static native void androidMusicScanTracksFinishing();
+
+    private static native void androidMusicScanAlbumsStarting();
+
+    private static native void sendMusicAlbum(String musicFile);
+
+    private static native void androidMusicScanAlbumsFinishing();
+
+}
diff --git a/data/src/org/kde/elisa/ElisaService.java b/data/src/org/kde/elisa/ElisaService.java
--- a/data/src/org/kde/elisa/ElisaService.java
+++ b/data/src/org/kde/elisa/ElisaService.java
@@ -1,16 +1,25 @@
 package org.kde.elisa;
 
 import android.content.Context;
+import android.database.Cursor;
 import android.content.Intent;
+import android.provider.MediaStore;
 
 import org.qtproject.qt5.android.bindings.QtService;
 
+class ElisaNatives {
+
+    // declare the native method
+    public static native void sendMusicFile(String musicFile);
+}
+
 /**
  * Created by mgallien on 02/05/17.
  */
 
 public class ElisaService extends QtService {
     public static void startMyService(Context ctx) {
+        //System.err.println("hello service");
         ctx.startService(new Intent(ctx, ElisaService.class));
     }
 }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,20 +38,27 @@
     set(elisaLib_SOURCES
         ${elisaLib_SOURCES}
         audiowrapper_libvlc.cpp
-    )
+        )
 else()
     set(elisaLib_SOURCES
         ${elisaLib_SOURCES}
         audiowrapper_qtmultimedia.cpp
-    )
+        )
+endif()
+
+if (ANDROID)
+    set(elisaLib_SOURCES
+        ${elisaLib_SOURCES}
+        android/androidmusiclistener.cpp
+        )
 endif()
 
 if (KF5KIO_FOUND)
     set(elisaLib_SOURCES
         ${elisaLib_SOURCES}
         models/filebrowsermodel.cpp
         models/filebrowserproxymodel.cpp
-    )
+        )
 endif()
 
 if (KF5Baloo_FOUND)
@@ -86,7 +93,7 @@
         mpris2/mpris2.cpp
         mpris2/mediaplayer2.cpp
         mpris2/mediaplayer2player.cpp
-    )
+        )
 endif()
 
 if (UPNPQT_FOUND)
@@ -124,101 +131,108 @@
 set(elisaLib_SOURCES
     ${elisaLib_SOURCES}
     ../src/elisa_core.kcfg
-)
+    )
 
 add_library(elisaLib ${elisaLib_SOURCES})
 target_link_libraries(elisaLib
     LINK_PUBLIC
-        Qt5::Multimedia
+    Qt5::Multimedia
     LINK_PRIVATE
-        Qt5::Core Qt5::Sql Qt5::Widgets Qt5::Concurrent Qt5::Qml
-        KF5::I18n KF5::CoreAddons
-        KF5::ConfigCore KF5::ConfigGui)
+    Qt5::Core Qt5::Sql Qt5::Widgets Qt5::Concurrent Qt5::Qml
+    KF5::I18n KF5::CoreAddons
+    KF5::ConfigCore KF5::ConfigGui)
 
 if (KF5FileMetaData_FOUND)
     target_link_libraries(elisaLib
         LINK_PRIVATE
-            KF5::FileMetaData
-    )
+        KF5::FileMetaData
+        )
 endif()
 
 if (KF5KIO_FOUND)
     target_link_libraries(elisaLib
         LINK_PUBLIC
-            KF5::KIOCore KF5::KIOFileWidgets KF5::KIOWidgets
-    )
+        KF5::KIOCore KF5::KIOFileWidgets KF5::KIOWidgets
+        )
 endif()
 
 if (KF5XmlGui_FOUND)
     target_link_libraries(elisaLib
         LINK_PUBLIC
-            KF5::XmlGui
-    )
+        KF5::XmlGui
+        )
 endif()
 
 if (KF5ConfigWidgets_FOUND)
     target_link_libraries(elisaLib
         LINK_PUBLIC
-            KF5::ConfigWidgets
-    )
+        KF5::ConfigWidgets
+        )
 endif()
 
 if (KF5KCMUtils_FOUND)
     target_link_libraries(elisaLib
         LINK_PUBLIC
-            KF5::KCMUtils
-    )
+        KF5::KCMUtils
+        )
 endif()
 
 if (KF5Baloo_FOUND)
     if (Qt5DBus_FOUND)
         target_link_libraries(elisaLib
             LINK_PUBLIC
-                KF5::Baloo
-        )
+            KF5::Baloo
+            )
     endif()
 endif()
 
 if (Qt5DBus_FOUND)
     target_link_libraries(elisaLib
         LINK_PUBLIC
-            Qt5::DBus
-    )
+        Qt5::DBus
+        )
 
     if (KF5DBusAddons_FOUND)
         target_link_libraries(elisaLib
             LINK_PUBLIC
-                KF5::DBusAddons
-        )
+            KF5::DBusAddons
+            )
     endif()
 endif()
 
 if (LIBVLC_FOUND)
     target_include_directories(elisaLib
         PRIVATE
-            ${LIBVLC_INCLUDE_DIR}
-    )
+        ${LIBVLC_INCLUDE_DIR}
+        )
 
     target_link_libraries(elisaLib
         LINK_PRIVATE
-            ${LIBVLC_LIBRARY}
-    )
+        ${LIBVLC_LIBRARY}
+        )
+endif()
+
+if (ANDROID)
+    target_link_libraries(elisaLib
+        LINK_PUBLIC
+        Qt5::AndroidExtras
+        )
 endif()
 
 generate_export_header(elisaLib BASE_NAME ElisaLib EXPORT_FILE_NAME elisaLib_export.h)
 
 set_target_properties(elisaLib PROPERTIES
     VERSION 0.1
     SOVERSION 0
     EXPORT_NAME ElisaLib
-)
+    )
 
 if (NOT APPLE AND NOT WIN32)
     install(TARGETS elisaLib
         LIBRARY DESTINATION ${KDE_INSTALL_FULL_LIBDIR}/elisa
         RUNTIME DESTINATION ${KDE_INSTALL_FULL_LIBDIR}/elisa
         BUNDLE DESTINATION ${KDE_INSTALL_FULL_LIBDIR}/elisa
-    )
+        )
 else()
     install(TARGETS elisaLib ${INSTALL_TARGETS_DEFAULT_ARGS})
 endif()
@@ -233,26 +247,26 @@
 add_library(elisaqmlplugin SHARED ${elisaqmlplugin_SOURCES})
 target_link_libraries(elisaqmlplugin
     LINK_PRIVATE
-        Qt5::Quick Qt5::Widgets
-        KF5::ConfigCore KF5::ConfigGui
-        elisaLib
-)
+    Qt5::Quick Qt5::Widgets
+    KF5::ConfigCore KF5::ConfigGui
+    elisaLib
+    )
 
 if (KF5FileMetaData_FOUND)
     target_link_libraries(elisaqmlplugin
         LINK_PRIVATE
-            KF5::FileMetaData
-    )
+        KF5::FileMetaData
+        )
 endif()
 
 set_target_properties(elisaqmlplugin PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/org/kde/elisa
-)
+    )
 
 if (NOT APPLE AND NOT WIN32)
     set_target_properties(elisaqmlplugin PROPERTIES
         INSTALL_RPATH "${KDE_INSTALL_FULL_LIBDIR}/elisa;${CMAKE_INSTALL_RPATH}"
-    )
+        )
 endif()
 
 install(TARGETS elisaqmlplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/elisa/)
@@ -284,6 +298,10 @@
         android/ElisaMainWindow.qml
         android/AndroidTheme.qml
         android/PlatformIntegration.qml
+        android/AlbumsView.qml
+        android/ArtistsView.qml
+        android/TracksView.qml
+        android/GenresView.qml
 
         qml/ElisaMainWindow.qml
         qml/ApplicationMenu.qml
@@ -327,19 +345,24 @@
         qml/FileBrowserView.qml
         qml/ScrollHelper.qml
         qml/FlatButtonWithToolTip.qml
+
+        qml/AlbumsView.qml
+        qml/ArtistsView.qml
+        qml/TracksView.qml
+        qml/GenresView.qml
     )
 
     qt5_add_resources(elisa_SOURCES resources.qrc)
-     set_property(SOURCE qrc_resources.cpp PROPERTY SKIP_AUTOMOC ON)
+    set_property(SOURCE qrc_resources.cpp PROPERTY SKIP_AUTOMOC ON)
 
     set(elisa_ICONS_PNG
         ../icons/128-apps-elisa.png
         ../icons/64-apps-elisa.png
         ../icons/48-apps-elisa.png
         ../icons/32-apps-elisa.png
         ../icons/22-apps-elisa.png
         ../icons/16-apps-elisa.png
-    )
+        )
 
     # add icons to application sources, to have them bundled
     ecm_add_app_icon(elisa_SOURCES ICONS ${elisa_ICONS_PNG})
@@ -350,36 +373,36 @@
 
     target_link_libraries(elisa
         LINK_PRIVATE
-            elisaLib
-            Qt5::Widgets Qt5::QuickControls2 Qt5::Svg
-            KF5::I18n KF5::CoreAddons KF5::ConfigCore KF5::ConfigGui
-    )
+        elisaLib
+        Qt5::Widgets Qt5::QuickControls2
+        KF5::I18n KF5::CoreAddons KF5::ConfigCore KF5::ConfigGui
+        )
 
     if (ANDROID)
         target_link_libraries(elisa
             LINK_PRIVATE
-            Qt5::AndroidExtras
+            Qt5::AndroidExtras Qt5::Svg Qt5::Sql Qt5::Concurrent KF5::Kirigami2
         )
     endif()
 
     if (KF5Crash_FOUND)
         target_link_libraries(elisa
             LINK_PRIVATE
             KF5::Crash
-        )
+            )
     endif()
 
     if (KF5Declarative_FOUND)
         target_link_libraries(elisa
             LINK_PRIVATE
-                KF5::Declarative
-        )
+            KF5::Declarative
+            )
     endif()
 
     if (NOT APPLE AND NOT WIN32)
         set_target_properties(elisa PROPERTIES
             INSTALL_RPATH "${KDE_INSTALL_FULL_LIBDIR}/elisa;${CMAKE_INSTALL_RPATH}"
-        )
+            )
     endif()
 
     install(TARGETS elisa ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -392,27 +415,31 @@
 set(elisaImport_SOURCES
     elisaimport.cpp
     elisaimportapplication.cpp
-)
+    )
 
 kconfig_add_kcfg_files(elisaImport_SOURCES ../src/elisa_settings.kcfgc )
 set(elisaImport_SOURCES
     ${elisaImport_SOURCES}
     ../src/elisa_core.kcfg
-)
+    )
 
 add_executable(elisaImport ${elisaImport_SOURCES})
 
 target_link_libraries(elisaImport
     LINK_PRIVATE
-        KF5::ConfigCore KF5::ConfigGui
-        elisaLib
-)
+    KF5::ConfigCore KF5::ConfigGui
+    elisaLib
+    )
 
 if (KF5FileMetaData_FOUND)
     target_link_libraries(elisaImport
         LINK_PRIVATE
-            KF5::FileMetaData
-    )
+        KF5::FileMetaData
+        )
 endif()
 
 set(QML_IMPORT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "qml import path" FORCE)
+
+if (ANDROID)
+    kirigami_package_breeze_icons(ICONS elisa)
+endif()
diff --git a/src/android/AlbumsView.qml b/src/android/AlbumsView.qml
new file mode 100644
--- /dev/null
+++ b/src/android/AlbumsView.qml
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import org.kde.kirigami 2.5 as Kirigami
+import org.kde.elisa 1.0
+
+Kirigami.Page {
+    id: pageElement
+
+    property bool isSubPage: false
+    property string mainTitle
+    property string secondaryTitle
+    property url image
+    property var contentModel: elisa.allAlbumsProxyModel
+    property bool showRating: false
+    property bool delegateDisplaySecondaryText: true
+    property bool expandedFilterView: false
+    property var stackView
+
+    title: i18nc("Title of the view of all albums", "Albums")
+
+    GridView {
+        id: gridView
+
+        focus: true
+        anchors.fill: parent
+
+        cellWidth: gridView.width / 2
+        cellHeight: gridView.width / 2
+
+        model: contentModel
+
+        delegate: GridBrowserDelegate {
+            width: gridView.cellWidth
+            height: gridView.cellHeight
+
+            focus: true
+
+            isPartial: false
+
+            mainText: model.display
+            secondaryText: if (pageElement.delegateDisplaySecondaryText) {model.secondaryText} else {""}
+            imageUrl: model.imageUrl
+            shadowForImage: if (model.shadowForImage) {model.shadowForImage} else {false}
+            containerData: model.containerData
+            delegateDisplaySecondaryText: pageElement.delegateDisplaySecondaryText
+
+            onEnqueue: elisa.mediaPlayList.enqueue(data)
+            onReplaceAndPlay: elisa.mediaPlayList.replaceAndPlay(data)
+            onOpen: pageElement.open(model.display, model.secondaryText, model.imageUrl, model.databaseId)
+            onSelected: {
+                forceActiveFocus()
+                contentDirectoryView.currentIndex = model.index
+            }
+        }
+    }
+}
diff --git a/src/android/AndroidTheme.qml b/src/android/AndroidTheme.qml
--- a/src/android/AndroidTheme.qml
+++ b/src/android/AndroidTheme.qml
@@ -15,9 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.7
+import QtQuick.Controls 2.2
+import org.kde.elisa 1.0
 
-Item {
+BaseTheme {
     property string albumCover: 'media-optical-audio.svg'
     property string artistImage: 'view-media-artist.svg'
     property string clearIcon: 'edit-clear.svg'
diff --git a/src/android/ArtistsView.qml b/src/android/ArtistsView.qml
new file mode 100644
--- /dev/null
+++ b/src/android/ArtistsView.qml
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import org.kde.kirigami 2.5 as Kirigami
+import org.kde.elisa 1.0
+
+Kirigami.Page {
+    id: pageElement
+
+    property bool isSubPage: false
+    property string mainTitle
+    property string secondaryTitle
+    property url image
+    property var contentModel: elisa.allArtistsProxyModel
+    property bool showRating: false
+    property bool delegateDisplaySecondaryText: true
+    property bool expandedFilterView: false
+    property var stackView
+
+    title: i18nc("Title of the view of all artists", "Artists")
+
+    GridView {
+        id: gridView
+
+        focus: true
+        anchors.fill: parent
+
+        cellWidth: gridView.width / 2
+        cellHeight: gridView.width / 2
+
+        model: contentModel
+
+        delegate: GridBrowserDelegate {
+            width: gridView.cellWidth
+            height: gridView.cellHeight
+
+            focus: true
+
+            isPartial: false
+
+            mainText: model.display
+            secondaryText: if (pageElement.delegateDisplaySecondaryText) {model.secondaryText} else {""}
+            imageUrl: model.imageUrl
+            shadowForImage: if (model.shadowForImage) {model.shadowForImage} else {false}
+            containerData: model.containerData
+            delegateDisplaySecondaryText: pageElement.delegateDisplaySecondaryText
+
+            onEnqueue: elisa.mediaPlayList.enqueue(data)
+            onReplaceAndPlay: elisa.mediaPlayList.replaceAndPlay(data)
+            onOpen: pageElement.open(model.display, model.secondaryText, model.imageUrl, model.databaseId)
+            onSelected: {
+                forceActiveFocus()
+                contentDirectoryView.currentIndex = model.index
+            }
+        }
+    }
+}
diff --git a/src/android/ElisaMainWindow.qml b/src/android/ElisaMainWindow.qml
--- a/src/android/ElisaMainWindow.qml
+++ b/src/android/ElisaMainWindow.qml
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
+ * Copyright 2016-2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program is free software: you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -15,19 +15,30 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.3
+import QtQuick 2.7
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.1
 import QtQuick.Window 2.2
-import QtQml.Models 2.1
+import Qt.labs.settings 1.0
+import org.kde.kirigami 2.5 as Kirigami
 import org.kde.elisa 1.0
 
-ApplicationWindow {
+Kirigami.ApplicationWindow {
     id: mainWindow
 
     visible: true
 
-    title: 'Elisa'
+    globalDrawer: Kirigami.GlobalDrawer {
+        id: drawer
+        title: "Elisa"
+        titleIcon: "elisa"
+        contentItem.implicitWidth: Math.min (Kirigami.Units.gridUnit * 15, mainWindow.width * 0.8)
+    }
+
+    LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
+    LayoutMirroring.childrenInherit: true
+
+    title: i18n("Elisa")
 
     SystemPalette {
         id: myPalette
@@ -38,525 +49,86 @@
         id: elisaTheme
     }
 
-    property string globalBrowseFlag: 'BrowseDirectChildren'
-    property string globalFilter: '*'
-    property string globalSortCriteria: ''
-
-    PlatformIntegration {
-        id: platformInterface
+    Settings {
+        id: persistentSettings
 
-        playListModel: playListModelItem
-        playListControler: playListControlerItem
-        audioPlayerManager: manageAudioPlayer
-        headerBarManager: myHeaderBarManager
-        manageMediaPlayerControl: myPlayControlManager
+        property var playListState
 
-        onRaisePlayer:
-        {
-            mainWindow.raise()
-            mainWindow.requestActivate()
-        }
-    }
+        property var audioPlayerState
 
-    MusicListenersManager {
-        id: allListeners
-    }
+        property double playControlItemVolume : 100.0
+        property bool playControlItemMuted : false
 
-    AudioWrapper {
-        id: audioPlayer
+        property bool playControlItemRepeat : false
+        property bool playControlItemShuffle : false
 
-        audioRole: Audio.MusicRole
+        property bool expandedFilterView: false
 
-        muted: playControlItem.muted
-
-        volume: playControlItem.volume * 100
-
-        onVolumeChanged: playControlItem.volume = volume / 100.0
-        onMutedChanged: playControlItem.muted = muted
-
-        source: manageAudioPlayer.playerSource
-
-        onPlaying: {
-            myPlayControlManager.playerPlaying()
-        }
-
-        onPaused: {
-            myPlayControlManager.playerPaused()
-        }
-
-        onStopped: {
-            myPlayControlManager.playerStopped()
-        }
+        property bool showPlaylist: true
     }
 
-    MediaPlayList {
-        id: playListModelItem
-
-        persistentState: persistentSettings.playListState
-        musicListenersManager: allListeners
-    }
-
-    PlayListControler {
-        id: playListControlerItem
-
-        playListModel: playListModelItem
-
-        isValidRole: MediaPlayList.IsValidRole
-
-        onPlayListFinished: manageAudioPlayer.playListFinished()
-
-        persistentState: persistentSettings.playListControlerState
-
-        Component.onCompleted:
+    Connections {
+        target: Qt.application
+        onAboutToQuit:
         {
-            var d = new Date();
-            var n = d.getMilliseconds();
-            seedRandomGenerator(n);
+            persistentSettings.playListState = elisa.mediaPlayList.persistentState;
+            persistentSettings.audioPlayerState = elisa.audioControl.persistentState
         }
     }
 
-    ManageHeaderBar {
-        id: myHeaderBarManager
-
-        playListModel: playListModelItem
-        currentTrack: playListControlerItem.currentTrack
-
-        artistRole: MediaPlayList.ArtistRole
-        titleRole: MediaPlayList.TitleRole
-        albumRole: MediaPlayList.AlbumRole
-        imageRole: MediaPlayList.ImageRole
-        albumIdRole: MediaPlayList.AlbumIdRole
-        isValidRole: MediaPlayList.IsValidRole
-    }
-
-    ManageAudioPlayer {
-        id: manageAudioPlayer
-
-        currentTrack: playListControlerItem.currentTrack
-        playListModel: playListModelItem
-        urlRole: MediaPlayList.ResourceRole
-        isPlayingRole: MediaPlayList.IsPlayingRole
-
-        playerStatus: audioPlayer.status
-        playerPlaybackState: audioPlayer.playbackState
-        playerError: audioPlayer.error
-        audioDuration: audioPlayer.duration
-        playerIsSeekable: audioPlayer.seekable
-        playerPosition: audioPlayer.position
-
-        persistentState: persistentSettings.audioPlayerState
-
-        onPlayerPlay: audioPlayer.play()
-        onPlayerPause: audioPlayer.pause()
-        onPlayerStop: audioPlayer.stop()
-        onSkipNextTrack: playListControlerItem.skipNextTrack()
-        onSeek: audioPlayer.seek(position)
-    }
-
-    ManageMediaPlayerControl {
-        id: myPlayControlManager
-
-        playListModel: playListModelItem
-        currentTrack: playListControlerItem.currentTrack
-    }
-
-    AllAlbumsModel {
-        id: allAlbumsModel
-    }
-
-    Connections {
-        target: allListeners
-
-        onAlbumAdded: allAlbumsModel.albumAdded(newAlbum)
-    }
-
     Connections {
-        target: allListeners
+        target: elisa.mediaPlayList
 
-        onAlbumRemoved: allAlbumsModel.albumRemoved(removedAlbum)
+        onPlayListLoadFailed: {
+            messageNotification.showNotification(i18nc("message of passive notification when playlist load failed", "Load of playlist failed"), 3000)
+        }
     }
 
-    Connections {
-        target: allListeners
+    pageStack.globalToolBar.style: Kirigami.ApplicationHeaderStyle.TabBar
 
-        onAlbumModified: allAlbumsModel.albumModified(modifiedAlbum)
-    }
+    Component {
+        id: albumsView
 
-    AllArtistsModel {
-        id: allArtistsModel
+        AlbumsView {
+        }
     }
 
-    Connections {
-        target: allListeners
+    Component {
+        id: artistsView
 
-        onArtistAdded: allArtistsModel.artistAdded(newArtist)
+        ArtistsView {
+        }
     }
 
-    Connections {
-        target: allListeners
+    Component {
+        id: tracksView
 
-        onArtistRemoved: allArtistsModel.artistRemoved(removedArtist)
+        TracksView {
+        }
     }
 
-    Connections {
-        target: allListeners
+    Component {
+        id: genresView
 
-        onArtistModified: allArtistsModel.artistModified(modifiedArtist)
+        GenresView {
+        }
     }
 
-    Rectangle {
-        color: myPalette.base
-        anchors.fill: parent
-
-        ColumnLayout {
-            anchors.fill: parent
-            spacing: 0
-
-            HeaderBar {
-                id: headerBar
+    Component.onCompleted:
+    {
+        elisa.initialize()
 
-                Layout.preferredHeight: Screen.pixelDensity * 40.
-                Layout.minimumHeight: Screen.pixelDensity * 40.
-                Layout.maximumHeight: Screen.pixelDensity * 40.
-                Layout.fillWidth: true
-
-                tracksCount: myHeaderBarManager.remainingTracks
-                album: myHeaderBarManager.album
-                title: myHeaderBarManager.title
-                artist: myHeaderBarManager.artist
-                image: myHeaderBarManager.image
-
-                ratingVisible: false
-
-                Rectangle {
-                    anchors.fill: menuButton
-
-                    z: 1
-
-                    radius: width / 2
-
-                    color: myPalette.window
-                }
-            }
-
-            MediaPlayerControl {
-                id: playControlItem
-
-                duration: audioPlayer.duration
-                seekable: audioPlayer.seekable
-
-                volume: persistentSettings.playControlItemVolume
-                muted: persistentSettings.playControlItemMuted
-                position: audioPlayer.position
-                skipBackwardEnabled: myPlayControlManager.skipBackwardControlEnabled
-                skipForwardEnabled: myPlayControlManager.skipForwardControlEnabled
-                playEnabled: myPlayControlManager.playControlEnabled
-                isPlaying: myPlayControlManager.musicPlaying
-
-                Layout.preferredHeight: Screen.pixelDensity * 12.
-                Layout.minimumHeight: Layout.preferredHeight
-                Layout.maximumHeight: Layout.preferredHeight
-                Layout.fillWidth: true
-
-                onSeek: audioPlayer.seek(position)
-
-                onPlay: manageAudioPlayer.playPause()
-                onPause: manageAudioPlayer.playPause()
-
-                onPlayPrevious: playListControlerItem.skipPreviousTrack()
-                onPlayNext: playListControlerItem.skipNextTrack()
-            }
-
-            RowLayout {
-                Layout.fillHeight: true
-                Layout.fillWidth: true
-                spacing: 0
-
-                Rectangle {
-                    color: myPalette.window
-
-                    Layout.fillHeight: true
-                    Layout.preferredWidth: Screen.pixelDensity * 50.
-                    Layout.minimumWidth: Screen.pixelDensity * 50.
-                    Layout.maximumWidth: Screen.pixelDensity * 50.
-                }
-
-                Item {
-                    Layout.fillHeight: true
-                    Layout.fillWidth: true
-
-                    RowLayout {
-                        anchors.fill: parent
-                        spacing: 0
-
-                        id: contentZone
-
-                        Item {
-                            id: mainContentView
-
-                            Layout.leftMargin: Screen.pixelDensity * 0.5
-                            Layout.rightMargin: Screen.pixelDensity * 0.5
-
-                            Layout.fillHeight: true
-
-                            Layout.minimumWidth: 0
-                            Layout.maximumWidth: 0
-                            Layout.preferredWidth: 0
-
-                            //z: 1
-                            visible: Layout.minimumWidth != 0
-
-                            MediaBrowser {
-                                id: localAlbums
-
-                                anchors.fill: parent
-
-                                firstPage: MediaAllAlbumView {
-                                    playListModel: playListModelItem
-                                    playerControl: manageAudioPlayer
-                                    stackView: localAlbums.stackView
-                                    musicListener: allListeners
-                                    contentDirectoryModel: allAlbumsModel
-                                }
-
-                                visible: opacity > 0
-                            }
-
-                            MediaBrowser {
-                                id: localArtists
-
-                                anchors.fill: parent
-
-                                firstPage: MediaAllArtistView {
-                                    playListModel: playListModelItem
-                                    artistsModel: allArtistsModel
-                                    playerControl: manageAudioPlayer
-                                    stackView: localArtists.stackView
-                                    musicListener: allListeners
-                                    contentDirectoryModel: allAlbumsModel
-                                }
-
-                                visible: opacity > 0
-                            }
-                        }
-
-                        Rectangle {
-                            id: firstViewSeparatorItem
-
-                            border.width: 1
-                            border.color: myPalette.mid
-                            color: myPalette.mid
-                            visible: true
-
-                            Layout.bottomMargin: Screen.pixelDensity * 0.5
-                            Layout.topMargin: Screen.pixelDensity * 0.5
-
-                            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
-
-                            Layout.preferredHeight: parent.height - Screen.pixelDensity * 5.
-                            Layout.minimumHeight: parent.height - Screen.pixelDensity * 5.
-                            Layout.maximumHeight: parent.height - Screen.pixelDensity * 5.
-
-                            Layout.preferredWidth: 1
-                            Layout.minimumWidth: 1
-                            Layout.maximumWidth: 1
-                        }
-
-                        MediaPlayListView {
-                            id: playList
-
-                            playListModel: playListModelItem
-                            playListControler: playListControlerItem
-
-                            randomPlayChecked: playListControlerItem.randomPlayControl
-                            repeatPlayChecked: playListControlerItem.repeatPlayControl
-
-                            Layout.fillHeight: true
-
-                            Layout.minimumWidth: contentZone.width
-                            Layout.maximumWidth: contentZone.width
-                            Layout.preferredWidth: contentZone.width
-
-                            Component.onCompleted:
-                            {
-                                playListControlerItem.randomPlay = Qt.binding(function() { return playList.randomPlayChecked })
-                                playListControlerItem.repeatPlay = Qt.binding(function() { return playList.repeatPlayChecked })
-                                myPlayControlManager.randomOrContinuePlay = Qt.binding(function() { return playList.randomPlayChecked || playList.repeatPlayChecked })
-                            }
-                        }
-
-                        Rectangle {
-                            id: viewSeparatorItem
-
-                            border.width: 1
-                            border.color: myPalette.mid
-                            color: myPalette.mid
-                            visible: Layout.minimumWidth != 0
-
-                            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
-
-                            Layout.preferredHeight: parent.height - Screen.pixelDensity * 5.
-
-                            Layout.preferredWidth: 1
-                            Layout.minimumWidth: 1
-                            Layout.maximumWidth: 1
-                        }
-
-                        ContextView {
-                            id: albumContext
-
-                            Layout.fillHeight: true
-
-                            Layout.minimumWidth: contentZone.width
-                            Layout.maximumWidth: contentZone.width
-                            Layout.preferredWidth: contentZone.width
-
-                            visible: Layout.minimumWidth != 0
-
-                            artistName: myHeaderBarManager.artist
-                            albumName: myHeaderBarManager.album
-                            albumArtUrl: myHeaderBarManager.image
-                        }
-                    }
+        if (persistentSettings.playListState) {
+            elisa.mediaPlayList.persistentState = persistentSettings.playListState
+        }
 
-                    states: [
-                        State {
-                            name: 'allAlbums'
-                            when: viewModeView.currentRow === 1
-                            PropertyChanges {
-                                target: mainContentView
-                                Layout.minimumWidth: contentZone.width * 0.66
-                                Layout.maximumWidth: contentZone.width * 0.66
-                                Layout.preferredWidth: contentZone.width * 0.66
-                            }
-                            PropertyChanges {
-                                target: firstViewSeparatorItem
-                                Layout.minimumWidth: 1
-                                Layout.maximumWidth: 1
-                                Layout.preferredWidth: 1
-                            }
-                            PropertyChanges {
-                                target: playList
-                                Layout.minimumWidth: contentZone.width * 0.33
-                                Layout.maximumWidth: contentZone.width * 0.33
-                                Layout.preferredWidth: contentZone.width * 0.33
-                            }
-                            PropertyChanges {
-                                target: viewSeparatorItem
-                                Layout.minimumWidth: 0
-                                Layout.maximumWidth: 0
-                                Layout.preferredWidth: 0
-                            }
-                            PropertyChanges {
-                                target: albumContext
-                                Layout.minimumWidth: 0
-                                Layout.maximumWidth: 0
-                                Layout.preferredWidth: 0
-                            }
-                            PropertyChanges {
-                                target: localAlbums
-                                opacity: 1
-                            }
-                            PropertyChanges {
-                                target: localArtists
-                                opacity: 0
-                            }
-                        },
-                        State {
-                            name: 'allArtists'
-                            when: viewModeView.currentRow === 2
-                            PropertyChanges {
-                                target: mainContentView
-                                Layout.minimumWidth: contentZone.width * 0.66
-                                Layout.maximumWidth: contentZone.width * 0.66
-                                Layout.preferredWidth: contentZone.width * 0.66
-                            }
-                            PropertyChanges {
-                                target: firstViewSeparatorItem
-                                Layout.minimumWidth: 1
-                                Layout.maximumWidth: 1
-                                Layout.preferredWidth: 1
-                            }
-                            PropertyChanges {
-                                target: playList
-                                Layout.minimumWidth: contentZone.width * 0.33
-                                Layout.maximumWidth: contentZone.width * 0.33
-                                Layout.preferredWidth: contentZone.width * 0.33
-                            }
-                            PropertyChanges {
-                                target: viewSeparatorItem
-                                Layout.minimumWidth: 0
-                                Layout.maximumWidth: 0
-                                Layout.preferredWidth: 0
-                            }
-                            PropertyChanges {
-                                target: albumContext
-                                Layout.minimumWidth: 0
-                                Layout.maximumWidth: 0
-                                Layout.preferredWidth: 0
-                            }
-                            PropertyChanges {
-                                target: localAlbums
-                                opacity: 0
-                            }
-                            PropertyChanges {
-                                target: localArtists
-                                opacity: 1
-                            }
-                        },
-                        State {
-                            name: 'full'
-                            when: viewModeView.currentRow == 0
-                            PropertyChanges {
-                                target: mainContentView
-                                Layout.minimumWidth: 0
-                                Layout.maximumWidth: 0
-                                Layout.preferredWidth: 0
-                            }
-                            PropertyChanges {
-                                target: firstViewSeparatorItem
-                                Layout.minimumWidth: 0
-                                Layout.maximumWidth: 0
-                                Layout.preferredWidth: 0
-                            }
-                            PropertyChanges {
-                                target: playList
-                                Layout.minimumWidth: contentZone.width / 2
-                                Layout.maximumWidth: contentZone.width / 2
-                                Layout.preferredWidth: contentZone.width / 2
-                            }
-                            PropertyChanges {
-                                target: viewSeparatorItem
-                                Layout.minimumWidth: 1
-                                Layout.maximumWidth: 1
-                                Layout.preferredWidth: 1
-                            }
-                            PropertyChanges {
-                                target: albumContext
-                                Layout.minimumWidth: contentZone.width / 2
-                                Layout.maximumWidth: contentZone.width / 2
-                                Layout.preferredWidth: contentZone.width / 2
-                            }
-                            PropertyChanges {
-                                target: localAlbums
-                                opacity: 0
-                            }
-                            PropertyChanges {
-                                target: localArtists
-                                opacity: 0
-                            }
-                        }
-                    ]
-                    transitions: Transition {
-                        NumberAnimation {
-                            properties: "Layout.minimumWidth, Layout.maximumWidth, Layout.preferredWidth, opacity"
-                            easing.type: Easing.InOutQuad
-                            duration: 300
-                        }
-                    }
-                }
-            }
+        if (persistentSettings.audioPlayerState) {
+            elisa.audioControl.persistentState = persistentSettings.audioPlayerState
         }
+
+        pageStack.push(albumsView)
+        pageStack.push(artistsView)
+        pageStack.push(tracksView)
+        pageStack.push(genresView)
     }
 }
-
diff --git a/src/android/GenresView.qml b/src/android/GenresView.qml
new file mode 100644
--- /dev/null
+++ b/src/android/GenresView.qml
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import org.kde.kirigami 2.5 as Kirigami
+import org.kde.elisa 1.0
+
+Kirigami.Page {
+    id: pageElement
+
+    property bool isSubPage: false
+    property string mainTitle
+    property string secondaryTitle
+    property url image
+    property var contentModel: elisa.allGenresProxyModel
+    property bool showRating: false
+    property bool delegateDisplaySecondaryText: true
+    property bool expandedFilterView: false
+    property var stackView
+
+    title: i18nc("Title of the view of all genres", "Genres")
+
+    GridView {
+        id: gridView
+
+        focus: true
+        anchors.fill: parent
+
+        cellWidth: gridView.width / 2
+        cellHeight: gridView.width / 2
+
+        model: contentModel
+
+        delegate: GridBrowserDelegate {
+            width: gridView.cellWidth
+            height: gridView.cellHeight
+
+            focus: true
+
+            isPartial: false
+
+            mainText: model.display
+            secondaryText: if (pageElement.delegateDisplaySecondaryText) {model.secondaryText} else {""}
+            imageUrl: model.imageUrl
+            shadowForImage: if (model.shadowForImage) {model.shadowForImage} else {false}
+            containerData: model.containerData
+            delegateDisplaySecondaryText: pageElement.delegateDisplaySecondaryText
+
+            onEnqueue: elisa.mediaPlayList.enqueue(data)
+            onReplaceAndPlay: elisa.mediaPlayList.replaceAndPlay(data)
+            onOpen: pageElement.open(model.display, model.secondaryText, model.imageUrl, model.databaseId)
+            onSelected: {
+                forceActiveFocus()
+                contentDirectoryView.currentIndex = model.index
+            }
+        }
+    }
+}
diff --git a/src/android/TracksView.qml b/src/android/TracksView.qml
new file mode 100644
--- /dev/null
+++ b/src/android/TracksView.qml
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import org.kde.kirigami 2.5 as Kirigami
+import org.kde.elisa 1.0
+
+Kirigami.Page {
+    id: pageElement
+
+    property bool isSubPage: false
+    property string mainTitle
+    property string secondaryTitle
+    property url image
+    property var contentModel: elisa.allTracksProxyModel
+    property bool showRating: false
+    property bool delegateDisplaySecondaryText: true
+    property bool expandedFilterView: false
+    property var stackView
+
+    title: i18nc("Title of the view of all tracks", "Tracks")
+
+    GridView {
+        id: gridView
+
+        focus: true
+        anchors.fill: parent
+
+        cellWidth: gridView.width / 2
+        cellHeight: gridView.width / 2
+
+        model: contentModel
+
+        delegate: GridBrowserDelegate {
+            width: gridView.cellWidth
+            height: gridView.cellHeight
+
+            focus: true
+
+            isPartial: false
+
+            mainText: model.display
+            secondaryText: if (pageElement.delegateDisplaySecondaryText) {model.secondaryText} else {""}
+            imageUrl: model.imageUrl
+            shadowForImage: if (model.shadowForImage) {model.shadowForImage} else {false}
+            containerData: model.containerData
+            delegateDisplaySecondaryText: pageElement.delegateDisplaySecondaryText
+
+            onEnqueue: elisa.mediaPlayList.enqueue(data)
+            onReplaceAndPlay: elisa.mediaPlayList.replaceAndPlay(data)
+            onOpen: pageElement.open(model.display, model.secondaryText, model.imageUrl, model.databaseId)
+            onSelected: {
+                forceActiveFocus()
+                contentDirectoryView.currentIndex = model.index
+            }
+        }
+    }
+}
diff --git a/src/android/androidmusiclistener.h b/src/android/androidmusiclistener.h
new file mode 100644
--- /dev/null
+++ b/src/android/androidmusiclistener.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef ANDROIDMUSICLISTENER_H
+#define ANDROIDMUSICLISTENER_H
+
+#include "notificationitem.h"
+
+#include <QObject>
+#include <QList>
+#include <QHash>
+#include <QUrl>
+#include <QString>
+
+#include <memory>
+
+class DatabaseInterface;
+class MusicAudioTrack;
+class AndroidMusicListenerPrivate;
+
+class AndroidMusicListener : public QObject
+{
+
+    Q_OBJECT
+
+    Q_PROPERTY(DatabaseInterface* databaseInterface
+               READ databaseInterface
+               WRITE setDatabaseInterface
+               NOTIFY databaseInterfaceChanged)
+
+public:
+
+    explicit AndroidMusicListener(QObject *parent = nullptr);
+
+    ~AndroidMusicListener() override;
+
+    DatabaseInterface* databaseInterface() const;
+
+    static void registerNativeMethods();
+
+    static AndroidMusicListener* currentInstance();
+
+    void androidMusicTracksScanStarted();
+
+    void newMusicTrack(const QString &trackDescription);
+
+    void androidMusicTracksScanFinished();
+
+    void androidMusicAlbumsScanStarted();
+
+    void newMusicAlbum(const QString &albumDescription);
+
+    void androidMusicAlbumsScanFinished();
+
+Q_SIGNALS:
+
+    void databaseInterfaceChanged();
+
+    void indexingStarted();
+
+    void indexingFinished();
+
+    void clearDatabase(const QString &listenerName);
+
+    void newNotification(NotificationItem notification);
+
+    void closeNotification(QString notificationId);
+
+    void tracksList(const QList<MusicAudioTrack> &tracks, const QHash<QString, QUrl> &covers, const QString &musicSource);
+
+    void removedTracksList(const QList<QUrl> &removedTracks);
+
+    void modifyTracksList(const QList<MusicAudioTrack> &modifiedTracks, const QHash<QString, QUrl> &covers, const QString &musicSource);
+
+    void askRestoredTracks(const QString &musicSource);
+
+public Q_SLOTS:
+
+    void setDatabaseInterface(DatabaseInterface* databaseInterface);
+
+    void applicationAboutToQuit();
+
+    void quitListener();
+
+    void restoredTracks(const QString &musicSource, QHash<QUrl, QDateTime> allFiles);
+
+    void init();
+
+private:
+
+    static AndroidMusicListener* mCurrentInstance;
+
+    std::unique_ptr<AndroidMusicListenerPrivate> d;
+
+};
+
+#endif // ANDROIDMUSICLISTENER_H
diff --git a/src/android/androidmusiclistener.cpp b/src/android/androidmusiclistener.cpp
new file mode 100644
--- /dev/null
+++ b/src/android/androidmusiclistener.cpp
@@ -0,0 +1,222 @@
+/*
+ * Copyright 2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "androidmusiclistener.h"
+
+#include "databaseinterface.h"
+
+#include <QDateTime>
+#include <QMetaObject>
+
+// C++ code
+#include <jni.h>
+#include <QAndroidJniObject>
+#include <QAndroidJniEnvironment>
+#include <QtAndroid>
+#include <QDebug>
+
+class AndroidMusicListenerPrivate
+{
+public:
+
+    QString mSourceName;
+
+    QHash<QUrl, QDateTime> mAllFiles;
+
+    QList<MusicAudioTrack> mNewTracks;
+    QHash<QString, QUrl> mCovers;
+
+};
+
+static void tracksAndroidScanStarted(JNIEnv */*env*/, jobject /*obj*/)
+{
+    AndroidMusicListener::currentInstance()->androidMusicTracksScanStarted();
+}
+
+static void sentMusicFile(JNIEnv */*env*/, jobject /*obj*/, jstring musicFile)
+{
+    QAndroidJniObject musicFileJavaString(musicFile);
+    AndroidMusicListener::currentInstance()->newMusicTrack(musicFileJavaString.toString());
+}
+
+static void tracksAndroidScanFinished(JNIEnv */*env*/, jobject /*obj*/)
+{
+    AndroidMusicListener::currentInstance()->androidMusicTracksScanFinished();
+}
+
+static void albumsAndroidScanStarted(JNIEnv */*env*/, jobject /*obj*/)
+{
+    AndroidMusicListener::currentInstance()->androidMusicAlbumsScanStarted();
+}
+
+static void sentMusicAlbum(JNIEnv */*env*/, jobject /*obj*/, jstring musicAlbum)
+{
+    QAndroidJniObject musicAlbumJavaString(musicAlbum);
+    AndroidMusicListener::currentInstance()->newMusicAlbum(musicAlbumJavaString.toString());
+}
+
+static void albumsAndroidScanFinished(JNIEnv */*env*/, jobject /*obj*/)
+{
+    AndroidMusicListener::currentInstance()->androidMusicAlbumsScanFinished();
+}
+
+AndroidMusicListener::AndroidMusicListener(QObject *parent) : QObject(parent), d(std::make_unique<AndroidMusicListenerPrivate>())
+{
+    AndroidMusicListener::mCurrentInstance = this;
+
+    d->mSourceName = QStringLiteral("Android");
+
+    registerNativeMethods();
+}
+
+DatabaseInterface *AndroidMusicListener::databaseInterface() const
+{
+    return nullptr;
+}
+
+void AndroidMusicListener::registerNativeMethods()
+{
+    JNINativeMethod methods[] {{"androidMusicScanTracksStarting", "()V", reinterpret_cast<void *>(tracksAndroidScanStarted)},
+        {"sendMusicFile", "(Ljava/lang/String;)V", reinterpret_cast<void *>(sentMusicFile)},
+        {"androidMusicScanTracksFinishing", "()V", reinterpret_cast<void *>(tracksAndroidScanFinished)},
+        {"androidMusicScanAlbumsStarting", "()V", reinterpret_cast<void *>(albumsAndroidScanStarted)},
+        {"sendMusicAlbum", "(Ljava/lang/String;)V", reinterpret_cast<void *>(sentMusicAlbum)},
+        {"androidMusicScanAlbumsFinishing", "()V", reinterpret_cast<void *>(albumsAndroidScanFinished)},
+    };
+
+    QAndroidJniObject javaClass("org/kde/elisa/ElisaAndroidMusicScanner");
+    QAndroidJniEnvironment env;
+    jclass objectClass = env->GetObjectClass(javaClass.object<jobject>());
+    env->RegisterNatives(objectClass,
+                         methods,
+                         sizeof(methods) / sizeof(methods[0]));
+    env->DeleteLocalRef(objectClass);
+}
+
+AndroidMusicListener *AndroidMusicListener::mCurrentInstance = nullptr;
+
+AndroidMusicListener *AndroidMusicListener::currentInstance()
+{
+    return mCurrentInstance;
+}
+
+void AndroidMusicListener::androidMusicTracksScanStarted()
+{
+}
+
+void AndroidMusicListener::newMusicTrack(const QString &trackDescription)
+{
+    auto trackData = trackDescription.split(QStringLiteral("||"));
+    auto newTrack = MusicAudioTrack{};
+    newTrack.setTitle(trackData[1]);
+    bool conversionOK = false;
+    if (trackData[2] != QStringLiteral("null")) {
+        newTrack.setTrackNumber(trackData[2].toInt(&conversionOK));
+        if (!conversionOK) {
+            qInfo() << "newMusicTrack" << trackData[1] << trackData[2];
+        }
+    }
+    if (trackData[3] != QStringLiteral("null")) {
+        newTrack.setYear(trackData[3].toInt(&conversionOK));
+        if (!conversionOK) {
+            qInfo() << "newMusicTrack" << trackData[1] << trackData[3];
+        }
+    }
+    if (trackData[4] != QStringLiteral("null")) {
+        newTrack.setDuration(QTime::fromMSecsSinceStartOfDay(trackData[4].toInt()));
+    }
+    newTrack.setResourceURI(QUrl::fromLocalFile(trackData[5]));
+    newTrack.setArtist(trackData[6]);
+    newTrack.setAlbumName(trackData[8]);
+    newTrack.setComposer(trackData[10]);
+
+    d->mNewTracks.push_back(newTrack);
+}
+
+void AndroidMusicListener::androidMusicTracksScanFinished()
+{
+}
+
+void AndroidMusicListener::androidMusicAlbumsScanStarted()
+{
+}
+
+void AndroidMusicListener::newMusicAlbum(const QString &albumDescription)
+{
+    auto albumData = albumDescription.split(QStringLiteral("||"));
+
+    if (albumData[2] != QStringLiteral("null)")) {
+        d->mCovers[albumData[1]] = QUrl::fromLocalFile(albumData[2]);
+    }
+}
+
+void AndroidMusicListener::androidMusicAlbumsScanFinished()
+{
+    Q_EMIT tracksList(d->mNewTracks, d->mCovers, d->mSourceName);
+}
+
+void AndroidMusicListener::setDatabaseInterface(DatabaseInterface *model)
+{
+    if (model) {
+        connect(this, &AndroidMusicListener::tracksList, model, &DatabaseInterface::insertTracksList);
+        connect(this, &AndroidMusicListener::removedTracksList, model, &DatabaseInterface::removeTracksList);
+        connect(this, &AndroidMusicListener::modifyTracksList, model, &DatabaseInterface::modifyTracksList);
+        connect(this, &AndroidMusicListener::askRestoredTracks, model, &DatabaseInterface::askRestoredTracks);
+        connect(model, &DatabaseInterface::restoredTracks, this, &AndroidMusicListener::restoredTracks);
+    }
+
+    Q_EMIT databaseInterfaceChanged();
+
+    if (model) {
+        QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);
+    }
+}
+
+void AndroidMusicListener::applicationAboutToQuit()
+{
+}
+
+void AndroidMusicListener::quitListener()
+{
+    applicationAboutToQuit();
+
+    Q_EMIT clearDatabase(d->mSourceName);
+}
+
+void AndroidMusicListener::restoredTracks(const QString &musicSource, QHash<QUrl, QDateTime> allFiles)
+{
+    if (d->mSourceName == musicSource) {
+        d->mAllFiles = allFiles;
+
+        QAndroidJniObject::callStaticMethod<void>("org/kde/elisa/ElisaAndroidMusicScanner",
+                                                  "listAudioFiles",
+                                                  "(Landroid/content/Context;)V",
+                                                  QtAndroid::androidContext().object());
+    }
+}
+
+void AndroidMusicListener::init()
+{
+    Q_EMIT askRestoredTracks(d->mSourceName);
+}
+
+AndroidMusicListener::~AndroidMusicListener() = default;
+
+
+#include "moc_androidmusiclistener.cpp"
diff --git a/src/databaseinterface.cpp b/src/databaseinterface.cpp
--- a/src/databaseinterface.cpp
+++ b/src/databaseinterface.cpp
@@ -21,6 +21,8 @@
 
 #include <KI18n/KLocalizedString>
 
+#include <QCoreApplication>
+
 #include <QSqlDatabase>
 #include <QSqlDriver>
 #include <QSqlQuery>
@@ -263,6 +265,7 @@
 
 void DatabaseInterface::init(const QString &dbName, const QString &databaseFileName)
 {
+    qInfo() << QCoreApplication::libraryPaths();
     QSqlDatabase tracksDatabase = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"), dbName);
 
     if (!databaseFileName.isEmpty()) {
@@ -818,7 +821,7 @@
         for (auto artistId : qAsConst(d->mInsertedArtists)) {
             newArtists.push_back({{DatabaseIdRole, artistId}});
         }
-
+        qInfo() << "artistsAdded" << newArtists.size();
         Q_EMIT artistsAdded(newArtists);
     }
 
@@ -830,6 +833,7 @@
             newAlbums.push_back(internalOneAlbumPartialData(albumId));
         }
 
+        qInfo() << "albumsAdded" << newAlbums.size();
         Q_EMIT albumsAdded(newAlbums);
     }
 
@@ -845,6 +849,7 @@
             d->mModifiedTrackIds.remove(trackId);
         }
 
+        qInfo() << "tracksAdded" << newTracks.size();
         Q_EMIT tracksAdded(newTracks);
     }
 
diff --git a/src/main.cpp b/src/main.cpp
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -56,6 +56,10 @@
 #include <QQuickStyle>
 #include <QScreen>
 
+#if defined Qt5AndroidExtras_FOUND && Qt5AndroidExtras_FOUND
+#include <QAndroidService>
+#endif
+
 #include <memory>
 
 #if defined Qt5AndroidExtras_FOUND && Qt5AndroidExtras_FOUND
@@ -69,12 +73,34 @@
 int main(int argc, char *argv[])
 #endif
 {
+#if defined Q_OS_ANDROID
+    if(argc > 1 && strcmp(argv[1], "-service") == 0){
+        QAndroidService app(argc, argv);
+        qInfo() << "Service starting...";
+
+        // My service stuff
+
+        return app.exec();
+    }
+
+    qInfo() << "Application starting...";
+#endif
+
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 
     qputenv("QT_GSTREAMER_USE_PLAYBIN_VOLUME", "true");
 
     QApplication app(argc, argv);
 
+#if defined Qt5AndroidExtras_FOUND && Qt5AndroidExtras_FOUND
+    qInfo() << QCoreApplication::arguments();
+
+    QAndroidJniObject::callStaticMethod<void>("org/kde/elisa/ElisaService",
+                                              "startMyService",
+                                              "(Landroid/content/Context;)V",
+                                              QtAndroid::androidContext().object());
+#endif
+
 #if defined KF5Crash_FOUND && KF5Crash_FOUND
     KCrash::initialize();
 #endif
@@ -109,15 +135,6 @@
     parser.process(app);
     aboutData.processCommandLine(&parser);
 
-#if defined Qt5AndroidExtras_FOUND && Qt5AndroidExtras_FOUND
-    qDebug() << QCoreApplication::arguments();
-
-    QAndroidJniObject::callStaticMethod<void>("com/kde/elisa/ElisaService",
-                                              "startMyService",
-                                              "(Landroid/content/Context;)V",
-                                              QtAndroid::androidContext().object());
-#endif
-
     QQuickStyle::setStyle(QStringLiteral("org.kde.desktop"));
     QQuickStyle::setFallbackStyle(QStringLiteral("Fusion"));
 
diff --git a/src/musiclistenersmanager.cpp b/src/musiclistenersmanager.cpp
--- a/src/musiclistenersmanager.cpp
+++ b/src/musiclistenersmanager.cpp
@@ -27,6 +27,10 @@
 #include "baloo/baloolistener.h"
 #endif
 
+#if defined Qt5AndroidExtras_FOUND && Qt5AndroidExtras_FOUND
+#include "android/androidmusiclistener.h"
+#endif
+
 #include "databaseinterface.h"
 #include "mediaplaylist.h"
 #include "file/filelistener.h"
@@ -71,6 +75,10 @@
 
     std::list<std::unique_ptr<FileListener>> mFileListener;
 
+#if defined Qt5AndroidExtras_FOUND && Qt5AndroidExtras_FOUND
+    std::unique_ptr<AndroidMusicListener> mAndroidMusicListener;
+#endif
+
     DatabaseInterface mDatabaseInterface;
 
     std::unique_ptr<TracksListener> mTracksListener;
@@ -271,6 +279,26 @@
             &d->mUpnpListener, &UpnpListener::applicationAboutToQuit, Qt::DirectConnection);
 #endif
 
+#if defined Qt5AndroidExtras_FOUND && Qt5AndroidExtras_FOUND
+    if (!d->mAndroidMusicListener) {
+        d->mAndroidMusicListener = std::make_unique<AndroidMusicListener>();
+        d->mAndroidMusicListener->moveToThread(&d->mListenerThread);
+        d->mAndroidMusicListener->setDatabaseInterface(&d->mDatabaseInterface);
+        connect(this, &MusicListenersManager::applicationIsTerminating,
+                d->mAndroidMusicListener.get(), &AndroidMusicListener::applicationAboutToQuit, Qt::DirectConnection);
+        connect(d->mAndroidMusicListener.get(), &AndroidMusicListener::indexingStarted,
+                this, &MusicListenersManager::monitorStartingListeners);
+        connect(d->mAndroidMusicListener.get(), &AndroidMusicListener::indexingFinished,
+                this, &MusicListenersManager::monitorEndingListeners);
+        connect(d->mAndroidMusicListener.get(), &AndroidMusicListener::clearDatabase,
+                &d->mDatabaseInterface, &DatabaseInterface::removeAllTracksFromSource);
+        connect(d->mAndroidMusicListener.get(), &AndroidMusicListener::newNotification,
+                this, &MusicListenersManager::newNotification);
+        connect(d->mAndroidMusicListener.get(), &AndroidMusicListener::closeNotification,
+                this, &MusicListenersManager::closeNotification);
+    }
+#endif
+
     if (currentConfiguration->elisaFilesIndexer())
     {
         const auto &allRootPaths = currentConfiguration->rootPath();
diff --git a/src/resources.qrc b/src/resources.qrc
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -51,5 +51,9 @@
         <file alias="ElisaMainWindow.qml">android/ElisaMainWindow.qml</file>
         <file alias="Theme.qml">android/AndroidTheme.qml</file>
         <file alias="PlatformIntegration.qml">android/PlatformIntegration.qml</file>
+        <file alias="AlbumsView.qml">android/AlbumsView.qml</file>
+        <file alias="ArtistsView.qml">android/ArtistsView.qml</file>
+        <file alias="TracksView.qml">android/TracksView.qml</file>
+        <file alias="GenresView.qml">android/GenresView.qml</file>
     </qresource>
 </RCC>