From kde-commits Wed Jan 31 22:07:50 2018 From: Camilo Higuita Date: Wed, 31 Jan 2018 22:07:50 +0000 To: kde-commits Subject: [babe-qml] /: work on android Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=151743648429226 Git commit e7162b279737a3b1962d609f1555116c928cd015 by Camilo Higuita. Committed on 31/01/2018 at 22:07. Pushed by camiloh into branch 'master'. work on android M +9 -0 Babe.pro A +79 -0 android/AndroidManifest.xml A +57 -0 android/build.gradle A +9 -0 android/gradle.properties A +- -- android/gradle/wrapper/gradle-wrapper.jar A +6 -0 android/gradle/wrapper/gradle-wrapper.properties A +172 -0 android/gradlew A +84 -0 android/gradlew.bat A +6 -0 android/local.properties A +- -- android/res/drawable-hdpi/icon.png A +- -- android/res/drawable-ldpi/icon.png A +4 -0 android/res/drawable-mdpi/.directory A +- -- android/res/drawable-mdpi/icon.png A +25 -0 android/res/values/libs.xml M +17 -1 babe.cpp M +1 -0 babe.h M +1 -0 main.cpp M +1 -1 utils/bae.h M +3 -1 view_models/BabeTable/BabeTable.qml M +1 -1 view_models/FolderPicker/FolderPicker.qml M +1 -0 widgets/MainPlaylist/MainPlaylist.qml https://commits.kde.org/babe-qml/e7162b279737a3b1962d609f1555116c928cd015 diff --git a/Babe.pro b/Babe.pro index 98aae78..59e6b84 100644 --- a/Babe.pro +++ b/Babe.pro @@ -223,6 +223,13 @@ DISTFILES +=3D \ android-openssl.pri \ # 3rdparty/kirigami/kirigami.pri kde/kde.pri \ + android/AndroidManifest.xml \ + android/gradle/wrapper/gradle-wrapper.jar \ + android/gradlew \ + android/res/values/libs.xml \ + android/build.gradle \ + android/gradle/wrapper/gradle-wrapper.properties \ + android/gradlew.bat = = HEADERS +=3D \ @@ -350,3 +357,5 @@ HEADERS +=3D \ babe.h \ settings/BabeSettings.h = +ANDROID_PACKAGE_SOURCE_DIR =3D $$PWD/android + diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml new file mode 100644 index 0000000..1c5b48a --- /dev/null +++ b/android/AndroidManifest.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/build.gradle b/android/build.gradle new file mode 100644 index 0000000..3a3e0cd --- /dev/null +++ b/android/build.gradle @@ -0,0 +1,57 @@ +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:2.2.3' + } +} + +allprojects { + repositories { + jcenter() + } +} + +apply plugin: 'com.android.application' + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) +} + +android { + /******************************************************* + * The following variables: + * - androidBuildToolsVersion, + * - androidCompileSdkVersion + * - qt5AndroidDir - holds the path to qt android files + * needed to build any Qt application + * on Android. + * + * are defined in gradle.properties file. This file is + * updated by QtCreator and androiddeployqt tools. + * Changing them manually might break the compilation! + *******************************************************/ + + compileSdkVersion androidCompileSdkVersion.toInteger() + + buildToolsVersion androidBuildToolsVersion + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs =3D [qt5AndroidDir + '/src', 'src', 'java'] + aidl.srcDirs =3D [qt5AndroidDir + '/src', 'src', 'aidl'] + res.srcDirs =3D [qt5AndroidDir + '/res', 'res'] + resources.srcDirs =3D ['src'] + renderscript.srcDirs =3D ['src'] + assets.srcDirs =3D ['assets'] + jniLibs.srcDirs =3D ['libs'] + } + } + + lintOptions { + abortOnError false + } +} diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 0000000..d3ad4a5 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,9 @@ +## This file is automatically generated by QtCreator. +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +androidBuildToolsVersion=3D26.0.2 +androidCompileSdkVersion=3D26 +buildDir=3D.build +qt5AndroidDir=3D/home/camilo/Qt-5.10/5.10.0/android_armv7/src/android/java diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wra= pper/gradle-wrapper.jar new file mode 100644 index 0000000..2b338a9 Binary files /dev/null and b/android/gradle/wrapper/gradle-wrapper.jar diff= er diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gra= dle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..4244097 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Feb 20 10:43:22 EST 2017 +distributionBase=3DGRADLE_USER_HOME +distributionPath=3Dwrapper/dists +zipStoreBase=3DGRADLE_USER_HOME +zipStorePath=3Dwrapper/dists +distributionUrl=3Dhttps\://services.gradle.org/distributions/gradle-3.4-bi= n.zip diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 0000000..eeff5cc --- /dev/null +++ b/android/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +##########################################################################= #### +## +## Gradle start up script for UN*X +## +##########################################################################= #### + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG=3D"$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=3D`ls -ld "$PRG"` + link=3D`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG=3D"$link" + else + PRG=3D`dirname "$PRG"`"/$link" + fi +done +SAVED=3D"`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME=3D"`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME=3D"Gradle" +APP_BASE_NAME=3D`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS= to pass JVM options to this script. +DEFAULT_JVM_OPTS=3D"-Xmx1024m -Dfile.encoding=3DUTF-8" + +# Use the maximum available, or set MAX_FD !=3D -1 to use that value. +MAX_FD=3D"maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=3Dfalse +msys=3Dfalse +darwin=3Dfalse +nonstop=3Dfalse +case "`uname`" in + CYGWIN* ) + cygwin=3Dtrue + ;; + Darwin* ) + darwin=3Dtrue + ;; + MINGW* ) + msys=3Dtrue + ;; + NONSTOP* ) + nonstop=3Dtrue + ;; +esac + +CLASSPATH=3D$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=3D"$JAVA_HOME/jre/sh/java" + else + JAVACMD=3D"$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=3D"java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no = 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" =3D "false" -a "$darwin" =3D "false" -a "$nonstop" =3D "fal= se" ] ; then + MAX_FD_LIMIT=3D`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" =3D "maximum" -o "$MAX_FD" =3D "max" ] ; then + MAX_FD=3D"$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the do= ck +if $darwin; then + GRADLE_OPTS=3D"$GRADLE_OPTS \"-Xdock:name=3D$APP_NAME\" \"-Xdock:icon= =3D$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=3D`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=3D`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=3D`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=3D`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP=3D"" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS=3D"$ROOTDIRS$SEP$dir" + SEP=3D"|" + done + OURCYGPATTERN=3D"(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" !=3D "" ] ; then + OURCYGPATTERN=3D"$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=3D0 + for arg in "$@" ; do + CHECK=3D`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=3D`echo "$arg"|egrep -c "^-"` = ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then = ### Added a condition + eval `echo args$i`=3D`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`=3D"\"$arg\"" + fi + i=3D$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "= $args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "= $args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "= $args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/= " ; done + echo " " +} +APP_ARGS=3D$(save "$@") + +# Collect all arguments for the java command, following the shell quoting = and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appn= ame=3D$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.Grad= leWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Fi= nder on Mac, the cwd is wrong +if [ "$(uname)" =3D "Darwin" ] && [ "$HOME" =3D "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 0000000..65b35a4 --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" =3D=3D "" @echo off +@rem #####################################################################= ##### +@rem +@rem Gradle startup script for Windows +@rem +@rem #####################################################################= ##### + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=3D=3D"Windows_NT" setlocal + +set DIRNAME=3D%~dp0 +if "%DIRNAME%" =3D=3D "" set DIRNAME=3D. +set APP_BASE_NAME=3D%~n0 +set APP_HOME=3D%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_O= PTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS=3D-Xmx1024m -Dfile.encoding=3DUTF-8 + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=3Djava.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" =3D=3D "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in y= our PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=3D%JAVA_HOME:"=3D% +set JAVA_EXE=3D%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" =3D=3D "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS=3D +set _SKIP=3D2 + +:win9xME_args_slurp +if "x%~1" =3D=3D "x" goto execute + +set CMD_LINE_ARGS=3D%* + +:execute +@rem Setup the command line + +set CLASSPATH=3D%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.ap= pname=3D%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.Gradle= WrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=3D=3D"0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code = instead of +rem the _cmd.exe /c_ return code! +if not "" =3D=3D "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=3D=3D"Windows_NT" endlocal + +:omega diff --git a/android/local.properties b/android/local.properties new file mode 100644 index 0000000..f73784e --- /dev/null +++ b/android/local.properties @@ -0,0 +1,6 @@ +## This file is automatically generated by QtCreator. +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +sdk.dir=3D/opt/android-sdk diff --git a/android/res/drawable-hdpi/icon.png b/android/res/drawable-hdpi= /icon.png new file mode 100644 index 0000000..05afe52 Binary files /dev/null and b/android/res/drawable-hdpi/icon.png differ diff --git a/android/res/drawable-ldpi/icon.png b/android/res/drawable-ldpi= /icon.png new file mode 100644 index 0000000..05afe52 Binary files /dev/null and b/android/res/drawable-ldpi/icon.png differ diff --git a/android/res/drawable-mdpi/.directory b/android/res/drawable-md= pi/.directory new file mode 100644 index 0000000..cbc3106 --- /dev/null +++ b/android/res/drawable-mdpi/.directory @@ -0,0 +1,4 @@ +[Dolphin] +PreviewsShown=3Dtrue +Timestamp=3D2018,1,31,16,23,20 +Version=3D4 diff --git a/android/res/drawable-mdpi/icon.png b/android/res/drawable-mdpi= /icon.png new file mode 100644 index 0000000..05afe52 Binary files /dev/null and b/android/res/drawable-mdpi/icon.png differ diff --git a/android/res/values/libs.xml b/android/res/values/libs.xml new file mode 100644 index 0000000..4009a77 --- /dev/null +++ b/android/res/values/libs.xml @@ -0,0 +1,25 @@ + + + + https://download.qt.io/ministro/android/qt5/qt-5.9 + + + + + + + + + + + + + + + + + + + + diff --git a/babe.cpp b/babe.cpp index 6dd210f..b9b3add 100644 --- a/babe.cpp +++ b/babe.cpp @@ -15,6 +15,7 @@ #ifdef Q_OS_ANDROID #include #include +#include #endif = #if (defined (Q_OS_LINUX) && !defined (Q_OS_ANDROID)) @@ -414,6 +415,19 @@ QString Babe::babeColor() return "#E91E63"; } = +void Babe::androidStatusBarColor() +{ +#if defined(Q_OS_ANDROID) + + QtAndroid::runOnAndroidThread([=3D]() { + QAndroidJniObject window =3D QtAndroid::androidActivity().callObje= ctMethod("getWindow", "()Landroid/view/Window;"); + window.callMethod("addFlags", "(I)V", 0x80000000); + window.callMethod("clearFlags", "(I)V", 0x04000000); + window.callMethod("setStatusBarColor", "(I)V", QColor(Babe::= backgroundColor()).rgba()); + }); +#endif +} + bool Babe::isMobile() { return BAE::isMobile(); @@ -460,7 +474,7 @@ QString Babe::homeDir() if(BAE::fileExists("/mnt/extSdCard")) return "/mnt/sdcard"; else - return mediaPath.toString(); + return mediaPath.toString(); = // QAndroidJniObject mediaDir =3D QAndroidJniObject::callStaticObje= ctMethod("android.content.Context", "getExternalFilesDir", "()Ljava/io/File= ;"); // QAndroidJniObject mediaPath =3D mediaDir.callObjectMethod( "getA= bsolutePath", "()Ljava/lang/String;" ); @@ -490,6 +504,8 @@ QString Babe::sdDir() // qDebug()<<"TESTED SDPATH"< 0 + visible: headerBar z: 999 = RowLayout @@ -115,6 +115,7 @@ ListView { id: playAllBtn Layout.fillHeight: true + visible: headerBar && count > 0 = iconName: /*"amarok_clock"*/ "media-playback-start" onClicked: playAll() @@ -140,6 +141,7 @@ ListView { id: appendBtn Layout.fillHeight: true + visible: headerBar && count > 0 = iconName : "archive-insert"//"media-repeat-track-amarok" onClicked: appendAll() diff --git a/view_models/FolderPicker/FolderPicker.qml b/view_models/Folder= Picker/FolderPicker.qml index 9553368..cb04041 100644 --- a/view_models/FolderPicker/FolderPicker.qml +++ b/view_models/FolderPicker/FolderPicker.qml @@ -55,7 +55,7 @@ Popup BabeButton { id: sdBtn - iconName: "disks" + iconName: "sd" onClicked: load(bae.sdDir()) } = diff --git a/widgets/MainPlaylist/MainPlaylist.qml b/widgets/MainPlaylist/M= ainPlaylist.qml index f48292d..7fe13a8 100644 --- a/widgets/MainPlaylist/MainPlaylist.qml +++ b/widgets/MainPlaylist/MainPlaylist.qml @@ -568,6 +568,7 @@ Item Player.appendTrack(tracks[pos]) = } + Player.playAt(0) = // var pos =3D = bae.lastPlaylistPos() // console.log(= "POSSS:", pos)