android-notify 1.52.2__py3-none-any.whl → 1.52.4__py3-none-any.whl

android_notify/sword.py

@@ -4,6 +4,7 @@ import traceback
 import os
 import threading
 import re
+import time
 from .styles import NotificationStyles
 
 DEV=0
@@ -36,7 +37,7 @@ except Exception as e:# pylint: disable=W0718
     def run_on_ui_thread(func):
         """Fallback for Developing on PC"""
         def wrapper(*args, **kwargs):
-            print("Simulating run on UI thread")
+            # print("Simulating run on UI thread")
             return func(*args, **kwargs)
         return wrapper
 
@@ -116,7 +117,7 @@ class Notification:
     # if key not in non_string_keys: value = str(value) to fix
     #non_string_keys=['progress_max_value','progress_current_value','callback','logs']
     # TODO using default values to check types
-    
+
     # During Development (When running on PC)
     logs=not ON_ANDROID
     def __init__(self,**kwargs):
@@ -143,6 +144,7 @@ class Notification:
         # Private (Don't Touch)
         self.__id = self.__getUniqueID()
         self.__setArgs(kwargs)
+        self.__update_timer = None  # To Track progressbar last update (According to Android Docs Don't update bar to often, I also faced so issues when doing that)
 
         if not ON_ANDROID:
             return
@@ -157,11 +159,11 @@ class Notification:
         Args:
             new_title (str): New Notification Title
         """
-        self.title=new_title
+        self.title=str(new_title)
         if self.logs:
-            print(f'new notification title: {new_title}')
+            print(f'new notification title: {self.title}')
         if ON_ANDROID:
-            self.__builder.setContentTitle(new_title)
+            self.__builder.setContentTitle(String(self.title))
 
     def updateMessage(self,new_message):
         """Changes Old Message
@@ -169,40 +171,59 @@ class Notification:
         Args:
             new_message (str): New Notification Message
         """
-        self.message=new_message
+        self.message=str(new_message)
         if self.logs:
-            print(f'new notification message: {new_message}')
+            print(f'new notification message: {self.message}')
         if ON_ANDROID:
-            self.__builder.setContentText(new_message)
+            self.__builder.setContentText(String(self.message))
 
     def updateProgressBar(self,current_value,message:str=''):
-        """current_value is the value to set progressbar, message defaults to last message"""
+        """current_value is the value to set progressbar, message defaults to last message
+        
+        NOTE: There is a 0.5sec delay
+        """
 
-        if self.logs:
-            print(f'Progress Bar Update value: {current_value}')
+        # Cancel any existing timer before setting a new one
+        if self.__update_timer:
+            return False
 
-        if not ON_ANDROID:
-            return
+        def delayed_update():
+            self.__update_timer = None
+            if self.logs:
+                print(f'Progress Bar Update value: {current_value}')
 
-        self.__builder.setProgress(self.progress_max_value, current_value, False)
-        if message:
-            self.__builder.setContentText(String(message))
-        self.notification_manager.notify(self.__id, self.__builder.build())
+            self.progress_current_value = current_value
+        
+            if not ON_ANDROID:
+                return False
+            self.__builder.setProgress(self.progress_max_value, current_value, False)
+            if message:
+                self.updateMessage(message)
+            self.notification_manager.notify(self.__id, self.__builder.build())
+            return True
 
+        # Start a new timer that runs after 0.5 seconds
+        self.__update_timer = threading.Timer(0.5, delayed_update)
+        self.__update_timer.start()
+        
     def removeProgressBar(self,message=''):
         """message defaults to last message"""
 
+        if self.__update_timer:
+            self.__update_timer.cancel()
+            self.__update_timer = None
+        
         if self.logs:
             print(f'removed progress bar with message: {self.message}')
 
         if not ON_ANDROID:
-            return True
+            return False
 
         if message:
             self.__builder.setContentText(String(message))
-            return True
         self.__builder.setProgress(0, 0, False)
         self.notification_manager.notify(self.__id, self.__builder.build())
+        return True
 
     def send(self,silent:bool=False):
         """Sends notification
