Merge pull request #132 from aryaveer0710/flagFocusable

pvsvamsi · web-flow · commit 2534f4605e84 · 2024-11-28T18:19:05.000+05:30
Added check to make overlay window focusable
diff --git a/android/src/main/java/in/jvapps/system_alert_window/services/WindowServiceNew.java b/android/src/main/java/in/jvapps/system_alert_window/services/WindowServiceNew.java
@@ -58,6 +58,7 @@ public class WindowServiceNew extends Service implements View.OnTouchListener {
     private int windowHeight;
 
     private boolean isDisableClicks = false;
+    private boolean isFlagFocusable = false;
 
     private FlutterView flutterView;
 
@@ -137,6 +138,7 @@ private void setWindowManager() {
 
     private void setWindowLayoutFromMap(HashMap<String, Object> paramsMap) {
         isDisableClicks = Commons.getIsClicksDisabled(paramsMap);
+        isFlagFocusable = Commons.getIsFlagFocusable(paramsMap);
         LogUtils.getInstance().i(TAG, String.valueOf(isDisableClicks));
         windowGravity = (String) paramsMap.get(Constants.KEY_GRAVITY);
         windowWidth = NumberUtils.getInt(paramsMap.get(Constants.KEY_WIDTH));
@@ -152,18 +154,19 @@ private WindowManager.LayoutParams getLayoutParams() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             params.type = android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
             if (isDisableClicks) {
-                params.flags = WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED | android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE | android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED | android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+                params.flags = WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED | android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE | android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
             } else {
-                params.flags =  WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED | android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED | android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+                params.flags =  WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED | android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED ;
             }
         } else {
             params.type = android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
             if (isDisableClicks) {
-                params.flags =  WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED | android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE | android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+                params.flags =  WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED | android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
             } else {
-                params.flags = WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED | android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+                params.flags = WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED | android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
             }
         }
+        if(!isFlagFocusable)  params.flags|= android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && isDisableClicks) {
             params.alpha = 0.8f;
         }
diff --git a/android/src/main/java/in/jvapps/system_alert_window/utils/Commons.java b/android/src/main/java/in/jvapps/system_alert_window/utils/Commons.java
@@ -3,6 +3,7 @@
 import static android.content.Context.ACTIVITY_SERVICE;
 import static in.jvapps.system_alert_window.utils.Constants.KEY_BACKGROUND_COLOR;
 import static in.jvapps.system_alert_window.utils.Constants.KEY_IS_DISABLE_CLICKS;
+import static in.jvapps.system_alert_window.utils.Constants.KEY_IS_FLAG_FOCUSABLE;
 
 import android.app.ActivityManager;
 import android.content.Context;
@@ -45,6 +46,15 @@ public static boolean getIsClicksDisabled(@NonNull Map<String, Object> paramsMap
     }
 
 
+    public static boolean getIsFlagFocusable(@NonNull Map<String, Object> paramsMap) {
+        Object isFlagFocusable = paramsMap.get(KEY_IS_FLAG_FOCUSABLE);
+        if(isFlagFocusable != null){
+            return (Boolean) isFlagFocusable;
+        }
+        return false;
+    }
+
+
     public static int getPixelsFromDp(@NonNull Context context, int dp) {
         if (dp == -1) return -1;
         return (int) (TypedValue.applyDimension(
diff --git a/android/src/main/java/in/jvapps/system_alert_window/utils/Constants.java b/android/src/main/java/in/jvapps/system_alert_window/utils/Constants.java
@@ -17,6 +17,7 @@ public class Constants {
     public static final String KEY_FOOTER = "footer";
     public static final String KEY_IS_SHOW_FOOTER = "isShowFooter";
     public static final String KEY_IS_DISABLE_CLICKS = "isDisableClicks";
+    public static final String KEY_IS_FLAG_FOCUSABLE = "isFlagFocusable";
     public static final String KEY_GRAVITY = "gravity";
     public static final String KEY_WIDTH = "width";
     public static final String KEY_HEIGHT = "height";
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -58,7 +58,6 @@ class _MyAppState extends State<MyApp> {
 
   @override
   void dispose() {
-    SystemAlertWindow.removeOnClickListener();
     super.dispose();
   }
 
@@ -91,11 +90,11 @@ class _MyAppState extends State<MyApp> {
     if (!_isShowingWindow) {
       await SystemAlertWindow.sendMessageToOverlay('show system window');
       SystemAlertWindow.showSystemWindow(
-        height: 200,
-        width: MediaQuery.of(context).size.width.floor(),
-        gravity: SystemWindowGravity.CENTER,
-        prefMode: prefMode,
-      );
+          height: 200,
+          width: MediaQuery.of(context).size.width.floor(),
+          gravity: SystemWindowGravity.CENTER,
+          prefMode: prefMode,
+          isFlagFocusable: false);
       setState(() {
         _isShowingWindow = true;
       });
@@ -106,6 +105,7 @@ class _MyAppState extends State<MyApp> {
           width: MediaQuery.of(context).size.width.floor(),
           gravity: SystemWindowGravity.CENTER,
           prefMode: prefMode,
+          isFlagFocusable: true,
           isDisableClicks: true);
       setState(() {
         _isUpdatedWindow = true;
diff --git a/lib/system_alert_window.dart b/lib/system_alert_window.dart
@@ -41,10 +41,6 @@ class SystemAlertWindow {
     return await _channel.invokeMethod('requestPermissions', [Commons.getSystemWindowPrefMode(prefMode)]);
   }
 
-  static Future<bool> removeOnClickListener() async {
-    return await _channel.invokeMethod("removeCallBackHandler");
-  }
-
   /// Show System Window
   ///
   /// `gravity` Position of the window and default is [SystemWindowGravity.CENTER]
@@ -54,19 +50,22 @@ class SystemAlertWindow {
   /// `notificationBody` Notification body, applicable in case of bubble
   /// `prefMode` Preference for the system window. Default is [SystemWindowPrefMode.DEFAULT]
   /// `isDisableClicks` Disables the clicks across the system window. Default is false. This is not applicable for bubbles.
+  /// `isFlagFocusable` Makes the overlay window focusable. Default is false.
   static Future<bool?> showSystemWindow(
       {SystemWindowGravity gravity = SystemWindowGravity.CENTER,
       int? width,
       int? height,
       String notificationTitle = "Title",
       String notificationBody = "Body",
       SystemWindowPrefMode prefMode = SystemWindowPrefMode.DEFAULT,
-      bool isDisableClicks = false}) async {
+      bool isDisableClicks = false,
+      bool isFlagFocusable = false}) async {
     final Map<String, dynamic> params = <String, dynamic>{
       'gravity': Commons.getWindowGravity(gravity),
       'width': width ?? Constants.MATCH_PARENT,
       'height': height ?? Constants.WRAP_CONTENT,
-      'isDisableClicks': isDisableClicks
+      'isDisableClicks': isDisableClicks,
+      'isFlagFocusable': isFlagFocusable
     };
     return await _channel.invokeMethod('showSystemWindow', [notificationTitle, notificationBody, params, Commons.getSystemWindowPrefMode(prefMode)]);
   }
@@ -80,19 +79,22 @@ class SystemAlertWindow {
   /// `notificationBody` Notification body, applicable in case of bubble
   /// `prefMode` Preference for the system window. Default is [SystemWindowPrefMode.DEFAULT]
   /// `isDisableClicks` Disables the clicks across the system window. Default is false. This is not applicable for bubbles.
+  /// `isFlagFocusable`Makes the overlay window focusable. Default is false.
   static Future<bool?> updateSystemWindow(
       {SystemWindowGravity gravity = SystemWindowGravity.CENTER,
       int? width,
       int? height,
       String notificationTitle = "Title",
       String notificationBody = "Body",
       SystemWindowPrefMode prefMode = SystemWindowPrefMode.DEFAULT,
-      bool isDisableClicks = false}) async {
+      bool isDisableClicks = false,
+      bool isFlagFocusable = false}) async {
     final Map<String, dynamic> params = <String, dynamic>{
       'gravity': Commons.getWindowGravity(gravity),
       'width': width ?? Constants.MATCH_PARENT,
       'height': height ?? Constants.WRAP_CONTENT,
-      'isDisableClicks': isDisableClicks
+      'isDisableClicks': isDisableClicks,
+      'isFlagFocusable': isFlagFocusable
     };
     return await _channel
         .invokeMethod('updateSystemWindow', [notificationTitle, notificationBody, params, Commons.getSystemWindowPrefMode(prefMode)]);
