android-notify 1.32.1__py3-none-any.whl → 1.40.1__py3-none-any.whl

android_notify/sword.py

@@ -67,6 +67,7 @@ class Notification:
     :param logs: Defaults to True
     """
     notification_ids=[]
+    button_ids=[]
     style_values=[
                   '','simple',
                   'progress','big_text',
@@ -80,7 +81,7 @@ class Notification:
         'style':'simple',
         'big_picture_path':'',
         'large_icon_path':'',
-        'progress_max_value': 100,
+        'progress_max_value': 0,
         'progress_current_value': 0,
         'channel_name':'Default Channel',
         'channel_id':'default_channel',
@@ -97,22 +98,22 @@ class Notification:
         self.large_icon_path=''
         self.big_picture_path=''
         self.progress_current_value=0
-        self.progress_max_value=100
+        self.progress_max_value=0
         # Advance Options
-        self.channel_name=''
-        self.channel_id=''
+        self.channel_name='Default Channel'
+        self.channel_id='default_channel'
         self.silent=False
         # During Dev on PC
         self.logs=self.logs
         # Private (Don't Touch)
         self.__id = self.__getUniqueID()
         self.__setArgs(kwargs)
-        self.__builder=None
         if not ON_ANDROID:
             return
         # TODO make send method wait for __asks_permission_if_needed method
         self.__asks_permission_if_needed()
         self.notification_manager = context.getSystemService(context.NOTIFICATION_SERVICE)
+        self.__builder=NotificationCompatBuilder(context, self.channel_id)# pylint: disable=E0606
 
     def updateTitle(self,new_title):
         """Changes Old Title
@@ -136,6 +137,11 @@ class Notification:
 
     def updateProgressBar(self,current_value,message:str=''):
         """message defaults to last message"""
+        if not ON_ANDROID:
+            return
+            
+        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))
@@ -159,16 +165,12 @@ class Notification:
             self.__startNotificationBuild()
             self.notification_manager.notify(self.__id, self.__builder.build())
         elif self.logs:
-            print(f"""
-    Dev Notification Properties:
-        title: '{self.title}'
-        message: '{self.message}'
-        large_icon_path: '{self.large_icon_path}'
-        big_picture_path: '{self.big_picture_path}'
-        style: '{self.style}'
-        Silent: '{self.silent}'
-    (Won't Print Logs When Complied,except if selected `Notification.logs=True`
-              """)
+            string_to_display=''
+            for name,value in vars(self).items():
+                if value and name not in ['logs','_Notification__id']:
+                    string_to_display += f'\n {name}: {value}'
+            string_to_display +="\n (Won't Print Logs When Complied,except if selected `Notification.logs=True`)"
+            print(string_to_display)
             if DEV:
                 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
@@ -202,14 +204,14 @@ class Notification:
 
     def __setArgs(self,options_dict:dict):
         for key,value in options_dict.items():
-            if key == 'channel_name':
-                setattr(self,key, value[:40] if value else self.defaults[key])
-            elif key == 'channel_id' and value:
-                setattr(self,key, self.__generate_channel_id(value) if value else self.defaults[key])
-
-            setattr(self,key, value if value else self.defaults[key])
-
-        if "channel_id" not in options_dict and 'channel_name' in options_dict:
+            if key == 'channel_name' and value.strip():
+                setattr(self,key, value[:40])
+            elif key == 'channel_id' and value.strip(): # If user input's a channel id (i format properly)
+                setattr(self,key, self.__generate_channel_id(value))
+            else:
+                setattr(self,key, value if value else self.defaults[key])
+
+        if "channel_id" not in options_dict and 'channel_name' in options_dict: # if User doesn't input channel id but inputs channel_name
             setattr(self,'channel_id', self.__generate_channel_id(options_dict['channel_name']))
 
     def __startNotificationBuild(self):
@@ -219,8 +221,10 @@ class Notification:
 
     def __createBasicNotification(self):
         # Notification Channel (Required for Android 8.0+)
+        # print("THis is cchannel is ",self.channel_id) #"BLAH"
         if BuildVersion.SDK_INT >= 26 and self.notification_manager.getNotificationChannel(self.channel_id) is None:
             importance=NotificationManagerCompat.IMPORTANCE_DEFAULT if self.silent else NotificationManagerCompat.IMPORTANCE_HIGH # pylint: disable=possibly-used-before-assignment
