more

Author: Skycoder42

android/src/de/skycoder42/androidutils/AndroidUtils.java

@@ -1,12 +1,16 @@
 package de.skycoder42.androidutils;
 
-import androidnative.SystemDispatcher;
+import java.util.Map;
+import android.os.Build;
 import android.os.Handler;
+import android.content.Context;
 import android.app.Activity;
+import android.graphics.Color;
 import android.view.View;
-import android.content.Context;
-import java.util.Map;
+import android.view.Window;
+import android.view.WindowManager;
 import org.qtproject.qt5.android.QtNative;
+import androidnative.SystemDispatcher;
 
 public class AndroidUtils {
 
@@ -17,6 +21,8 @@ public void onDispatched(String name , Map data) {
 
 				if (name.equals("AndroidUtils.hapticFeedback"))
 					AndroidUtils.hapticFeedback((Integer)data.get("feedbackConstant"));
+					if (name.equals("AndroidUtils.setStatusBarColor"))
+						AndroidUtils.setStatusBarColor((String)data.get("color"));
 			}
 		});
 	}
@@ -32,4 +38,21 @@ public void run() {
 		};
 		activity.runOnUiThread(runnable);
 	}
+
+	static void setStatusBarColor(String colorName) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			final int color = Color.parseColor(colorName);
+			final Activity activity = QtNative.activity();
+
+			Runnable runnable = new Runnable () {
+				public void run() {
+					Window window = activity.getWindow();
+					window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+					window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+					window.setStatusBarColor(color);
+				};
+			};
+			activity.runOnUiThread(runnable);
+		}
+	}
 }

androidutils.cpp

@@ -42,28 +42,9 @@ AndroidUtils *AndroidUtils::instance()
 void AndroidUtils::setStatusBarColor(const QColor &color)
 {
 #ifdef Q_OS_ANDROID
-	if(QtAndroid::androidSdkVersion() >= 21) {
-		QtAndroid::runOnAndroidThreadSync([=](){
-			auto activity = QtAndroid::androidActivity();
-			if(activity.isValid()) {
-				const auto FLAG_TRANSLUCENT_STATUS = QAndroidJniObject::getStaticField<jint>("android/view/WindowManager$LayoutParams",
-																							 "FLAG_TRANSLUCENT_STATUS");
-				const auto FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS = QAndroidJniObject::getStaticField<jint>("android/view/WindowManager$LayoutParams",
-																									   "FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS");
-				const auto aColor = QAndroidJniObject::callStaticMethod<jint>("android/graphics/Color",
-																			  "parseColor",
-																			  "(Ljava/lang/String;)I",
-																			  QAndroidJniObject::fromString(color.name()).object());
-
-				QAndroidJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
-				if(window.isValid()) {
-					window.callMethod<void>("clearFlags", "(I)V", FLAG_TRANSLUCENT_STATUS);
-					window.callMethod<void>("addFlags", "(I)V", FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-					window.callMethod<void>("setStatusBarColor", "(I)V", aColor);
-				}
-			}
-		});
-	}
+	AndroidNative::SystemDispatcher::instance()->dispatch("AndroidUtils.setStatusBarColor", {
+															 {"color", color.name()}
+														 });
 #else
 	Q_UNUSED(color);
 #endif
@@ -85,30 +66,8 @@ void AndroidUtils::showToast(const QString &message, bool showLong)
 void AndroidUtils::hapticFeedback(HapticFeedbackConstant constant)
 {
 #ifdef Q_OS_ANDROID
-		jint type = 0;
-		switch (constant) {
-		case AndroidUtils::LongPress:
-			type = QAndroidJniObject::getStaticField<jint>("android/view/HapticFeedbackConstants", "LONG_PRESS");
-			break;
-		case AndroidUtils::VirtualKey:
-			type = QAndroidJniObject::getStaticField<jint>("android/view/HapticFeedbackConstants", "VIRTUAL_KEY");
-			break;
-		case AndroidUtils::KeyboardTap:
-			type = QAndroidJniObject::getStaticField<jint>("android/view/HapticFeedbackConstants", "KEYBOARD_TAP");
-			break;
-		case AndroidUtils::ClockTick:
-			type = QAndroidJniObject::getStaticField<jint>("android/view/HapticFeedbackConstants", "CLOCK_TICK");
-			break;
-		case AndroidUtils::ContextClick:
-			type = QAndroidJniObject::getStaticField<jint>("android/view/HapticFeedbackConstants", "CONTEXT_CLICK");
-			break;
-		default:
-			Q_UNREACHABLE();
-			return;
-		}
-
 		AndroidNative::SystemDispatcher::instance()->dispatch("AndroidUtils.hapticFeedback", {
-																 {"feedbackConstant", (int)type}
+																 {"feedbackConstant", (int)constant}
 															 });
 #else
 	Q_UNUSED(constant);

androidutils.h

@@ -11,11 +11,11 @@ class AndroidUtils : public QObject
 
 public:
 	enum HapticFeedbackConstant {
-		LongPress,
-		VirtualKey,
-		KeyboardTap,
-		ClockTick,
-		ContextClick
+		LongPress = 0,
+		VirtualKey = 1,
+		KeyboardTap = 3,
+		ClockTick = 4,
+		ContextClick = 6
 	};
 	Q_ENUM(HapticFeedbackConstant)