Merge branch 'development'

e515f918 · Anupam Basak · 454ddcf0 · e3146e72 · 454ddcf0 · e515f918
Commit e515f918 authored Nov 10, 2020 by Anupam Basak
--- a/3rdparty/taglib.pri
+++ b/3rdparty/taglib.pri
-    DEPENDPATH += $$PWD/taglib
-    DEPENDPATH += $$PWD/taglib/ape
-    DEPENDPATH += $$PWD/taglib/asf
-    DEPENDPATH += $$PWD/taglib/flac
-    DEPENDPATH += $$PWD/taglib/it
-    DEPENDPATH += $$PWD/taglib/mod
-    DEPENDPATH += $$PWD/taglib/mp4
-    DEPENDPATH += $$PWD/taglib/mpc
-    DEPENDPATH += $$PWD/taglib/mpeg
-    DEPENDPATH += $$PWD/taglib/mpeg/id3v1
-    DEPENDPATH += $$PWD/taglib/mpeg/id3v2
-    DEPENDPATH += $$PWD/taglib/mpeg/id3v2/frames
-    DEPENDPATH += $$PWD/taglib/ogg
-    DEPENDPATH += $$PWD/taglib/ogg/flac
-    DEPENDPATH += $$PWD/taglib/ogg/opus
-    DEPENDPATH += $$PWD/taglib/ogg/speex
-    DEPENDPATH += $$PWD/taglib/ogg/vorbis
-    DEPENDPATH += $$PWD/taglib/riff
-    DEPENDPATH += $$PWD/taglib/riff/aiff
-    DEPENDPATH += $$PWD/taglib/riff/wav
-    DEPENDPATH += $$PWD/taglib/s3m
-    DEPENDPATH += $$PWD/taglib/toolkit
-    DEPENDPATH += $$PWD/taglib/trueaudio
-    DEPENDPATH += $$PWD/taglib/wavpack
-    DEPENDPATH += $$PWD/taglib/xm
-
-
-    INCLUDEPATH += $$PWD/taglib
-    INCLUDEPATH += $$PWD/taglib/ape
-    INCLUDEPATH += $$PWD/taglib/asf
-    INCLUDEPATH += $$PWD/taglib/flac
-    INCLUDEPATH += $$PWD/taglib/it
-    INCLUDEPATH += $$PWD/taglib/mod
-    INCLUDEPATH += $$PWD/taglib/mp4
-    INCLUDEPATH += $$PWD/taglib/mpc
-    INCLUDEPATH += $$PWD/taglib/mpeg
-    INCLUDEPATH += $$PWD/taglib/mpeg/id3v1
-    INCLUDEPATH += $$PWD/taglib/mpeg/id3v2
-    INCLUDEPATH += $$PWD/taglib/mpeg/id3v2/frames
-    INCLUDEPATH += $$PWD/taglib/ogg
-    INCLUDEPATH += $$PWD/taglib/ogg/flac
-    INCLUDEPATH += $$PWD/taglib/ogg/opus
-    INCLUDEPATH += $$PWD/taglib/ogg/speex
-    INCLUDEPATH += $$PWD/taglib/ogg/vorbis
-    INCLUDEPATH += $$PWD/taglib/riff
-    INCLUDEPATH += $$PWD/taglib/riff/aiff
-    INCLUDEPATH += $$PWD/taglib/riff/wav
-    INCLUDEPATH += $$PWD/taglib/s3m
-    INCLUDEPATH += $$PWD/taglib/toolkit
-    INCLUDEPATH += $$PWD/taglib/trueaudio
-    INCLUDEPATH += $$PWD/taglib/wavpack
-    INCLUDEPATH += $$PWD/taglib/xm
-
-SOURCES +=    \
-    $$PWD/taglib/ape/apefile.cpp \
-    $$PWD/taglib/ape/apefooter.cpp \
-    $$PWD/taglib/ape/apeitem.cpp \
-    $$PWD/taglib/ape/apeproperties.cpp \
-    $$PWD/taglib/ape/apetag.cpp \
-    $$PWD/taglib/asf/asfattribute.cpp \
-    $$PWD/taglib/asf/asffile.cpp \
-    $$PWD/taglib/asf/asfpicture.cpp \
-    $$PWD/taglib/asf/asfproperties.cpp \
-    $$PWD/taglib/asf/asftag.cpp \
-    $$PWD/taglib/flac/flacfile.cpp \
-    $$PWD/taglib/flac/flacmetadatablock.cpp \
-    $$PWD/taglib/flac/flacpicture.cpp \
-    $$PWD/taglib/flac/flacproperties.cpp \
-    $$PWD/taglib/flac/flacunknownmetadatablock.cpp \
-    $$PWD/taglib/it/itfile.cpp \
-    $$PWD/taglib/it/itproperties.cpp \
-    $$PWD/taglib/mod/modfile.cpp \
-    $$PWD/taglib/mod/modfilebase.cpp \
-    $$PWD/taglib/mod/modproperties.cpp \
-    $$PWD/taglib/mod/modtag.cpp \
-    $$PWD/taglib/mp4/mp4atom.cpp \
-    $$PWD/taglib/mp4/mp4coverart.cpp \
-    $$PWD/taglib/mp4/mp4file.cpp \
-    $$PWD/taglib/mp4/mp4item.cpp \
-    $$PWD/taglib/mp4/mp4properties.cpp \
-    $$PWD/taglib/mp4/mp4tag.cpp \
-    $$PWD/taglib/mpc/mpcfile.cpp \
-    $$PWD/taglib/mpc/mpcproperties.cpp \
-    $$PWD/taglib/mpeg/id3v1/id3v1genres.cpp \
-    $$PWD/taglib/mpeg/id3v1/id3v1tag.cpp \
-    $$PWD/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp \
-    $$PWD/taglib/mpeg/id3v2/frames/commentsframe.cpp \
-    $$PWD/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp \
-    $$PWD/taglib/mpeg/id3v2/frames/ownershipframe.cpp \
-    $$PWD/taglib/mpeg/id3v2/frames/popularimeterframe.cpp \
-    $$PWD/taglib/mpeg/id3v2/frames/privateframe.cpp \
-    $$PWD/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp \
-    $$PWD/taglib/mpeg/id3v2/frames/textidentificationframe.cpp \
-    $$PWD/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp \
-    $$PWD/taglib/mpeg/id3v2/frames/unknownframe.cpp \
-    $$PWD/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp \
-    $$PWD/taglib/mpeg/id3v2/frames/urllinkframe.cpp \
-    $$PWD/taglib/mpeg/id3v2/id3v2extendedheader.cpp \
-    $$PWD/taglib/mpeg/id3v2/id3v2footer.cpp \
-    $$PWD/taglib/mpeg/id3v2/id3v2frame.cpp \
-    $$PWD/taglib/mpeg/id3v2/id3v2framefactory.cpp \
-    $$PWD/taglib/mpeg/id3v2/id3v2header.cpp \
-    $$PWD/taglib/mpeg/id3v2/id3v2synchdata.cpp \
-    $$PWD/taglib/mpeg/id3v2/id3v2tag.cpp \
-    $$PWD/taglib/mpeg/mpegfile.cpp \
-    $$PWD/taglib/mpeg/mpegheader.cpp \
-    $$PWD/taglib/mpeg/mpegproperties.cpp \
-    $$PWD/taglib/mpeg/xingheader.cpp \
-    $$PWD/taglib/ogg/flac/oggflacfile.cpp \
-    $$PWD/taglib/ogg/opus/opusfile.cpp \
-    $$PWD/taglib/ogg/opus/opusproperties.cpp \
-    $$PWD/taglib/ogg/speex/speexfile.cpp \
-    $$PWD/taglib/ogg/speex/speexproperties.cpp \
-    $$PWD/taglib/ogg/vorbis/vorbisfile.cpp \
-    $$PWD/taglib/ogg/vorbis/vorbisproperties.cpp \
-    $$PWD/taglib/ogg/oggfile.cpp \
-    $$PWD/taglib/ogg/oggpage.cpp \
-    $$PWD/taglib/ogg/oggpageheader.cpp \
-    $$PWD/taglib/ogg/xiphcomment.cpp \
-    $$PWD/taglib/riff/aiff/aifffile.cpp \
-    $$PWD/taglib/riff/aiff/aiffproperties.cpp \
-    $$PWD/taglib/riff/wav/infotag.cpp \
-    $$PWD/taglib/riff/wav/wavfile.cpp \
-    $$PWD/taglib/riff/wav/wavproperties.cpp \
-    $$PWD/taglib/riff/rifffile.cpp \
-    $$PWD/taglib/s3m/s3mfile.cpp \
-    $$PWD/taglib/s3m/s3mproperties.cpp \
-    $$PWD/taglib/toolkit/tbytevector.cpp \
-    $$PWD/taglib/toolkit/tbytevectorlist.cpp \
-    $$PWD/taglib/toolkit/tbytevectorstream.cpp \
-    $$PWD/taglib/toolkit/tdebug.cpp \
-    $$PWD/taglib/toolkit/tdebuglistener.cpp \
-    $$PWD/taglib/toolkit/tfile.cpp \
-    $$PWD/taglib/toolkit/tfilestream.cpp \
-    $$PWD/taglib/toolkit/tiostream.cpp \
-    $$PWD/taglib/toolkit/tpropertymap.cpp \
-    $$PWD/taglib/toolkit/trefcounter.cpp \
-    $$PWD/taglib/toolkit/tstring.cpp \
-    $$PWD/taglib/toolkit/tstringlist.cpp \
-    $$PWD/taglib/toolkit/unicode.cpp \
-    $$PWD/taglib/trueaudio/trueaudiofile.cpp \
-    $$PWD/taglib/trueaudio/trueaudioproperties.cpp \
-    $$PWD/taglib/wavpack/wavpackfile.cpp \
-    $$PWD/taglib/wavpack/wavpackproperties.cpp \
-    $$PWD/taglib/xm/xmfile.cpp \
-    $$PWD/taglib/xm/xmproperties.cpp \
-    $$PWD/taglib/audioproperties.cpp \
-    $$PWD/taglib/fileref.cpp \
-    $$PWD/taglib/tag.cpp \
-    $$PWD/taglib/tagunion.cpp \
-
-HEADERS += \
-    $$PWD/taglib/ape/apefile.h \
-    $$PWD/taglib/ape/apefooter.h \
-    $$PWD/taglib/ape/apeitem.h \
-    $$PWD/taglib/ape/apeproperties.h \
-    $$PWD/taglib/ape/apetag.h \
-    $$PWD/taglib/asf/asfattribute.h \
-    $$PWD/taglib/asf/asffile.h \
-    $$PWD/taglib/asf/asfpicture.h \
-    $$PWD/taglib/asf/asfproperties.h \
-    $$PWD/taglib/asf/asftag.h \
-    $$PWD/taglib/flac/flacfile.h \
-    $$PWD/taglib/flac/flacmetadatablock.h \
-    $$PWD/taglib/flac/flacpicture.h \
-    $$PWD/taglib/flac/flacproperties.h \
-    $$PWD/taglib/flac/flacunknownmetadatablock.h \
-    $$PWD/taglib/it/itfile.h \
-    $$PWD/taglib/it/itproperties.h \
-    $$PWD/taglib/mod/modfile.h \
-    $$PWD/taglib/mod/modfilebase.h \
-    $$PWD/taglib/mod/modfileprivate.h \
-    $$PWD/taglib/mod/modproperties.h \
-    $$PWD/taglib/mod/modtag.h \
-    $$PWD/taglib/mp4/mp4atom.h \
-    $$PWD/taglib/mp4/mp4coverart.h \
-    $$PWD/taglib/mp4/mp4file.h \
-    $$PWD/taglib/mp4/mp4item.h \
-    $$PWD/taglib/mp4/mp4properties.h \
-    $$PWD/taglib/mp4/mp4tag.h \
-    $$PWD/taglib/mpc/mpcfile.h \
-    $$PWD/taglib/mpc/mpcproperties.h \
-    $$PWD/taglib/mpeg/id3v1/id3v1genres.h \
-    $$PWD/taglib/mpeg/id3v1/id3v1tag.h \
-    $$PWD/taglib/mpeg/id3v2/frames/attachedpictureframe.h \
-    $$PWD/taglib/mpeg/id3v2/frames/commentsframe.h \
-    $$PWD/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h \
-    $$PWD/taglib/mpeg/id3v2/frames/ownershipframe.h \
-    $$PWD/taglib/mpeg/id3v2/frames/popularimeterframe.h \
-    $$PWD/taglib/mpeg/id3v2/frames/privateframe.h \
-    $$PWD/taglib/mpeg/id3v2/frames/relativevolumeframe.h \
-    $$PWD/taglib/mpeg/id3v2/frames/textidentificationframe.h \
-    $$PWD/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h \
-    $$PWD/taglib/mpeg/id3v2/frames/unknownframe.h \
-    $$PWD/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h \
-    $$PWD/taglib/mpeg/id3v2/frames/urllinkframe.h \
-    $$PWD/taglib/mpeg/id3v2/id3v2extendedheader.h \
-    $$PWD/taglib/mpeg/id3v2/id3v2footer.h \
-    $$PWD/taglib/mpeg/id3v2/id3v2frame.h \
-    $$PWD/taglib/mpeg/id3v2/id3v2framefactory.h \
-    $$PWD/taglib/mpeg/id3v2/id3v2header.h \
-    $$PWD/taglib/mpeg/id3v2/id3v2synchdata.h \
-    $$PWD/taglib/mpeg/id3v2/id3v2tag.h \
-    $$PWD/taglib/mpeg/mpegfile.h \
-    $$PWD/taglib/mpeg/mpegheader.h \
-    $$PWD/taglib/mpeg/mpegproperties.h \
-    $$PWD/taglib/mpeg/xingheader.h \
-    $$PWD/taglib/ogg/flac/oggflacfile.h \
-    $$PWD/taglib/ogg/opus/opusfile.h \
-    $$PWD/taglib/ogg/opus/opusproperties.h \
-    $$PWD/taglib/ogg/speex/speexfile.h \
-    $$PWD/taglib/ogg/speex/speexproperties.h \
-    $$PWD/taglib/ogg/vorbis/vorbisfile.h \
-    $$PWD/taglib/ogg/vorbis/vorbisproperties.h \
-    $$PWD/taglib/ogg/oggfile.h \
-    $$PWD/taglib/ogg/oggpage.h \
-    $$PWD/taglib/ogg/oggpageheader.h \
-    $$PWD/taglib/ogg/xiphcomment.h \
-    $$PWD/taglib/riff/aiff/aifffile.h \
-    $$PWD/taglib/riff/aiff/aiffproperties.h \
-    $$PWD/taglib/riff/wav/infotag.h \
-    $$PWD/taglib/riff/wav/wavfile.h \
-    $$PWD/taglib/riff/wav/wavproperties.h \
-    $$PWD/taglib/riff/rifffile.h \
-    $$PWD/taglib/s3m/s3mfile.h \
-    $$PWD/taglib/s3m/s3mproperties.h \
-    $$PWD/taglib/toolkit/taglib.h \
-    $$PWD/taglib/toolkit/tbytevector.h \
-    $$PWD/taglib/toolkit/tbytevectorlist.h \
-    $$PWD/taglib/toolkit/tbytevectorstream.h \
-    $$PWD/taglib/toolkit/tdebug.h \
-    $$PWD/taglib/toolkit/tdebuglistener.h \
-    $$PWD/taglib/toolkit/tfile.h \
-    $$PWD/taglib/toolkit/tfilestream.h \
-    $$PWD/taglib/toolkit/tiostream.h \
-    $$PWD/taglib/toolkit/tlist.h \
-    $$PWD/taglib/toolkit/tmap.h \
-    $$PWD/taglib/toolkit/tpropertymap.h \
-    $$PWD/taglib/toolkit/trefcounter.h \
-    $$PWD/taglib/toolkit/tstring.h \
-    $$PWD/taglib/toolkit/tstringlist.h \
-    $$PWD/taglib/toolkit/tutils.h \
-    $$PWD/taglib/toolkit/unicode.h \
-    $$PWD/taglib/trueaudio/trueaudiofile.h \
-    $$PWD/taglib/trueaudio/trueaudioproperties.h \
-    $$PWD/taglib/wavpack/wavpackfile.h \
-    $$PWD/taglib/wavpack/wavpackproperties.h \
-    $$PWD/taglib/xm/xmfile.h \
-    $$PWD/taglib/xm/xmproperties.h \
-    $$PWD/taglib/audioproperties.h \
-    $$PWD/taglib/fileref.h \
-    $$PWD/taglib/tag.h \
-    $$PWD/taglib/taglib_export.h \
-    $$PWD/taglib/tagunion.h \
-    $$PWD/taglib/config.h \
-    $$PWD/taglib/taglib_config.h \
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
 cmake_minimum_required(VERSION 3.0)