@@ -226,6 +247,101 @@ class Notification:
                 print(f'channel_name: {self.channel_name}, Channel ID: {self.channel_id}, id: {self.__id}')
             print('Can\'t Send Package Only Runs on Android !!! ---> Check "https://github.com/Fector101/android_notify/" for Documentation.\n' if DEV else '\n') # pylint: disable=C0301
 
+    def addButton(self, text:str,on_release):
+        """For adding action buttons
+
+        Args:
+            text (str): Text For Button
+        """
+        if self.logs:
+            print('Added Button: ', text)
+
+        if not ON_ANDROID:
+            return
+
+        btn_id= self.__getIDForButton()
+        action = f"BTN_ACTION_{btn_id}"
+
+        action_intent = Intent(context, PythonActivity)
+        action_intent.setAction(action)
+        action_intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+        bundle = Bundle()
+        bundle.putString("title", self.title or 'Title Placeholder')
+        bundle.putInt("key_int", 123)
+        action_intent.putExtras(bundle)
+        action_intent.putExtra("button_id", btn_id)
+
+        self.btns_box[action] = on_release
+        # action_intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP)
+
+        if self.logs:
+            print('Button id: ',btn_id)
+        pending_action_intent = PendingIntent.getActivity(
+            context,
+            0,
+            action_intent,
+            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE
+        )
+        # Convert text to CharSequence
+        action_text = cast('java.lang.CharSequence', String(text))
+
+
+
+        # Add action with proper types
+        self.__builder.addAction(
+            int(context.getApplicationInfo().icon),  # Cast icon to int
+            action_text,                             # CharSequence text
+            pending_action_intent                    # PendingIntent
+        )
+        # Set content intent for notification tap
+        self.__builder.setContentIntent(pending_action_intent)
+
+    @run_on_ui_thread
+    def addNotificationStyle(self,style:str,already_sent=False):
+        """Adds Style to Notification
+            Version 1.51.2+ Exposes method to Users (Note): Always try to Call On UI Thread
+
+        Args:
+            style (str): required style
+        """
+
+        if not ON_ANDROID:
+            # TODO for logs when not on android and style related to imgs etraxct app path from buildozer.spec and print
+            return False
+
+        if style == NotificationStyles.BIG_TEXT:
+            big_text_style = NotificationCompatBigTextStyle() # pylint: disable=E0606
+            big_text_style.bigText(str(self.body))
+            self.__builder.setStyle(big_text_style)
+
+        elif style == NotificationStyles.INBOX:
+            inbox_style = NotificationCompatInboxStyle() # pylint: disable=E0606
+            for line in self.message.split("\n"):
+                inbox_style.addLine(str(line))
+            self.__builder.setStyle(inbox_style)
+
+        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
+            self.__buildImg(img, style)
+
+        elif style == NotificationStyles.BOTH_IMGS and (self.big_picture_path or self.large_icon_path):
+            if self.big_picture_path:
+                self.__buildImg(self.big_picture_path, NotificationStyles.BIG_PICTURE)
+            if self.large_icon_path:
+                self.__buildImg(self.large_icon_path, NotificationStyles.LARGE_ICON)
+
+        elif style == NotificationStyles.PROGRESS:
+            self.__builder.setContentTitle(String(self.title))
+            self.__builder.setContentText(String(self.message))
+            self.__builder.setProgress(self.progress_max_value, self.progress_current_value, False)
+
+        if already_sent:
+            self.notification_manager.notify(self.__id, self.__builder.build())
+
+        return True
+        # elif style == 'custom':
+        #     self.__builder = self.__doCustomStyle()
+
     def __validateArgs(self,inputted_kwargs):
 
         def checkInReference(inputted_keywords,accepteable_inputs,input_type):