+            # importance = 3 or 4
             channel = NotificationChannel(
                 self.channel_id,
                 self.channel_name,
@@ -229,14 +233,13 @@ class Notification:
             self.notification_manager.createNotificationChannel(channel)
 
         # Build the notification
-        self.__builder = NotificationCompatBuilder(context, self.channel_id)# pylint: disable=E0606
+        # self.__builder = NotificationCompatBuilder(context, self.channel_id)# pylint: disable=E0606
         self.__builder.setContentTitle(self.title)
         self.__builder.setContentText(self.message)
         self.__builder.setSmallIcon(context.getApplicationInfo().icon)
         self.__builder.setDefaults(NotificationCompat.DEFAULT_ALL) # pylint: disable=E0606
-        if not self.silent:
-            self.__builder.setPriority(NotificationCompat.PRIORITY_DEFAULT if self.silent else NotificationCompat.PRIORITY_HIGH)
-
+        self.__builder.setPriority(NotificationCompat.PRIORITY_DEFAULT if self.silent else NotificationCompat.PRIORITY_HIGH)
+        self.__addIntentToOpenApp()
     def __addNotificationStyle(self):
         # pylint: disable=trailing-whitespace
         
@@ -298,7 +301,7 @@ class Notification:
         reasonable_amount_of_notifications=101
         notification_id = random.randint(1, reasonable_amount_of_notifications)
         while notification_id in self.notification_ids:
-            notification_id = random.randint(1, 100)
+            notification_id = random.randint(1, reasonable_amount_of_notifications)
         self.notification_ids.append(notification_id)
         return notification_id
 
@@ -349,8 +352,66 @@ class Notification:
         # Remove leading/trailing underscores
         channel_id = channel_id.strip('_')
         return channel_id[:50]
+    def __addIntentToOpenApp(self):
+        intent = Intent(context, PythonActivity)
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP)
+        pending_intent = PendingIntent.getActivity(
+                            context, 0,
+                            intent, PendingIntent.FLAG_IMMUTABLE if BuildVersion.SDK_INT >= 31 else PendingIntent.FLAG_UPDATE_CURRENT
+                        )
+        self.__builder.setContentIntent(pending_intent)
+        self.__builder.setAutoCancel(True)
+
+    def __getIDForButton(self):
+        reasonable_amount_of_notifications=101
+        btn_id = random.randint(1, reasonable_amount_of_notifications)
+        while btn_id in self.button_ids:
+            btn_id = random.randint(1, reasonable_amount_of_notifications)
+        self.button_ids.append(btn_id)
+        return str(btn_id)
+
+    def addButton(self, text:str,on_release):
+        """For adding action buttons
+
+        Args:
+            text (str): Text For Button
+        """
+        if not ON_ANDROID:
+            return
+
+        if self.logs:
+            print('Added Button: '+text)
+        action_intent = Intent(context, PythonActivity)
+        action_intent.setAction("ACTION "+ self.__getIDForButton())
+        pending_action_intent = PendingIntent.getActivity(
+            context,
+            0,
+            action_intent,
+            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)
+                # on_release()
+
+# def buttonsListener():
+#     """Handle notification button clicks"""
+#     try:
+#         intent = context.getIntent()
+#         action = context.getAction()
+#         print("The Action --> ",action)
+#         intent.setAction("")
+#         context.setIntent(intent)
+#     except Exception as e:
+#         print("Catching Intents Error ",e)
 
-# try:
 #     notify=Notification(titl='My Title',channel_name='Go')#,logs=False)
 #     # notify.channel_name='Downloads'
 #     notify.message="Blah"

{android_notify-1.32.1.dist-info → android_notify-1.40.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: android-notify
-Version: 1.32.1
+Version: 1.40.1
 Summary: A Python package that simpilfies creating Android notifications in Kivy apps.
 Home-page: https://github.com/fector101/android-notify
 Author: Fabian
@@ -33,7 +33,7 @@ Requires-Dist: pyjnius>=1.4.2
 
 ## Features
 
-- Compatible with Android 8.0+.
+- Also Compatible with Android 8.0+.
 - Supports including images in notifications.
 - Support for multiple notification styles:
   - [Simple](#basic-usage)
@@ -41,6 +41,7 @@ Requires-Dist: pyjnius>=1.4.2
   - [Big Picture](#notification-with-an-image-big-picture-style)
   - [Inbox](#inbox-notification-style)
   - [Large Icon](#notification-with-an-image-large-icon-style)
+  - [Buttons](#notification-with-buttons)
   - [Big Text](#big-text-notification-will-display-as-simple-text-if-device-dosent-support)
 
 This module automatically handles:
@@ -112,7 +113,8 @@ The library supports multiple notification styles:
 #### Progress Bar notification
 
 ```python
-import time
+from kivy.clock import Clock
+
 notification = Notification(
     title="Downloading...",
     message="0% downloaded",
@@ -121,8 +123,7 @@ notification = Notification(
     progress_current_value=0
 )
 notification.send()
-time.sleep(350)
-notification.updateProgressBar(30, "30% downloaded")
+Clock.schedule_once(lambda dt: notification.updateProgressBar(30, "30% downloaded"), 350)
 ```
 
 **Sample Image:**
@@ -161,22 +162,12 @@ notification.send()
 **Sample Image:**
 ![Inbox Notification sample](https://raw.githubusercontent.com/Fector101/android_notify/main/docs/imgs/inboxnoti.jpg)
 
-#### Big text notification (Will Display as simple text if Device dosen't support)
-
-```python
-notification = Notification(
-    title="Article",
-    message="Long article content...",
-    style="big_text"
-)
-```
-
 #### Notification with an Image (Large Icon Style)
 
 ```python
 notification = Notification(
-    title="Completed download",
-    message="profile.jpg",
+    title="FabianDev_",
+    message="A twitter about some programming stuff",
     style="large_icon",
     large_icon_path="assets/imgs/profile.png"
 )
@@ -186,6 +177,38 @@ notification = Notification(
 **Sample Image:**  
 ![large_icon img sample](https://raw.githubusercontent.com/Fector101/android_notify/main/docs/imgs/large_icon.jpg)
 
+#### Notification with Buttons
+
+```python
+notification = Notification(title="Jane Dough", message="How to use android-notify #coding #purepython")
+def playVideo():
+    print('Playing Video')
+
+def turnOffNoti():
+    print('Please Turn OFf Noti')
+
+def watchLater():
+    print('Add to Watch Later')
+
+notification.addButton(text="Play",on_release=playVideo)
+notification.addButton(text="Turn Off",on_release=turnOffNoti)
+notification.addButton(text="Watch Later",on_release=watchLater)
+notification.send()
+```
+
+**Sample Image:**  
+![btns img sample](https://raw.githubusercontent.com/Fector101/android_notify/main/docs/imgs/btns.jpg)
+
+#### Big text notification (Will Display as normal text if Device dosen't support)
+
+```python
+notification = Notification(
+    title="Article",
+    message="Long article content...",
+    style="big_text"
+)
+```
+
 ## Advanced Features
 
 ### Updating Notifications

{android_notify-1.32.1.dist-info → android_notify-1.40.1.dist-info}/RECORD

@@ -2,8 +2,8 @@ android_notify/__init__.py,sha256=dAcsj7M_KHBOira9AVk4LtFFXRHTYsn6tza4Oz7T1MM,10
 android_notify/__main__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 android_notify/core.py,sha256=hHzBnVw25x_WpMHp_HPKCuHEL2mQ7IHC_I3EqQZylas,6081
 android_notify/styles.py,sha256=I2p31qStg9DaML9U4nXRvdpGzpppK6RS-qlDKuOv_Tk,328
-android_notify/sword.py,sha256=8v28Q9x3CRRa3xDbHUd8629S5KvLy7xnjSygbqT-coQ,16271
-android_notify-1.32.1.dist-info/METADATA,sha256=1d_YFS42LSiHBl8gy6OBxJnvwliX7f2Lhv4euoVFzy0,10425
-android_notify-1.32.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-android_notify-1.32.1.dist-info/top_level.txt,sha256=IR1ONMrRSRINZpWn2X0dL5gbWwWINsK7PW8Jy2p4fU8,15
-android_notify-1.32.1.dist-info/RECORD,,
+android_notify/sword.py,sha256=Z74sBX5kJ5kRDQTw4fviDV42TynJhLf2cr87tiuH8oQ,19042
+android_notify-1.40.1.dist-info/METADATA,sha256=xbGSDRLfhTy6UcG287MKglrArMzjRs1LQGmz12JbTV4,11161
+android_notify-1.40.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+android_notify-1.40.1.dist-info/top_level.txt,sha256=IR1ONMrRSRINZpWn2X0dL5gbWwWINsK7PW8Jy2p4fU8,15
+android_notify-1.40.1.dist-info/RECORD,,