-set(VVAVE_VERSION 1.1.1)
+set(VVAVE_VERSION 1.2.0)
 project(vvave VERSION ${VVAVE_VERSION})

 find_package(ECM 1.7.0 REQUIRED NO_MODULE)
@@ -7,7 +7,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${ECM_MODULE_PATH})
 set(CMAKE_CXX_STANDARD 17)

 find_package(MauiKit REQUIRED)
-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Qml Quick Network WebSockets Sql QuickControls2 Xml Multimedia DBus Svg WebView)
+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Qml Quick Network Sql QuickControls2 Xml Multimedia DBus Svg)
 find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config KIO Attica SyntaxHighlighting)
 include(KDEInstallDirs)
 include(KDECompilerSettings NO_POLICY_SCOPE)
@@ -33,26 +33,21 @@ add_executable(vvave
 #    pulpo/services/deezerService.cpp
    pulpo/services/lastfmService.cpp
 #    pulpo/services/lyricwikiaService.cpp
-#    pulpo/services/spotifyService.cpp
+    pulpo/services/spotifyService.cpp
 #    pulpo/services/musicbrainzService.cpp
    pulpo/pulpo.cpp
-    pulpo/htmlparser.cpp
    pulpo/service.cpp
    services/local/taginfo.cpp
    services/local/player.cpp
-    services/local/youtubedl.cpp
-#    services/local/linking.cpp
-#    services/local/socket.cpp
-    services/web/youtube.cpp
+    services/local/playlist.cpp
    services/web/NextCloud/nextmusic.cpp
    services/web/abstractmusicprovider.cpp
-#    services/web/Spotify/spotify.cpp
    db/collectionDB.cpp
-#    utils/brain.cpp
    models/tracks/tracksmodel.cpp
    models/playlists/playlistsmodel.cpp
    models/albums/albumsmodel.cpp
    models/cloud/cloud.cpp
+    models/folders/foldersmodel.cpp
    )

 ecm_setup_version(${VVAVE_VERSION}
@@ -61,7 +56,7 @@ ecm_setup_version(${VVAVE_VERSION}
    )

 if (ANDROID)
-    find_package(Qt5 REQUIRED COMPONENTS AndroidExtras WebView Xml)
+    find_package(Qt5 REQUIRED COMPONENTS AndroidExtras Xml)
    find_package(OpenSSL REQUIRED)

    include(ExternalProject)
@@ -72,20 +67,22 @@ if (ANDROID)
    set(TAGLIB_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include ${CMAKE_INSTALL_PREFIX}/include/taglib)
    set(TAGLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libtag.a)

-    target_link_libraries(vvave MauiKit Qt5::AndroidExtras Qt5::WebView Qt5::Xml OpenSSL::SSL)
+    target_link_libraries(vvave MauiKit Qt5::AndroidExtras Qt5::Xml OpenSSL::SSL)
    add_dependencies(vvave taglib)
    kde_source_files_enable_exceptions(vvave)
 else()
    find_package(Taglib REQUIRED)
    target_sources(vvave PRIVATE
-        kde/mpris2.cpp
+        kde/mpris2/mpris2.cpp
+        kde/mpris2/mediaplayer2.cpp
+        kde/mpris2/mediaplayer2player.cpp
        kde/notify.cpp
        )
-    target_link_libraries(vvave Qt5::WebView KF5::ConfigCore KF5::Notifications KF5::KIOCore KF5::I18n Qt5::DBus KF5::Attica KF5::SyntaxHighlighting)
+    target_link_libraries(vvave KF5::ConfigCore KF5::Notifications KF5::KIOCore KF5::I18n Qt5::DBus KF5::Attica KF5::SyntaxHighlighting)
 endif()

 target_include_directories(vvave PRIVATE ${TAGLIB_INCLUDE_DIRS})
-target_link_libraries(vvave MauiKit Qt5::Network Qt5::Sql Qt5::WebSockets Qt5::Qml Qt5::Xml Qt5::Multimedia  Qt5::QuickControls2 ${TAGLIB_LIBRARIES})
+target_link_libraries(vvave MauiKit Qt5::Network Qt5::Sql Qt5::Qml Qt5::Xml Qt5::Multimedia  Qt5::QuickControls2 ${TAGLIB_LIBRARIES})

 install(TARGETS vvave ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES org.kde.vvave.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})