@@ -297,51 +413,7 @@ class Notification:
         self.__builder.setPriority(NotificationCompat.PRIORITY_DEFAULT if self.silent else NotificationCompat.PRIORITY_HIGH)
         self.__builder.setOnlyAlertOnce(True)
         self.__addIntentToOpenApp()
-    @run_on_ui_thread
-    def addNotificationStyle(self,style:str,already_sent=False):
-        """Adds Style to Notification
-            Version 1.51.2+ Exposes method to Users (Note): Always try to Call On UI Thread
-
-        Args:
-            style (str): required style
-        """
-        
-        if not ON_ANDROID:
-            # TODO for logs when not on android and style related to imgs etraxct app path from buildozer.spec and print
-            return
-        
-        if style == NotificationStyles.BIG_TEXT:
-            big_text_style = NotificationCompatBigTextStyle() # pylint: disable=E0606
-            big_text_style.bigText(str(self.body))
-            self.__builder.setStyle(big_text_style)
-
-        elif style == NotificationStyles.INBOX:
-            inbox_style = NotificationCompatInboxStyle() # pylint: disable=E0606
-            for line in self.message.split("\n"):
-                inbox_style.addLine(str(line))
-            self.__builder.setStyle(inbox_style)
-
-        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
-            self.__buildImg(img, style)
-
-        elif style == NotificationStyles.BOTH_IMGS and (self.big_picture_path or self.large_icon_path):
-            if self.big_picture_path:
-                self.__buildImg(self.big_picture_path, NotificationStyles.BIG_PICTURE)
-            if self.large_icon_path:
-                self.__buildImg(self.large_icon_path, NotificationStyles.LARGE_ICON)
-
-        elif style == NotificationStyles.PROGRESS:
-            self.__builder.setContentTitle(String(self.title))
-            self.__builder.setContentText(String(self.message))
-            self.__builder.setProgress(self.progress_max_value, self.progress_current_value, False)
-
-        if already_sent:
-            self.notification_manager.notify(self.__id, self.__builder.build())
-            
-        # elif style == 'custom':
-        #     self.__builder = self.__doCustomStyle()
-
+    
     # def __doCustomStyle(self):
     #     # TODO Will implement when needed
     #     return self.__builder
@@ -357,7 +429,7 @@ class Notification:
             bitmap = self.__getImgFromPath(user_img)
             if bitmap:
                 self.__applyNotificationImage(bitmap,img_style)
-                
+
 
     def __getImgFromPath(self, relative_path):
         app_folder=os.path.join(app_storage_path(),'app') # pylint: disable=possibly-used-before-assignment
@@ -372,7 +444,8 @@ class Notification:
         return BitmapFactory.decodeStream(context.getContentResolver().openInputStream(uri))
 
     def __getImgFromURL(self,url,img_style):
-        print("getting image from URL---")
+        if self.logs:
+            print("getting image from URL---")
         try:
             URL = autoclass('java.net.URL')
             url = URL(url)
@@ -389,7 +462,8 @@ class Notification:
 
     @run_on_ui_thread
     def __applyNotificationImage(self,bitmap,img_style):
-        print('appying notification image thread ', bitmap)
+        if self.logs:
+            print('appying notification image-------')
         try:
             if img_style == NotificationStyles.BIG_PICTURE:
                 big_picture_style = NotificationCompatBigPictureStyle().bigPicture(bitmap) # pylint: disable=E0606
@@ -397,9 +471,11 @@ class Notification:
             elif img_style == NotificationStyles.LARGE_ICON:
                 self.__builder.setLargeIcon(bitmap)
             self.notification_manager.notify(self.__id, self.__builder.build())
-            print('added notification image done-------')
+            if self.logs:
+                print('Done adding image to notification-------')
         except Exception as e:
