Merge pull request #5 from Fector101/flet-adv-support

Flet adv support

Author: Fector101

android_notify/config.py

@@ -1,26 +1,37 @@
 import os, traceback
-try:
-    from jnius import cast, autoclass
-except ImportError as e:
-    # So commandline still works if java isn't installed and get pyjinus import error
-    print('Exception occured in __init__.py: ',e)
-    cast = lambda x: x
-    autoclass = lambda x: None
 
 ON_ANDROID = False
 __version__ = "1.60.2(dev)"
 
-try:
-    from android import config
-    ACTIVITY_CLASS_NAME = config.JAVA_NAMESPACE
-except (ImportError, AttributeError):
-    ACTIVITY_CLASS_NAME = 'org.kivy.android'
+def on_flet_app():
+    return os.getenv("MAIN_ACTIVITY_HOST_CLASS_NAME")
 
+def get_activity_class_name():
+    ACTIVITY_CLASS_NAME = os.getenv("MAIN_ACTIVITY_HOST_CLASS_NAME") # flet python
+    if not ACTIVITY_CLASS_NAME:
+        try:
+            from android import config
+            ACTIVITY_CLASS_NAME = config.JAVA_NAMESPACE
+        except (ImportError, AttributeError):
+            ACTIVITY_CLASS_NAME = 'org.kivy.android'
+    return ACTIVITY_CLASS_NAME
 
+
+if os.getenv("MAIN_ACTIVITY_HOST_CLASS_NAME"):
+    from jnius import cast, autoclass
+else:
+    # print('Not on Flet android env...\n')
+    try:
+        import kivy #TODO find var for kivy
+        from jnius import cast, autoclass
+    except Exception as e:
+        print('android-notify: No pjnius, not on android')
+        # So commandline still works if java isn't installed and get pyjinus import error
+        # print('Exception occured in __init__.py: ',e)
+        cast = lambda x: x
+        autoclass = lambda x: None
 try:
     # Android Imports
-    from android import activity as android_activity
-    from jnius import autoclass,cast
 
     # Get the required Java classes needs to on android to import
     Bundle = autoclass('android.os.Bundle')
@@ -33,29 +44,27 @@
     NotificationChannel = autoclass('android.app.NotificationChannel')
     RemoteViews = autoclass('android.widget.RemoteViews')
 
-    ON_ANDROID = True
+    ON_ANDROID = RemoteViews
 except Exception as e:
     from .an_types import *
     if hasattr(e,'name') and e.name != 'android' :
         print('Exception: ',e)
         print(traceback.format_exc())
 
+
 if ON_ANDROID:
     try:
-        from android.permissions import request_permissions, Permission, check_permission
-        from android.storage import app_storage_path
-
         NotificationManagerCompat = autoclass('androidx.core.app.NotificationManagerCompat')
         NotificationCompat = autoclass('androidx.core.app.NotificationCompat')
         IconCompat = autoclass('androidx.core.graphics.drawable.IconCompat')
+        Color = autoclass('android.graphics.Color')
 
         # Notification Design
         NotificationCompatBuilder = autoclass('androidx.core.app.NotificationCompat$Builder')
         NotificationCompatBigTextStyle = autoclass('androidx.core.app.NotificationCompat$BigTextStyle')
         NotificationCompatBigPictureStyle = autoclass('androidx.core.app.NotificationCompat$BigPictureStyle')
         NotificationCompatInboxStyle = autoclass('androidx.core.app.NotificationCompat$InboxStyle')
         NotificationCompatDecoratedCustomViewStyle = autoclass('androidx.core.app.NotificationCompat$DecoratedCustomViewStyle')
-        Color = autoclass('android.graphics.Color')
 
     except Exception as dependencies_import_error:
         print('dependencies_import_error: ',dependencies_import_error)
