[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [babe-qml] /: work on android
From: Camilo Higuita <null () kde ! org>
Date: 2018-01-31 22:07:50
Message-ID: E1eh0Xm-0003CN-L4 () code ! kde ! org
[Download RAW message or body]
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 += \
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 += \
@@ -350,3 +357,5 @@ HEADERS += \
babe.h \
settings/BabeSettings.h
+ANDROID_PACKAGE_SOURCE_DIR = $$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 @@
+<?xml version="1.0"?>
+<manifest package="org.qtproject.example" \
xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" \
android:versionCode="1" android:installLocation="auto"> + <application \
android:hardwareAccelerated="true" \
android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- \
%%INSERT_APP_NAME%% --" android:icon="@drawable/icon"> + <activity \
android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" \
android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- \
%%INSERT_APP_NAME%% --" 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="-- \
%%INSERT_APP_LIB_NAME%% --"/> + <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 :
+ * 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="full"/> + <!-- extract android style -->
+ </activity>
+
+ <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
+
+ </application>
+
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16"/>
+ <supports-screens android:largeScreens="true" android:normalScreens="true" \
android:anyDensity="true" android:smallScreens="true"/> +
+ <!-- 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. --> + <!-- \
%%INSERT_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. --> + <!-- %%INSERT_FEATURES -->
+
+</manifest>
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 = [qt5AndroidDir + '/src', 'src', 'java']
+ aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
+ res.srcDirs = [qt5AndroidDir + '/res', 'res']
+ resources.srcDirs = ['src']
+ renderscript.srcDirs = ['src']
+ assets.srcDirs = ['assets']
+ jniLibs.srcDirs = ['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=26.0.2
+androidCompileSdkVersion=26
+buildDir=.build
+qt5AndroidDir=/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/wrapper/gradle-wrapper.jar new file mode 100644
index 0000000..2b338a9
Binary files /dev/null and b/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/android/gradle/wrapper/gradle-wrapper.properties \
b/android/gradle/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=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.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="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`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="-Xmx1024m -Dfile.encoding=UTF-8"
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$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="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$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="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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$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 dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \
\"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### \
Determine if an option +
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added \
a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((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=$(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.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" \
org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +
+# by default we should be in the correct project dir, but when run from Finder on \
Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$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%" == "" @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%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to \
pass JVM options to this script. +set DEFAULT_JVM_OPTS=-Xmx1024m \
-Dfile.encoding=UTF-8 +
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your 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=%JAVA_HOME:"=%
+set JAVA_EXE=%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%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% \
"-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" \
org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="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 "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="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=/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-mdpi/.directory new file mode 100644
index 0000000..cbc3106
--- /dev/null
+++ b/android/res/drawable-mdpi/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2018,1,31,16,23,20
+Version=4
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 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+ <array name="qt_sources">
+ <item>https://download.qt.io/ministro/android/qt5/qt-5.9</item>
+ </array>
+
+ <!-- The following is handled automatically by the deployment tool. It should
+ not be edited manually. -->
+
+ <array name="bundled_libs">
+ <!-- %%INSERT_EXTRA_LIBS%% -->
+ </array>
+
+ <array name="qt_libs">
+ <!-- %%INSERT_QT_LIBS%% -->
+ </array>
+
+ <array name="bundled_in_lib">
+ <!-- %%INSERT_BUNDLED_IN_LIB%% -->
+ </array>
+ <array name="bundled_in_assets">
+ <!-- %%INSERT_BUNDLED_IN_ASSETS%% -->
+ </array>
+
+</resources>
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 <QAndroidJniObject>
#include <QAndroidJniEnvironment>
+#include <QtAndroid>
#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([=]() {
+ QAndroidJniObject window = \
QtAndroid::androidActivity().callObjectMethod("getWindow", \
"()Landroid/view/Window;"); + window.callMethod<void>("addFlags", "(I)V", \
0x80000000); + window.callMethod<void>("clearFlags", "(I)V", 0x04000000);
+ window.callMethod<void>("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 = \
QAndroidJniObject::callStaticObjectMethod("android.content.Context", \
"getExternalFilesDir", "()Ljava/io/File;");
// QAndroidJniObject mediaPath = mediaDir.callObjectMethod( \
"getAbsolutePath", "()Ljava/lang/String;" ); @@ -490,6 +504,8 @@ QString \
Babe::sdDir()
// qDebug()<<"TESTED \
SDPATH"<<QProcessEnvironment::systemEnvironment().value("EXTERNAL_SDCARD_STORAGE",dataAbsPath);
if(BAE::fileExists("/mnt/extSdCard"))
return "/mnt/extSdCard";
+ else if(BAE::fileExists("/mnt/ext_sdcard"))
+ return "/mnt/ext_sdcard";
else
return "/mnt/";
#else
diff --git a/babe.h b/babe.h
index 56c54e2..e99ecad 100644
--- a/babe.h
+++ b/babe.h
@@ -87,6 +87,7 @@ public:
Q_INVOKABLE static QString shadowColor();
Q_INVOKABLE static QString altColor();
Q_INVOKABLE static QString babeColor();
+ Q_INVOKABLE static void androidStatusBarColor();
Q_INVOKABLE static bool isMobile();
Q_INVOKABLE static int screenGeometry(QString side);
diff --git a/main.cpp b/main.cpp
index 1d5d997..26a1cc0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -40,6 +40,7 @@ int main(int argc, char *argv[])
engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
if (engine.rootObjects().isEmpty())
return -1;
+ bae.androidStatusBarColor();
return app.exec();
}
diff --git a/utils/bae.h b/utils/bae.h
index c0ceab3..4f9c595 100644
--- a/utils/bae.h
+++ b/utils/bae.h
@@ -256,7 +256,7 @@ namespace BAE
const QStringList MoodColors = \
{"#F0FF01","#01FF5B","#3DAEFD","#B401FF","#E91E63"};
- const QStringList formats {"*.mp4","*.mp3","*.wav","*.flac","*.ogg","*.m4a"};
+ const QStringList formats {"*.mp4","*.mp3","*.wav","*.flac","*.ogg","*.m4a", \
"*.m3u"};
inline QString fixTitle(const QString &title,const QString &s,const QString &e)
{
diff --git a/view_models/BabeTable/BabeTable.qml \
b/view_models/BabeTable/BabeTable.qml index 24ce4e2..444b4d4 100644
--- a/view_models/BabeTable/BabeTable.qml
+++ b/view_models/BabeTable/BabeTable.qml
@@ -94,7 +94,7 @@ ListView
width: parent.width
height: headerBar ? 48 : 0
color: bae.midLightColor()
- visible: headerBar && count > 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/FolderPicker/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/MainPlaylist.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 = \
bae.lastPlaylistPos()
// console.log("POSSS:", \
pos)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic