android-notify 1.57.1__py3-none-any.whl → 1.58__py3-none-any.whl

android_notify/sword.py

@@ -1,9 +1,8 @@
 """This Module Contain Class for creating Notification With Java"""
-import difflib
 import traceback
-import os
+import os,re
 import threading
-import re
+# ,time
 from .styles import NotificationStyles
 from .base import BaseNotification
 DEV=0
@@ -98,7 +97,13 @@ class Notification(BaseNotification):
         super().__init__(**kwargs)
 
         self.__id = self.__getUniqueID()
-        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)
+
+        # To Track progressbar last update (According to Android Docs Don't update bar to often, I also faced so issues when doing that)
+        self.__update_timer = None
+        self.__progress_bar_msg = ''
+        self.__progress_bar_title = ''
+        self.__cooldown = 0
+
         self.__formatChannel(kwargs)
         if not ON_ANDROID:
             return
@@ -112,7 +117,7 @@ class Notification(BaseNotification):
         """
         self.__builder.setProgress(0,0, True)
         self.__dispatchNotification()
-        
+
     def updateTitle(self,new_title):
         """Changes Old Title
 
@@ -139,78 +144,106 @@ class Notification(BaseNotification):
             self.__builder.setContentText(String(self.message))
             self.__dispatchNotification()
 
-    def updateProgressBar(self,current_value:int,message:str='',title:str='',buffer=0.5):
+    def updateProgressBar(self,current_value:int,message:str='',title:str='',cooldown=0.5):
         """Updates progress bar current value
-        
+
         Args:
             current_value (int): the value from progressbar current progress
             message (str): defaults to last message
             title (str): defaults to last title
-            buffer (float, optional): Avoid Updating progressbar value too frequently Defaults to 0.5secs
-        NOTE: There is a 0.5sec delay for value change, if updating title,msg with progressbar frequenlty pass them in too to avoid update issues
+            cooldown (float, optional): Avoid Updating progressbar value too frequently Defaults to 0.5secs
+
+        NOTE: There is a 0.5sec delay for value change, if updating title,msg with progressbar frequently pass them in too to avoid update issues
         """
-        # replacing new value for when timer is called
-        self.progress_current_value = current_value
 
-        if self.__update_timer:
-            if self.logs:
-                print('Progressbar update too soon Doing bounce 0.5sec')
+        # replacing new values for when timer is called
+        self.progress_current_value = current_value
+        self.__progress_bar_msg = message
+        self.__progress_bar_title = title
+
+        if self.__update_timer and self.__update_timer.is_alive():
+            # Make Logs too Dirty
+            # if self.logs:
+                # remaining = self.__cooldown - (time.time() - self.__timer_start_time)
+                # print(f'Progressbar update too soon, waiting for cooldown ({max(0, remaining):.2f}s)')
             return
 
         def delayed_update():
-            if self.__update_timer is None:
-            # Ensure we are not executing an old timer
+            if self.__update_timer is None: # Ensure we are not executing an old timer
+                if self.logs:
+                    print('ProgressBar update skipped: bar has been removed.')
                 return
             if self.logs:
                 print(f'Progress Bar Update value: {self.progress_current_value}')
 
             if not ON_ANDROID:
+                self.__update_timer = None
                 return
+
             self.__builder.setProgress(self.progress_max_value, self.progress_current_value, False)
-            if message:
-                self.updateMessage(message)
-            if title:
-                self.updateTitle(title)
+
+            if self.__progress_bar_msg:
+                self.updateMessage(self.__progress_bar_msg)
+            if self.__progress_bar_title:
+                self.updateTitle(self.__progress_bar_title)
+
             self.__dispatchNotification()
             self.__update_timer = None
 
 
         # Start a new timer that runs after 0.5 seconds
-        self.__update_timer = threading.Timer(buffer, delayed_update)
+        # self.__timer_start_time = time.time() # for logs
+        self.__cooldown = cooldown
+        self.__update_timer = threading.Timer(cooldown, delayed_update)
         self.__update_timer.start()
 
-    def removeProgressBar(self,message='',show_on_update=True, title:str='') -> bool:
+    def removeProgressBar(self,message='',show_on_update=True, title:str='',cooldown=0.5):
         """Removes Progress Bar from Notification
 
         Args:
             message (str, optional): notification message. Defaults to 'last message'.
-            show_on_update (bool, optional): To show notification brifely when progressbar removed. Defaults to True.
+            show_on_update (bool, optional): To show notification briefly when progressbar removed. Defaults to True.
             title (str, optional): notification title. Defaults to 'last title'.
+            cooldown (float, optional): Avoid Updating progressbar value too frequently Defaults to 0.5secs
+
+        In-Built Delay of 0.5sec According to Android Docs Don't Update Progressbar too Frequently
         """