@@ -65,23 +74,16 @@
         * android.enable_androidx = True
         * android.permissions = POST_NOTIFICATIONS
         """)
-        def app_storage_path():
-            return './'
+
         from .an_types import *
-        from .an_types import AndroidActivity as android_activity
 else:
-    def app_storage_path():
-        return './'
     from .an_types import *
-    from  .an_types import AndroidActivity as android_activity
-
-
 
 def from_service_file():
     return 'PYTHON_SERVICE_ARGUMENT' in os.environ
 
 run_on_ui_thread = None
-if from_service_file() or not ON_ANDROID:
+if on_flet_app() or from_service_file() or not ON_ANDROID:
     def run_on_ui_thread(func):
         """Fallback for Developing on PC"""
 
@@ -90,21 +92,22 @@ def wrapper(*args, **kwargs):
             return func(*args, **kwargs)
 
         return wrapper
-else:
+else:# TODO find var for kivy
     from android.runnable import run_on_ui_thread
 
 def get_python_activity():
     if not ON_ANDROID:
         from .an_types import PythonActivity
         return PythonActivity
+    ACTIVITY_CLASS_NAME = get_activity_class_name()
     if from_service_file():
-        # PythonService = autoclass(ACTIVITY_CLASS_NAME + '.PythonService')
         PythonActivity = autoclass(ACTIVITY_CLASS_NAME + '.PythonService')
+    elif on_flet_app():
+        PythonActivity = autoclass(ACTIVITY_CLASS_NAME)
     else:
         PythonActivity = autoclass(ACTIVITY_CLASS_NAME + '.PythonActivity')
     return PythonActivity
 
-
 def get_python_activity_context():
     if not ON_ANDROID:
         from .an_types import Context
@@ -130,3 +133,13 @@ def get_notification_manager():
         return None
     notification_service = context.getSystemService(context.NOTIFICATION_SERVICE)
     return cast(NotificationManager, notification_service)
+
+def app_storage_path():
+    if on_flet_app():
+        return os.path.join(context.getFilesDir().getAbsolutePath(), 'flet')
+    else:
+        try:
+            from android.storage import app_storage_path as kivy_app_storage_path  # type: ignore
+            return kivy_app_storage_path()
+        except Exception as e:
+            return './'  # TODO return file main.py path (not android)

android_notify/sword.py

@@ -8,18 +8,17 @@
     get_android_importance, generate_channel_id, get_img_from_path, setLayoutText, \
     get_bitmap_from_url, add_data_to_intent
 
-from .config import from_service_file, get_python_activity,get_notification_manager,ON_ANDROID
+from .config import from_service_file, get_python_activity,get_notification_manager,ON_ANDROID,on_flet_app
 from .config import (Bundle, String, BuildVersion,
                      Intent,PendingIntent,
                      IconCompat,app_storage_path,
                      NotificationChannel,RemoteViews,
-                     run_on_ui_thread,android_activity,
-                    request_permissions, Permission,check_permission
+                     run_on_ui_thread,
                      )
 from .config import (NotificationCompat, NotificationCompatBuilder,
                      NotificationCompatBigTextStyle,NotificationCompatBigPictureStyle,
                      NotificationCompatInboxStyle, NotificationCompatDecoratedCustomViewStyle,
-                    Color
+                     Color
                      )
 from .styles import NotificationStyles
 from .base import BaseNotification
@@ -622,7 +621,7 @@ def __dispatch_notification(self):
                 self.notification_manager.notify(self.__id, self.__builder.build())
             except Exception as sending_notification_from_service_error:
                 print('error sending notification from service:',sending_notification_from_service_error)
-        elif self.passed_check or NotificationHandler.has_permission():
+        elif on_flet_app() or self.passed_check or NotificationHandler.has_permission():
             try:
                 self.notification_manager.notify(self.__id, self.__builder.build())
             except Exception as notify_error:
@@ -852,6 +851,10 @@ class NotificationHandler:
     __name = None
     __bound = False
     __requesting_permission=False
+    android_activity=None
+    if ON_ANDROID and not on_flet_app():
+        from android import activity
+        android_activity = activity
     @classmethod
     def get_name(cls):
         """Returns name or id str for Clicked Notification."""
@@ -881,7 +884,7 @@ def get_name(cls):
     def __notification_handler(cls, intent):
         """Calls Function Attached to notification on click.
             Don't Call this function manual, it's Already Attach to Notification.