--- a/android_files/AndroidManifest.xml
+++ b/android_files/AndroidManifest.xml
 <?xml version="1.0"?>
 <manifest package="org.maui.vvave" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
-<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
-
-<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
-        Remove the comment if you do not require these default permissions. -->
-
-
-<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
-        Remove the comment if you do not require these default features. -->
-
-<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
-
-
-<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Vvave" android:icon="@drawable/icon">
-<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="Vvave" android:screenOrientation="unspecified" android:launchMode="singleTop">
-<intent-filter>
-<action android:name="android.intent.action.MAIN"/>
-<category android:name="android.intent.category.LAUNCHER"/>
-</intent-filter>
-
-<!-- Application arguments -->
-<!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
-<!-- Application arguments -->
-
-
-<meta-data android:name="android.app.lib_name" android:value="vvave"/>
-<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
-<meta-data android:name="android.app.repository" android:value="default"/>
-<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
-<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
-<!-- Deploy Qt libs as part of package -->
-<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
-<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
-<meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
-<!-- Run with local libs -->
-<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
-<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
-<meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
-<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
-<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
-<!-- Used to specify custom system library path to run with local system libs -->
-<!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> -->
-<!--  Messages maps -->
-<meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
-<meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
-<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
-<!--  Messages maps -->
-
-<!-- Splash screen -->
-<!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
-<!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
-<!-- Splash screen -->
-
-<!-- Background running -->
-<!-- Warning: changing this value to true may cause unexpected crashes if the
-        application still try to draw after
-        "applicationStateChanged(Qt::ApplicationSuspended)"
-        signal is sent! -->
-<meta-data android:name="android.app.background_running" android:value="false"/>
-<!-- Background running -->
-
-<!-- auto screen scale factor -->
-<meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
-<!-- auto screen scale factor -->
-
-<!-- extract android style -->
-<!-- available android:values :
-
-        * default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
-        * full - useful QWidget & Quick Controls 1 apps
-        * minimal - useful for Quick Controls 2 apps, it is much faster than "full"
-        * none - useful for apps that don't use any of the above Qt modules
-        -->
-
-<meta-data android:name="android.app.extract_android_style" android:value="minimal"/>
-<!-- extract android style -->
-
-
-</activity>
-
-<!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
-<service android:process=":qt" android:name=".MyService">
-<!-- android:process=":qt" is needed to force the service to run on a separate process than the Activity -->
-
-<!-- Application arguments -->
-<meta-data android:name="android.app.arguments" android:value="-service"/>
-<!-- Application arguments -->
-
-<!-- If you are using the same application (.so file) for activity and also for service, then you
-        need to use *android.app.arguments* to pass some arguments to your service in order to know which
-        one is which.
-        -->
-
-<!-- Application to launch -->
-<meta-data android:name="android.app.lib_name" android:value="vvave"/>
-<!-- Application to launch -->
-
-<!-- Ministro -->
-<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
-<meta-data android:name="android.app.repository" android:value="default"/>
-<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
-<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
-<!-- Ministro -->
-
-<!-- Deploy Qt libs as part of package -->
-<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
-<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
-<meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
-<!-- Deploy Qt libs as part of package -->
-
-<!-- Run with local libs -->
-<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
-<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
-<meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
-<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
-<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
-<!-- Run with local libs -->
-
-<!--  Messages maps -->
-<meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
-<meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
-<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
-<!--  Messages maps -->
-
-
-<!-- Background running -->
-<meta-data android:name="android.app.background_running" android:value="true"/>
-<!-- Background running -->
-</service>
-
-<provider android:name="android.support.v4.content.FileProvider" android:authorities="org.maui.vvave.fileprovider" android:grantUriPermissions="true" android:exported="false">
-<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/filepaths"/>
-</provider>
-
-</application>
-
-
-<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
-        Remove the comment if you do not require these default permissions. -->
-
-
-<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
-        Remove the comment if you do not require these default features. -->
-
-
+    <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
+         Remove the comment if you do not require these default permissions. -->
+
+
+    <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
+         Remove the comment if you do not require these default features. -->
+
+
+    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+
+    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Vvave" android:extractNativeLibs="true" android:icon="@drawable/icon">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="Vvave" android:screenOrientation="unspecified" android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+
+            <!-- Application arguments -->
+            <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
+            <!-- Application arguments -->
+
+            <meta-data android:name="android.app.lib_name" android:value="vvave"/>
+            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
+            <meta-data android:name="android.app.repository" android:value="default"/>
+            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
+            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
+            <!-- Deploy Qt libs as part of package -->
+            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
+
+            <!-- Run with local libs -->
+            <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
+            <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
+            <meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>
+            <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
+            <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
+            <!-- Used to specify custom system library path to run with local system libs -->
+            <!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> -->
+            <!--  Messages maps -->
+            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
+            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
+            <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
+            <meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/>
+            <!--  Messages maps -->
+
+            <!-- Splash screen -->
+            <!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation,
+                 then android.app.splash_screen_drawable. For best results, use together with splash_screen_sticky and
+                 use hideSplashScreen() with a fade-out animation from Qt Android Extras to hide the splash screen when you
+                 are done populating your window with content. -->
+            <!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / -->
+            <!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / -->
+            <!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
+            <!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
+            <!-- Splash screen -->
+
+            <!-- Background running -->
+            <!-- Warning: changing this value to true may cause unexpected crashes if the
+                          application still try to draw after
+                          "applicationStateChanged(Qt::ApplicationSuspended)"
+                          signal is sent! -->
+            <meta-data android:name="android.app.background_running" android:value="false"/>
+            <!-- Background running -->
+
+            <!-- auto screen scale factor -->
+            <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
+            <!-- auto screen scale factor -->
+
+            <!-- extract android style -->
+            <!-- available android:values :
+                * default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
+                * full - useful QWidget & Quick Controls 1 apps
+                * minimal - useful for Quick Controls 2 apps, it is much faster than "full"
+                * none - useful for apps that don't use any of the above Qt modules
+                -->
+            <meta-data android:name="android.app.extract_android_style" android:value="none"/>
+            <!-- extract android style -->
+
+    </activity>
+
+    <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
+    </application>
+
+<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="28"/>
 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
