android-notify 1.59.2__tar.gz → 1.59.3__tar.gz

{android_notify-1.59.2 → android_notify-1.59.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: android-notify
-Version: 1.59.2
+Version: 1.59.3
 Summary: A Python package that simplifies creating Android notifications in Kivy apps.
 Home-page: https://android-notify.vercel.app
 Author: Fabian

android_notify-1.59.3/android_notify/an_utils.py

@@ -0,0 +1,18 @@
+"""Collection of useful functions"""
+
+import inspect
+def can_accept_arguments(func, *args, **kwargs):
+    try:
+        sig = inspect.signature(func)
+        sig.bind(*args, **kwargs)
+        return True
+    except TypeError:
+        return False
+
+
+def run_on_ui_thread(func):
+    """Fallback for Developing on PC"""
+    def wrapper(*args, **kwargs):
+        # print("Simulating run on UI thread")
+        return func(*args, **kwargs)
+    return wrapper

{android_notify-1.59.2 → android_notify-1.59.3}/android_notify/base.py

@@ -18,6 +18,7 @@ class BaseNotification:
     progress_max_value: int = 100
     progress_current_value: float = 0.0 # Also Takes in Ints
     body: str = ''
+    lines_txt: str = ''
 
     # Notification Functions
     name: str = ''

{android_notify-1.59.2 → android_notify-1.59.3}/android_notify/sword.py

@@ -19,9 +19,16 @@ try:
     from android.config import ACTIVITY_CLASS_NAME
     from android.runnable import run_on_ui_thread
 
+    try:
+        from android import config
+        ns = config.JAVA_NAMESPACE
+        # print('This is Java name space:',ns)
+    except (ImportError,AttributeError):
+        ns='org.kivy.android'
+
     # Get the required Java classes needs to on android to import
     Bundle = autoclass('android.os.Bundle')
-    PythonActivity = autoclass('org.kivy.android.PythonActivity')
+    PythonActivity = autoclass(ns+'.PythonActivity')
     String = autoclass('java.lang.String')
     Intent = autoclass('android.content.Intent')
     PendingIntent = autoclass('android.app.PendingIntent')
@@ -43,12 +50,7 @@ except Exception as e:
     # print(MESSAGE) Already Printing in core.py
 
     # This is so no crashes when developing on PC
-    def run_on_ui_thread(func):
-        """Fallback for Developing on PC"""
-        def wrapper(*args, **kwargs):
-            # print("Simulating run on UI thread")
-            return func(*args, **kwargs)
-        return wrapper
+    from .an_utils import run_on_ui_thread
 
 if ON_ANDROID:
     try:
@@ -63,6 +65,7 @@ if ON_ANDROID:
         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')
     except Exception as e:
         print(e)
         print("""
@@ -86,6 +89,7 @@ class Notification(BaseNotification):
     :param progress_current_value: integer To set progress bar current value.
     :param progress_max_value: integer To set Max range for progress bar.
     :param body: large text For `big_Text` style, while `message` acts as subtitle.
+    :param lines_txt: text separated by newLine symbol For `inbox` style `use addLine method instead`
     ---
     (Advance Options)
     :param id: Pass in Old 'id' to use old instance
@@ -119,6 +123,9 @@ class Notification(BaseNotification):
         self.__built_parameter_filled=False
         self.__using_set_priority_method=False
 
+        # For components
+        self.__lines = []
+
         self.__format_channel(self.channel_name, self.channel_id)
         if not ON_ANDROID:
             return
@@ -128,6 +135,9 @@ class Notification(BaseNotification):
         self.notification_manager = cast(NotificationManager, notification_service)
         self.__builder = NotificationCompatBuilder(context, self.channel_id)
 
+    def addLine(self,text:str):
+        self.__lines.append(text)
+
     def cancel(self,_id=0):
         """
         Removes a Notification instance from tray
@@ -205,6 +215,7 @@ class Notification(BaseNotification):
         if self.__built_parameter_filled:
             # Don't dispatch before filling required values `self.__create_basic_notification`
             # We generally shouldn't dispatch till user call .send()
+            self.__applyNewLinesIfAny()
             self.__dispatch_notification()
 
     def setBigPicture(self,path):
@@ -508,11 +519,9 @@ class Notification(BaseNotification):
         if style == NotificationStyles.BIG_TEXT:
             self.setBigText(self.body)
 
-        elif style == NotificationStyles.INBOX:
-            inbox_style = NotificationCompatInboxStyle()
-            for line in self.message.split("\n"):
-                inbox_style.addLine(str(line))
-            self.__builder.setStyle(inbox_style)
+        elif style == NotificationStyles.INBOX and self.lines_txt:
+            lines = self.lines_txt.split("\n")
+            self.setLines(lines)
 
         elif (style == NotificationStyles.LARGE_ICON and self.large_icon_path) or (style == NotificationStyles.BIG_PICTURE and self.big_picture_path):
             img = self.large_icon_path if style == NotificationStyles.LARGE_ICON else self.big_picture_path
@@ -532,6 +541,20 @@ class Notification(BaseNotification):
 
         return True
 
+    def setLines(self, lines: list):
+        """Pass in a list of strings to be used for lines"""
+        if not lines:
+            return
+        if ON_ANDROID:
+            inbox_style = NotificationCompatInboxStyle()
+            for line in lines:
+                inbox_style.addLine(str(line))
+            self.__builder.setStyle(inbox_style)
+            print('Set Lines: ', lines)
+
+        if self.logs:
+            print('Added Lines: ', lines)
+
     def __dispatch_notification(self):
         if NotificationHandler.has_permission():
             self.notification_manager.notify(self.__id, self.__builder.build())
@@ -544,6 +567,12 @@ class Notification(BaseNotification):
         self.__create_basic_notification(persistent, close_on_click)
         if self.style not in ['simple','']:
             self.addNotificationStyle(self.style)
+        self.__applyNewLinesIfAny()
+
+    def __applyNewLinesIfAny(self):
+        if self.__lines:
+            self.setLines(self.__lines)
+            self.__lines=[] # for refresh method to known when new lines added
 
     def __create_basic_notification(self, persistent, close_on_click):
         if BuildVersion.SDK_INT >= 26 and self.notification_manager.getNotificationChannel(self.channel_id) is None:
@@ -610,7 +639,9 @@ class Notification(BaseNotification):
                 self.__builder.setSmallIcon(icon)
             else:
                 if self.logs:
-                    print('Failed getting img for custom notification icon defaulting to app icon')
+                    app_folder=os.path.join(app_storage_path(),'app')
+                    img_absolute_path = os.path.join(app_folder, img_path)
+                    print(f'Failed getting img for custom notification icon defaulting to app icon\n absolute path {img_absolute_path}')
                 self.__builder.setSmallIcon(context.getApplicationInfo().icon)
 
     @staticmethod
@@ -618,9 +649,13 @@ class Notification(BaseNotification):
         app_folder=os.path.join(app_storage_path(),'app')
         output_path = os.path.join(app_folder, relative_path)
         if not os.path.exists(output_path):
-            print(f"\nImage not found at path: {output_path}, (Local images gotten from App Path)")
-            print("These are the existing files in your app Folder:")
-            print('['+', '.join(os.listdir(app_folder)) + ']')
+            print(f"\nImage not found at path: {app_folder}, (Local images gotten from App Path)")
+            try:
+                print("- These are the existing files in your app Folder:")
+                print('['+', '.join(os.listdir(app_folder)) + ']')
+            except Exception as could_not_get_files_in_path_error:
+                print('Exception: ', could_not_get_files_in_path_error)
+                print("Couldn't get Files in App Folder")
             return None
         # TODO test with a badly written Image and catch error
         Uri = autoclass('android.net.Uri')

{android_notify-1.59.2 → android_notify-1.59.3}/android_notify.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: android-notify
-Version: 1.59.2
+Version: 1.59.3
 Summary: A Python package that simplifies creating Android notifications in Kivy apps.
 Home-page: https://android-notify.vercel.app
 Author: Fabian

{android_notify-1.59.2 → android_notify-1.59.3}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as readme_data:
 
 setup(
     name="android-notify",
-    version="1.59.2",
+    version="1.59.3",
     author="Fabian",
     author_email='fector101@yahoo.com',
     description="A Python package that simplifies creating Android notifications in Kivy apps.",

android_notify-1.59.2/android_notify/an_utils.py

@@ -1,10 +0,0 @@
-"""Collection of useful functions"""
-
-import inspect
-def can_accept_arguments(func, *args, **kwargs):
-    try:
-        sig = inspect.signature(func)
-        sig.bind(*args, **kwargs)
-        return True
-    except TypeError:
-        return False