-        
+
         Sets self.__name #action of Notification that was clicked from Notification.name or Notification.id
         """
         if not cls.is_on_android():
@@ -915,14 +918,17 @@ def __notification_handler(cls, intent):
     @classmethod
     def bindNotifyListener(cls):
         """This Creates a Listener for All Notification Clicks and Functions"""
+        if on_flet_app():
+            return False
+
         if not cls.is_on_android():
             return "Not on Android"
         #TODO keep trying BroadcastReceiver
         if cls.__bound:
             print("binding done already ")
             return True
         try:
-            android_activity.bind(on_new_intent=cls.__notification_handler)
+            cls.android_activity.bind(on_new_intent=cls.__notification_handler)
             cls.__bound = True
             return True
         except Exception as binding_listener_error:
@@ -936,10 +942,10 @@ def unbindNotifyListener(cls):
             return "Not on Android"
 
         #Beta TODO use BroadcastReceiver
-        if from_service_file():
+        if on_flet_app() or from_service_file():
             return False # error 'NoneType' object has no attribute 'registerNewIntentListener'
         try:
-            android_activity.unbind(on_new_intent=cls.__notification_handler)
+            cls.android_activity.unbind(on_new_intent=cls.__notification_handler)
             return True
         except Exception as unbinding_listener_error:
             print("Failed to unbind notifications listener: ",unbinding_listener_error)
@@ -958,7 +964,22 @@ def has_permission():
         """
         if not ON_ANDROID:
             return True
-        return check_permission(Permission.POST_NOTIFICATIONS)
+
+        if on_flet_app():
+            from .config import autoclass
+            ContextCompat = autoclass('androidx.core.content.ContextCompat')
+            Manifest = autoclass('android.Manifest$permission')
+            VERSION_CODES = autoclass('android.os.Build$VERSION_CODES')
+
+            if BuildVersion.SDK_INT >= VERSION_CODES.TIRAMISU:
+                permission = Manifest.POST_NOTIFICATIONS
+                return ContextCompat.checkSelfPermission(context, permission)
+            else:
+                print("android_notify- On Low android version don't need permission")
+                return True #doesn't need permission
+        else:
+            from android.permissions import Permission, check_permission
+            return check_permission(Permission.POST_NOTIFICATIONS)
 
     @classmethod
     @run_on_ui_thread
@@ -984,23 +1005,35 @@ def on_permissions_result(permissions, grants):
                 cls.__requesting_permission = False
 
         if not cls.has_permission():
-            cls.__requesting_permission = True
-            request_permissions([Permission.POST_NOTIFICATIONS],on_permissions_result)
+            if on_flet_app():
+                from .config import autoclass
+                ActivityCompat = autoclass('androidx.core.app.ActivityCompat')
+                Manifest = autoclass('android.Manifest$permission')
+                permission = Manifest.POST_NOTIFICATIONS
+                ActivityCompat.requestPermissions(context, [permission], 101)
+                return None
+                # TODO Callback when user answers request question
+            else:
+                from android.permissions import request_permissions, Permission
+                cls.__requesting_permission = True
+                request_permissions([Permission.POST_NOTIFICATIONS],on_permissions_result)
+                return None
         else:
             cls.__requesting_permission = False
             if callback:
                 if can_accept_arguments(callback,True):
                     callback(True)
                 else:
                     callback()
+            return None
 
 
-if not from_service_file():
+if not on_flet_app() and from_service_file():
+    print("didn't bind listener, In service file")
+elif ON_ANDROID:
     try:
         NotificationHandler.bindNotifyListener()
     except Exception as bind_error:
+        # error 'NoneType' object has no attribute 'registerNewIntentListener'
         print("notification listener bind error:",bind_error)
-        traceback.print_exc()
-else:
-    # error 'NoneType' object has no attribute 'registerNewIntentListener'
-    print("didn't bind listener, In service file:")
+        traceback.print_exc()