@@ -152,6 +91,4 @@
 <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
 <uses-permission android:name="android.permission.MOUNT_FORMAT_FILESYSTEMS"/>
 <uses-permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>
-
-
 </manifest>
--- a/android_files/build.gradle
+++ b/android_files/build.gradle
@@ -21,6 +21,7 @@ dependencies {
    compile 'com.android.support:support-v4:25.3.1'
 }

+
 android {
    /*******************************************************
     * The following variables:
@@ -45,7 +46,7 @@ android {
            java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
            aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
            res.srcDirs = [qt5AndroidDir + '/res', 'res']
-            resources.srcDirs = ['src']
+            resources.srcDirs = ['resources']
            renderscript.srcDirs = ['src']
            assets.srcDirs = ['assets']
            jniLibs.srcDirs = ['libs']
@@ -55,4 +56,15 @@ android {
    lintOptions {
        abortOnError false
    }
+
+//     Do not compress Qt binary resources file
+//     aaptOptions {
+//         noCompress 'rcc'
+//     }
+// 
+//     defaultConfig {
+//         resConfig "en"
+//         minSdkVersion = qtMinSdkVersion
+//         targetSdkVersion = qtTargetSdkVersion
+//     }
 }
--- a/android_files/res/drawable-hdpi/icon.png
+++ b/android_files/res/drawable-hdpi/icon.png
--- a/android_files/res/drawable-ldpi/icon.png
+++ b/android_files/res/drawable-ldpi/icon.png
--- a/android_files/res/drawable-mdpi/icon.png
+++ b/android_files/res/drawable-mdpi/icon.png
--- a/android_files/res/values/libs.xml
+++ b/android_files/res/values/libs.xml
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
    <array name="qt_sources">
-        <item>https://download.qt.io/ministro/android/qt5/qt-5.9</item>
+        <item>https://download.qt.io/ministro/android/qt5/qt-5.14</item>
    </array>

    <!-- The following is handled automatically by the deployment tool. It should
@@ -11,11 +11,15 @@
        <!-- %%INSERT_EXTRA_LIBS%% -->
    </array>