+
+        # To Cancel any queued timer from `updateProgressBar` method and to avoid race effect incase it somehow gets called while in this method
+        # Avoiding Running `updateProgressBar.delayed_update` at all
+        # so didn't just set `self.__progress_bar_title` and `self.progress_current_value` to 0
         if self.__update_timer:
+            # Make Logs too Dirty
+            # if self.logs:
+            #     print('cancelled progressbar stream update because about to remove',self.progress_current_value)
             self.__update_timer.cancel()
             self.__update_timer = None
-        
-        if self.logs:
-            msg = message or self.message
-            title_=title or self.title
-            print(f'removed progress bar with message: {msg} and title: {title_}')
 
-        if not ON_ANDROID:
-            return False
 
-        self.__builder.setOnlyAlertOnce(not show_on_update)
-        if message:
-            self.updateMessage(message)
-        if title:
-            self.updateTitle(title)
-        self.__builder.setProgress(0, 0, False)
-        self.__dispatchNotification()
-        return True
+
+        def delayed_update():
+            if self.logs:
+                msg = message or self.message
+                title_=title or self.title
+                print(f'removed progress bar with message: {msg} and title: {title_}')
+
+            if not ON_ANDROID:
+                return
+
+            if message:
+                self.updateMessage(message)
+            if title:
+                self.updateTitle(title)
+            self.__builder.setOnlyAlertOnce(not show_on_update)
+            self.__builder.setProgress(0, 0, False)
+            self.__dispatchNotification()
+
+        # Incase `self.updateProgressBar delayed_update` is called right before this method, so android doesn't bounce update
+        threading.Timer(cooldown, delayed_update).start()
 
     def send(self,silent:bool=False,persistent=False,close_on_click=True):
         """Sends notification
-        
+
         Args:
             silent (bool): True if you don't want to show briefly on screen
             persistent (bool): True To not remove Notification When User hits clears All notifications button
@@ -242,6 +275,7 @@ class Notification(BaseNotification):
 
         Args:
             text (str): Text For Button
+            on_release: function to be called when button is clicked
         """
         if self.logs:
             print('Added Button: ', text)

{android_notify-1.57.1.dist-info → android_notify-1.58.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: android-notify
-Version: 1.57.1
+Version: 1.58
 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.57.1.dist-info → android_notify-1.58.dist-info}/RECORD

@@ -3,9 +3,9 @@ android_notify/__main__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 android_notify/base.py,sha256=QkNSNFX8KtNnRRm0r1wXsQa6TWMRKySn-3PT-XpY1mM,3377
 android_notify/core.py,sha256=Per4HFwYwP-mxHJqnwcLlWXsbZsSeeAYN49MmFU2qVk,6113
 android_notify/styles.py,sha256=QBkCY8ZO26FnS-jPtRLf9CKEEnnYylmH9enCa5CNDes,354
-android_notify/sword.py,sha256=K5sauLpBsgLIuj5q7VNUxNgJRYN7w780saE4N5ROHlw,28118
+android_notify/sword.py,sha256=RJ8FME5Ob4F3Ln9mNdzW4xSw-mlMgh9GwBLiD0W7-a8,29791
 android_notify/types_idea.py,sha256=6LC8JQT6rve4AtrppdKRmXeSC07L8ljlO1aQEOpuDV4,1776
-android_notify-1.57.1.dist-info/METADATA,sha256=_gQSlaEMUP3ztTiWlY1mXjBBnxd3rVDP4dZUXQBTSDs,16570
-android_notify-1.57.1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-android_notify-1.57.1.dist-info/top_level.txt,sha256=IR1ONMrRSRINZpWn2X0dL5gbWwWINsK7PW8Jy2p4fU8,15
-android_notify-1.57.1.dist-info/RECORD,,
+android_notify-1.58.dist-info/METADATA,sha256=9CDByWUNDh4kZcQGPxj_zwnwZYeDzatltON64PAw_vs,16568
+android_notify-1.58.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+android_notify-1.58.dist-info/top_level.txt,sha256=IR1ONMrRSRINZpWn2X0dL5gbWwWINsK7PW8Jy2p4fU8,15
+android_notify-1.58.dist-info/RECORD,,