Handle home key press

Since it is not possible to know when the home key is pressed, close drawer when a new intent is received.
Iktwo · Aug 25, 2016 · aa47cba · aa47cba
1 parent 9e67777
commit aa47cba
Show file tree

Hide file tree

Showing 11 changed files with 166 additions and 13 deletions.
diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.iktwo.qutelauncher"
     android:installLocation="auto"
-    android:versionCode="4"
-    android:versionName="0.04">
+    android:versionCode="5"
+    android:versionName="0.05">
 
     <application
         android:name="org.qtproject.qt5.android.bindings.QtApplication"

diff --git a/src/android/build.gradle b/src/android/build.gradle
@@ -89,11 +89,18 @@ android {
         abortOnError false
     }
 
+    assembleRelease.doLast {
+
+    }
+
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             output.outputFile = new File(
                     output.outputFile.parent,
-                    APK_NAME + "_" + variant.productFlavors[0].name + "_"+ BUILDTYPE + ".apk")
+                    "android-build-release-unsigned.apk")
+
+                    // TODO: figure out how to fix this
+                    // APK_NAME + "_" + variant.productFlavors[0].name + "_"+ BUILDTYPE + ".apk")
         }
 
         variant.assemble.doLast {

diff --git a/src/android/src/com/iktwo/qutelauncher/QuteLauncher.java b/src/android/src/com/iktwo/qutelauncher/QuteLauncher.java
@@ -30,6 +30,7 @@ public class QuteLauncher extends org.qtproject.qt5.android.bindings.QtActivity
     private static WallpaperManager wm;
     private static int mIconDpi;
     private static PackageManager mPm;
+    private static long qtObject = 0;
 
     public QuteLauncher() {
         m_instance = this;
@@ -141,6 +142,12 @@ public static void openApplicationInfo(String packageName) {
         m_instance.startActivity(intent);
     }
 
+    public static void setQtObject(long qtObject) {
+        QuteLauncher.qtObject = qtObject;
+    }
+
+    private static native void jnewIntent(long qtObject);
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         this.QT_ANDROID_DEFAULT_THEME = "AppTheme";
@@ -164,6 +171,12 @@ protected void onStart() {
         mPm = (PackageManager) m_instance.getPackageManager();
     }
 
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        jnewIntent(qtObject);
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();

diff --git a/src/qml/ApplicationGrid.qml b/src/qml/ApplicationGrid.qml
@@ -39,7 +39,7 @@ ScrollView {
 
         property int highlightedItem
 
-        maximumFlickVelocity: height * 2.5
+        maximumFlickVelocity: height * 5
 
         header: Item {
             width: parent.width
@@ -72,11 +72,11 @@ ScrollView {
             text: model.name
 
             onClicked: PackageManager.launchApplication(model.packageName)
-            onPressAndHold: root.pressAndHold(model)
+            // onPressAndHold: root.pressAndHold(model)
         }
 
         onHeightChanged: {
-            if (cacheBuffer !== 0)
+            if (height !== 0)
                 cacheBuffer = Math.max(1080, height * 5)
         }
     }

diff --git a/src/qml/ApplicationTile.qml b/src/qml/ApplicationTile.qml
@@ -42,8 +42,8 @@ Item {
 
             asynchronous: true
 
-            Layout.preferredHeight: Math.round(59 * ScreenValues.dp)
-            Layout.preferredWidth: Math.round(59 * ScreenValues.dp)
+            Layout.preferredHeight: Math.round(48 * ScreenValues.dp)
+            Layout.preferredWidth: Math.round(48 * ScreenValues.dp)
 
             fillMode: Image.PreserveAspectFit
         }

diff --git a/src/qml/ExpandableItem.qml b/src/qml/ExpandableItem.qml
@@ -10,7 +10,7 @@ Item {
     property int minimizedWidth: Math.round(48 * ScreenValues.dp)
 
     property int targetWidth: Math.round(parent.width - (getSideMargin() * ScreenValues.dp))
-    property int targetHeight: Math.round(parent.height - (44 * ScreenValues.dp))
+    property int targetHeight: Math.round(parent.height - 8 * ScreenValues.dp)
 
     property point minimizedPoint: Qt.point(Math.round(parent.width / 2), Math.round(parent.height - rectangleMinizedIndicator.height - (4 * ScreenValues.dp)))
     property point centerPoint: Qt.point(Math.round(parent.width / 2), Math.round(parent.height / 2))
@@ -92,6 +92,8 @@ Item {
                 to: "opened"
                 reversible: true
                 ParallelAnimation {
+                    PropertyAnimation { property: "y"; duration: 350; easing.type: Easing.InOutCubic }
+
                     SequentialAnimation {
                         PauseAnimation { duration: 250 }
                         ParallelAnimation {
@@ -104,8 +106,6 @@ Item {
                             }
                         }
                     }
-
-                    PropertyAnimation { property: "y"; duration: 450; easing.type: Easing.InOutCubic }
                 }
             }
         ]

diff --git a/src/qml/main.qml b/src/qml/main.qml
@@ -90,7 +90,10 @@ ApplicationWindow {
         interval: 550
         running: true
 
-        onTriggered: PackageManager.registerBroadcast()
+        onTriggered: {
+            Launcher.registerMethods()
+            PackageManager.registerBroadcast()
+        }
     }
 
     BorderImage  {
@@ -220,4 +223,9 @@ ApplicationWindow {
 
         dragTarget: applicationTile
     }
+
+    Connections {
+        target: Launcher
+        onNewIntentReceived: explandableItem.close()
+    }
 }
diff --git a/src/src/launcher.cpp b/src/src/launcher.cpp
@@ -1,12 +1,22 @@
 #include "launcher.h"
 
 #ifdef Q_OS_ANDROID
-#include <QAndroidJniObject>
+#include <QAndroidJniEnvironment>
+
+static void newIntent(JNIEnv *env, jobject thiz, jlong qtObject)
+{
+    Q_UNUSED(env)
+    Q_UNUSED(thiz)
+    reinterpret_cast<Launcher*>(qtObject)->emitNewIntent();
+}
 #endif
 
 Launcher::Launcher(QObject *parent) : QObject(parent)
 {
+#ifdef Q_OS_ANDROID
+    mActivity = QAndroidJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
 
+#endif
 }
 
 void Launcher::pickWallpaper()
@@ -17,3 +27,40 @@ void Launcher::pickWallpaper()
                                               "()V");
 #endif
 }
+
+void Launcher::emitNewIntent()
+{
+    emit newIntentReceived();
+}
+
+void Launcher::registerMethods()
+{
+    registerNativeMethods();
+}
+
+void Launcher::registerNativeMethods()
+{
+#ifdef Q_OS_ANDROID
+    JNINativeMethod methods[] {{"jnewIntent", "(J)V", reinterpret_cast<void *>(newIntent)}};
+
+    QAndroidJniObject::callStaticMethod<void>("com/iktwo/qutelauncher/QuteLauncherFlavored",
+                                              "setQtObject", "(J)V",
+                                              "(J)V", reinterpret_cast<long>(this));
+
+    QAndroidJniEnvironment env;
+    jclass objectClass = env->GetObjectClass(mActivity.object<jobject>());
+
+    if (env->ExceptionCheck())
+        env->ExceptionClear();
+
+    env->RegisterNatives(objectClass, methods, sizeof(methods) / sizeof(methods[0]));
+
+    if (env->ExceptionCheck())
+        env->ExceptionClear();
+
+    env->DeleteLocalRef(objectClass);
+
+    if (env->ExceptionCheck())
+        env->ExceptionClear();
+#endif
+}
diff --git a/src/src/launcher.h b/src/src/launcher.h
@@ -3,13 +3,29 @@
 
 #include <QObject>
 
+#ifdef Q_OS_ANDROID
+#include <QAndroidJniObject>
+#endif
+
 class Launcher : public QObject
 {
     Q_OBJECT
 public:
     explicit Launcher(QObject *parent = 0);
 
     Q_INVOKABLE void pickWallpaper();
+    Q_INVOKABLE void emitNewIntent();
+    Q_INVOKABLE void registerMethods();
+
+signals:
+    void newIntentReceived();
+
+private:
+    void registerNativeMethods();
+
+#ifdef Q_OS_ANDROID
+    QAndroidJniObject mActivity;
+#endif
 };
 
 #endif // LAUNCHER_H
diff --git a/src/src/screenvalues.cpp b/src/src/screenvalues.cpp
@@ -17,6 +17,8 @@ ScreenValues::ScreenValues(QObject *parent) :
 {
     m_dpi = retrieveDpi();
 
+    m_density = retrieveDensity();
+
     m_dp = (float) m_dpi / 160;
 
     setStatusBarHeight(getResourceSize("status_bar_height"));
@@ -105,6 +107,20 @@ bool ScreenValues::navBarVisible() const
     return m_navBarVisible;
 }
 
+float ScreenValues::density() const
+{
+    return m_density;
+}
+
+void ScreenValues::setDensity(float density)
+{
+    if (m_density == density)
+        return;
+
+    m_density = density;
+    emit densityChanged(density);
+}
+
 int ScreenValues::statusBarHeight() const
 {
     return m_statusBarHeight;
@@ -218,6 +234,44 @@ int ScreenValues::retrieveDpi()
 #endif
 }
 
+float ScreenValues::retrieveDensity()
+{
+#ifdef Q_OS_ANDROID
+    QAndroidJniEnvironment env;
+    env->PushLocalFrame(9);
+
+    QAndroidJniObject activity = QAndroidJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative",
+                                                                           "activity",
+                                                                           "()Landroid/app/Activity;");
+    jclass activityClass = env->GetObjectClass(activity.object<jobject>());
+
+    jmethodID mIDGetResources = env->GetMethodID(activityClass,
+                                                 "getResources",
+                                                 "()Landroid/content/res/Resources;");
+
+    jobject resources = env->CallObjectMethod(activity.object<jobject>(), mIDGetResources);
+    jclass resourcesClass = env->GetObjectClass(resources);
+
+    jmethodID mIDGetDisplayMetrics = env->GetMethodID(resourcesClass,
+                                                      "getDisplayMetrics",
+                                                      "()Landroid/util/DisplayMetrics;");
+
+    jobject displayMetrics = env->CallObjectMethod(resources, mIDGetDisplayMetrics);
+    jclass displayMetricsClass = env->GetObjectClass(displayMetrics);
+
+    jfieldID fIDDensityDpi = env->GetFieldID(displayMetricsClass, "density", "F");
+    jfloat densityDpi = env->GetFloatField(displayMetrics, fIDDensityDpi);
+
+    float result = (float)densityDpi;
+
+    env->PopLocalFrame(NULL);
+
+    return result;
+#else
+    return QGuiApplication::primaryScreen()->physicalDotsPerInch();
+#endif
+}
+
 int ScreenValues::getResourceSize(const QString &resource)
 {
 #ifdef Q_OS_ANDROID

diff --git a/src/src/screenvalues.h b/src/src/screenvalues.h
@@ -13,6 +13,7 @@ class ScreenValues : public QObject
     Q_PROPERTY(int navigationBarHeightLandscape READ navigationBarHeightLandscape NOTIFY navigationBarHeightLandscapeChanged)
     Q_PROPERTY(int dpi READ dpi WRITE setDpi NOTIFY dpiChanged)
     Q_PROPERTY(float dp READ dp WRITE setDp NOTIFY dpChanged)
+    Q_PROPERTY(float density READ density NOTIFY densityChanged)
     Q_PROPERTY(bool isTablet READ isTablet NOTIFY isTabletChanged)
     Q_PROPERTY(bool navBarVisible READ navBarVisible NOTIFY navBarVisibleChanged)
 
@@ -24,6 +25,9 @@ class ScreenValues : public QObject
     float dp() const;
     void setDp(float dp);
 
+    float density() const;
+    void setDensity(float density);
+
     int dpi() const;
     void setDpi(int dpi);
 
@@ -47,16 +51,20 @@ class ScreenValues : public QObject
     void isTabletChanged();
     void navBarVisibleChanged();
 
+    void densityChanged(float density);
+
 private:
     System m_system;
     float m_dp;
+    float m_density;
     int m_dpi;
     int m_statusBarHeight;
     int m_navigationBarHeight;
     int m_navigationBarHeightLandscape;
     bool m_isTablet;
     bool m_navBarVisible;
 
+    float retrieveDensity();
     int retrieveDpi();
     int getResourceSize(const QString &resource);