-            print('I could stop ',e)
+            img = self.large_icon_path if img_style == NotificationStyles.LARGE_ICON else self.big_picture_path
+            print(f'Failed adding Image of style: {img_style} || From path: {img}, Exception {e}')
             print('could stop get Img from URL ',traceback.format_exc())
 
     def __getUniqueID(self):
@@ -464,55 +540,6 @@ class Notification:
         self.button_ids.append(btn_id)
         return btn_id
 
-    def addButton(self, text:str,on_release):
-        """For adding action buttons
-
-        Args:
-            text (str): Text For Button
-        """
-        if self.logs:
-            print('Added Button: ', text)
-
-        if not ON_ANDROID:
-            return
-
-        btn_id= self.__getIDForButton()
-        action = f"BTN_ACTION_{btn_id}"
-
-        action_intent = Intent(context, PythonActivity)
-        action_intent.setAction(action)
-        action_intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
-        bundle = Bundle()
-        bundle.putString("title", self.title or 'Title Placeholder')
-        bundle.putInt("key_int", 123)
-        action_intent.putExtras(bundle)
-        action_intent.putExtra("button_id", btn_id)
-
-        self.btns_box[action] = on_release
-        # action_intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP)
-
-        if self.logs:
-            print('Button id: ',btn_id)
-        pending_action_intent = PendingIntent.getActivity(
-            context,
-            0,
-            action_intent,
-            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE
-        )
-        # Convert text to CharSequence
-        action_text = cast('java.lang.CharSequence', String(text))
-
-
-
-        # Add action with proper types
-        self.__builder.addAction(
-            int(context.getApplicationInfo().icon),  # Cast icon to int
-            action_text,                             # CharSequence text
-            pending_action_intent                    # PendingIntent
-        )
-        # Set content intent for notification tap
-        self.__builder.setContentIntent(pending_action_intent)
-
 
 class NotificationHandler:
     """For Notification Operations """

{android_notify-1.52.2.dist-info → android_notify-1.52.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: android-notify
-Version: 1.52.2
+Version: 1.52.4
 Summary: A Python package that simpilfies creating Android notifications in Kivy apps.
 Home-page: https://github.com/fector101/android-notify
 Author: Fabian

{android_notify-1.52.2.dist-info → android_notify-1.52.4.dist-info}/RECORD

@@ -2,8 +2,8 @@ android_notify/__init__.py,sha256=lcLjyfegXgU7cyGhfSphAOBipXwemrVkdYy3mcF6X5Y,17
 android_notify/__main__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 android_notify/core.py,sha256=B3gOgbLGGI6tz-Q_T2wmk74oggOSDX0Qz4lqj00vaFo,6114
 android_notify/styles.py,sha256=3olKruhAbTrk5OzuhDnk_Pgpv8XYk8dWFmr48Q9rQVk,352
-android_notify/sword.py,sha256=xBcrRPpbOYKoXzErNYAsjEtSj8NI78unTEnO9nipRPs,26037
-android_notify-1.52.2.dist-info/METADATA,sha256=sR2K5ZdPsDveDmQqYCgiKKEuambWOT30ktB5UHnQCoc,13445
-android_notify-1.52.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-android_notify-1.52.2.dist-info/top_level.txt,sha256=IR1ONMrRSRINZpWn2X0dL5gbWwWINsK7PW8Jy2p4fU8,15
-android_notify-1.52.2.dist-info/RECORD,,
+android_notify/sword.py,sha256=IDJfEQxVvVgrjGhcH65jIwisiqAmvF3Z5blU5Kr4DQM,27117
+android_notify-1.52.4.dist-info/METADATA,sha256=Hhbta-Y5iqq-wq-MLpM-db0-kGarwrCPYLqkuYDSMCI,13445
+android_notify-1.52.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+android_notify-1.52.4.dist-info/top_level.txt,sha256=IR1ONMrRSRINZpWn2X0dL5gbWwWINsK7PW8Jy2p4fU8,15
+android_notify-1.52.4.dist-info/RECORD,,