android-notify 1.60.10.dev0__tar.gz → 1.61.0__tar.gz

{android_notify-1.60.10.dev0 → android_notify-1.61.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: android-notify
-Version: 1.60.10.dev0
+Version: 1.61.0
 Summary: A Python package that simplifies creating Android notifications in Kivy and Flet apps.
 Author-email: Fabian <fector101@yahoo.com>
 License-Expression: MIT
@@ -81,9 +81,14 @@ In your **`buildozer.spec`** file, ensure you include the following:
 
 ```ini
 # Add pyjnius so ensure it's packaged with the build
-requirements = python3, kivy, pyjnius, android-notify==1.60.10.dev0
+requirements = python3, kivy, pyjnius, android-notify
 # Add permission for notifications
 android.permissions = POST_NOTIFICATIONS
+
+# Required dependency (write exactly as shown, no quotation marks)
+android.gradle_dependencies = androidx.core:core-ktx:1.15.0
+android.enable_androidx = True
+android.api = 35
 ```
 
 </details>
@@ -93,13 +98,13 @@ android.permissions = POST_NOTIFICATIONS
 <summary><b>Flet apps:</b></summary>
 <br/>
 
-In your `pyproject.toml` file, ensure you include the following:
+ In your `pyproject.toml` file, ensure you include the following:
 
 
 ```toml
 [tool.flet.android]
 dependencies = [
-  "pyjnius","android-notify==1.60.10.dev0"
+  "pyjnius","android-notify==1.61.0.dev0"
 ]
 
 [tool.flet.android.permission]
@@ -109,7 +114,35 @@ dependencies = [
 
 </details>
 
+<details>
+
+<summary><b>Desktop</b></summary>
+<br/>
+
+For IDE IntelliSense Can be installed via `pip install`:
+
+```bash
+pip install android_notify
+android-notify -v
+```
+
+</details>
+
+------
+## Installing without Androidx
+How to use without `gradle_dependencies`
+Use `android-notify==1.61.0.dev0` to install via `pip`
+
+<details>
+<summary><b>In Kivy</b></summary>
+<br/>
+
+```ini
+# buildozer.spec
+requirements = python3, kivy, pyjnius, android-notify==1.61.0.dev0
+```
 
+</details>
 
 <details>
 
@@ -117,10 +150,10 @@ dependencies = [
 <br/>
 
 On the [pydroid 3](https://play.google.com/store/apps/details?id=ru.iiec.pydroid3) mobile app for running python code you can test some features.
-- In pip section where you're asked to insert `Libary name` paste `android-notify==1.60.10.dev0`
+- In pip section where you're asked to insert `Libary name` paste `android-notify==1.61.0.dev0`
 - Minimal working example 
 ```py
-# Testing with `android-notify==1.60.10.dev0` on pydroid
+# Testing with `android-notify==1.61.0.dev0` on pydroid
 from kivy.app import App
 from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.button import Button
@@ -147,9 +180,7 @@ class AndroidNotifyDemoApp(App):
     def send_notification(self, *args):
         Notification(
             title="Hello from Android Notify",
-            message="This is a basic notification.",
-            channel_id="android_notify_demo",
-            channel_name="Android Notify Demo"
+            message="This is a basic notification."
         ).send()
 
 
@@ -160,23 +191,11 @@ if __name__ == "__main__":
 </details>
 
 
-<details>
-
-<summary><b>Desktop</b></summary>
-<br/>
-
-For IDE IntelliSense Can be installed via `pip install`:
-
-```bash
-pip install android_notify
-android-notify -v
-```
-</details>
 
 ## Documentation
-For Dev Version use
+For Dev Version usage
 ```ini
-requirements = python3, kivy, pyjnius, https://github.com/Fector101/android_notify/archive/without-androidx.zip
+requirements = python3, kivy, pyjnius, https://github.com/Fector101/android_notify/archive/main.zip
 ```
 
 <details>
@@ -185,7 +204,7 @@ requirements = python3, kivy, pyjnius, https://github.com/Fector101/android_noti
 - Make things happen without being in your app
 ```python
 from android_notify import Notification
-notification = Notification(title="Receiver Notification")
+notification = Notification(title="Reciver Notification")
 notification.addButton(text="Stop", receiver_name="CarouselReceiver", action="ACTION_STOP")
 notification.addButton(text="Skip", receiver_name="CarouselReceiver", action="ACTION_SKIP")
 ```
@@ -248,7 +267,7 @@ Notification.createChannel(id='shake', name="Shake Passage", vibrate=True)
 
 n=Notification(title='Vibrate',channel_id='shake')
 n.setVibrate() # for less than android 8
-n.fVibrate() # To Force Vibrate (when user turned off in settings)
+n.fVibrate() # To Force Vibrate
 n.send()
 ```
 
@@ -286,9 +305,5 @@ from android_notify import Notification, NotificationHandler
 
 ## ☕ Support the Project
 
-If you find this project helpful, consider buying me a coffee! 😊  
-Or Giving it a star on 🌟 [GitHub](https://github.com/Fector101/android_notify/) Your support helps maintain and improve the project.
-
-<a href="https://www.buymeacoffee.com/fector101" target="_blank">
-  <img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" height="60">
-</a>
+If you find this project helpful, your support would help me continue working on open-source projects
+[donate](https://www.buymeacoffee.com/fector101)

{android_notify-1.60.10.dev0 → android_notify-1.61.0}/README.md

@@ -58,9 +58,14 @@ In your **`buildozer.spec`** file, ensure you include the following:
 
 ```ini
 # Add pyjnius so ensure it's packaged with the build
-requirements = python3, kivy, pyjnius, android-notify==1.60.10.dev0
+requirements = python3, kivy, pyjnius, android-notify
 # Add permission for notifications
 android.permissions = POST_NOTIFICATIONS
+
+# Required dependency (write exactly as shown, no quotation marks)
+android.gradle_dependencies = androidx.core:core-ktx:1.15.0
+android.enable_androidx = True
+android.api = 35
 ```
 
 </details>
@@ -70,13 +75,13 @@ android.permissions = POST_NOTIFICATIONS
 <summary><b>Flet apps:</b></summary>
 <br/>
 
-In your `pyproject.toml` file, ensure you include the following:
+ In your `pyproject.toml` file, ensure you include the following:
 
 
 ```toml
 [tool.flet.android]
 dependencies = [
-  "pyjnius","android-notify==1.60.10.dev0"
+  "pyjnius","android-notify==1.61.0.dev0"
 ]
 
 [tool.flet.android.permission]
@@ -86,7 +91,35 @@ dependencies = [
 
 </details>
 
+<details>
+
+<summary><b>Desktop</b></summary>
+<br/>
+
+For IDE IntelliSense Can be installed via `pip install`:
+
+```bash
+pip install android_notify
+android-notify -v
+```
+
+</details>
+
+------
+## Installing without Androidx
+How to use without `gradle_dependencies`
+Use `android-notify==1.61.0.dev0` to install via `pip`
+
+<details>
+<summary><b>In Kivy</b></summary>
+<br/>
+
+```ini
+# buildozer.spec
+requirements = python3, kivy, pyjnius, android-notify==1.61.0.dev0
+```
 
+</details>
 
 <details>
 
@@ -94,10 +127,10 @@ dependencies = [
 <br/>
 
 On the [pydroid 3](https://play.google.com/store/apps/details?id=ru.iiec.pydroid3) mobile app for running python code you can test some features.
-- In pip section where you're asked to insert `Libary name` paste `android-notify==1.60.10.dev0`
+- In pip section where you're asked to insert `Libary name` paste `android-notify==1.61.0.dev0`
 - Minimal working example 
 ```py
-# Testing with `android-notify==1.60.10.dev0` on pydroid
+# Testing with `android-notify==1.61.0.dev0` on pydroid
 from kivy.app import App
 from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.button import Button
@@ -124,9 +157,7 @@ class AndroidNotifyDemoApp(App):
     def send_notification(self, *args):
         Notification(
             title="Hello from Android Notify",
-            message="This is a basic notification.",
-            channel_id="android_notify_demo",
-            channel_name="Android Notify Demo"
+            message="This is a basic notification."
         ).send()
 
 
@@ -137,23 +168,11 @@ if __name__ == "__main__":
 </details>
 
 
-<details>
-
-<summary><b>Desktop</b></summary>
-<br/>
-
-For IDE IntelliSense Can be installed via `pip install`:
-
-```bash
-pip install android_notify
-android-notify -v
-```
-</details>
 
 ## Documentation
-For Dev Version use
+For Dev Version usage
 ```ini
-requirements = python3, kivy, pyjnius, https://github.com/Fector101/android_notify/archive/without-androidx.zip
+requirements = python3, kivy, pyjnius, https://github.com/Fector101/android_notify/archive/main.zip
 ```
 
 <details>
@@ -162,7 +181,7 @@ requirements = python3, kivy, pyjnius, https://github.com/Fector101/android_noti
 - Make things happen without being in your app
 ```python
 from android_notify import Notification
-notification = Notification(title="Receiver Notification")
+notification = Notification(title="Reciver Notification")
 notification.addButton(text="Stop", receiver_name="CarouselReceiver", action="ACTION_STOP")
 notification.addButton(text="Skip", receiver_name="CarouselReceiver", action="ACTION_SKIP")
 ```
@@ -225,7 +244,7 @@ Notification.createChannel(id='shake', name="Shake Passage", vibrate=True)
 
 n=Notification(title='Vibrate',channel_id='shake')
 n.setVibrate() # for less than android 8
-n.fVibrate() # To Force Vibrate (when user turned off in settings)
+n.fVibrate() # To Force Vibrate
 n.send()
 ```
 
@@ -263,9 +282,5 @@ from android_notify import Notification, NotificationHandler
 
 ## ☕ Support the Project
 
-If you find this project helpful, consider buying me a coffee! 😊  
-Or Giving it a star on 🌟 [GitHub](https://github.com/Fector101/android_notify/) Your support helps maintain and improve the project.
-
-<a href="https://www.buymeacoffee.com/fector101" target="_blank">
-  <img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" height="60">
-</a>
+If you find this project helpful, your support would help me continue working on open-source projects
+[donate](https://www.buymeacoffee.com/fector101)

{android_notify-1.60.10.dev0 → android_notify-1.61.0}/android_notify/base.py

@@ -11,15 +11,10 @@ class BaseNotification:
     # Basic options
     title: str = ''
     message: str = ''
-    style: str = 'simple'
 
     # Style-specific attributes
-    big_picture_path: str = ''
-    large_icon_path: str = ''
     progress_max_value: int = 0
     progress_current_value: float = 0.0 # Also Takes in Ints
-    body: str = ''
-    lines_txt: str = ''
 
     # Notification Functions
     name: str = ''
@@ -28,7 +23,6 @@ class BaseNotification:
     # Advanced Options
     id: int = 0
     app_icon: str = 'Defaults to package app icon'
-    sub_text: str=''
 
     # Channel related
     channel_name: str = 'Default Channel'
@@ -86,12 +80,3 @@ class BaseNotification:
                 if not isinstance(actual_value, expected_type):
                     raise TypeError(f"Expected '{each_arg}' to be {expected_type}, got {type(actual_value)} instead.")
 
-        # Validate `style` values
-        style_values = [value for key, value in vars(NotificationStyles).items() if not key.startswith("__")]
-        if 'style' in inputted_kwargs and inputted_kwargs['style'] not in ['',*style_values]:
-            inputted_style=inputted_kwargs['style']
-            allowed_styles=', '.join(style_values)
-            raise ValueError(
-                f"Invalid style '{inputted_style}'. Allowed styles: {allowed_styles}"
-            )
-

{android_notify-1.60.10.dev0 → android_notify-1.61.0}/android_notify/config.py

@@ -1,7 +1,6 @@
 import os
 
-__version__ = "1.60.10.dev0"
-
+__version__ = "1.61.0"
 
 from .internal.java_classes import autoclass, cast, NotificationManager
 from .internal.logger import logger

{android_notify-1.60.10.dev0 → android_notify-1.61.0}/android_notify/core.py

@@ -6,7 +6,7 @@ from android_notify.internal.logger import logger
 from android_notify.config import get_python_activity, on_android_platform, get_python_activity_context
 from android_notify.internal.permissions import has_notification_permission, ask_notification_permission
 from android_notify.internal.java_classes import autoclass, BuildVersion, BitmapFactory, NotificationChannel, NotificationManagerCompat, NotificationCompat, NotificationCompatBuilder, \
-    NotificationCompatBigTextStyle, NotificationCompatBigPictureStyle, NotificationCompatInboxStyle
+    NotificationCompatBigTextStyle, NotificationCompatBigPictureStyle, NotificationCompatInboxStyle, IconCompat
 
 
 
@@ -60,7 +60,6 @@ def get_image_uri(relative_path):
 
 def get_icon_object(uri):
     context = get_python_activity_context()
-    IconCompat = autoclass('android.graphics.drawable.Icon')
     bitmap = BitmapFactory.decodeStream(context.getContentResolver().openInputStream(uri))
     return IconCompat.createWithBitmap(bitmap)
 
@@ -115,7 +114,9 @@ def send_notification(
         return None
     context = get_python_activity_context()
 
-    asks_permission_if_needed(legacy=True)
+
+    asks_permission_if_needed()
+
     channel_id = channel_name.replace(' ', '_').lower().lower() if not channel_id else channel_id
     # Get notification manager
     notification_manager = context.getSystemService(context.NOTIFICATION_SERVICE)

{android_notify-1.60.10.dev0 → android_notify-1.61.0}/android_notify/internal/android.py

@@ -180,3 +180,24 @@ def force_vibrate(repeat=False):
     else:
         vibrator.vibrate(pattern, -1 if not repeat else 0)
         return None
+
+
+def get_active_notification_ids(notification_manager=None) -> list:
+    """
+        Returns the IDS of all currently active notifications for your app.
+        Android 6+
+    """
+    active_notification_ids = []
+    if not on_android_platform():
+        return active_notification_ids
+
+    if BuildVersion.SDK_INT < 23:
+        return active_notification_ids
+
+    notification_manager = notification_manager or get_notification_manager()
+    activeNotifications = notification_manager.getActiveNotifications()
+
+    for status_bar_notification in activeNotifications:
+        active_notification_ids.append(status_bar_notification.getId())
+
+    return active_notification_ids

{android_notify-1.60.10.dev0 → android_notify-1.61.0}/android_notify/internal/java_classes.py

@@ -39,24 +39,31 @@ if on_android_platform():
         Manifest = autoclass('android.Manifest$permission')
         Color = autoclass('android.graphics.Color')
         Context = autoclass('android.content.Context')
-        PackageManager = autoclass("android.content.pm.PackageManager")
     except Exception as e:
         from .facade import *
         logger.exception("Didn't get Basic Java Classes")
 
     # noinspection PyBroadException
     try:
-        NotificationManagerCompat = NotificationManager # I need other files identical to main branch so it's easier to maintain
-        NotificationCompat = autoclass("android.app.Notification")
-        NotificationCompatBuilder = autoclass('android.app.Notification$Builder')
-        NotificationCompatBigTextStyle = autoclass('android.app.Notification$BigTextStyle')
-        NotificationCompatBigPictureStyle = autoclass('android.app.Notification$BigPictureStyle')
-        NotificationCompatInboxStyle = autoclass('android.app.Notification$InboxStyle')
+        NotificationManagerCompat = autoclass('androidx.core.app.NotificationManagerCompat')
+        NotificationCompat = autoclass('androidx.core.app.NotificationCompat')
+        NotificationCompatBuilder = autoclass('androidx.core.app.NotificationCompat$Builder')
+        IconCompat = autoclass('androidx.core.graphics.drawable.IconCompat')
 
-    except Exception as styles_import_error:
-        logger.exception(styles_import_error)
-        from .facade import *
+        # Notification Design
+        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 dependencies_import_error:
+        logger.exception("""
+        Dependency Error: Add the following in buildozer.spec:
+        * android.gradle_dependencies = androidx.core:core-ktx:1.15.0, androidx.core:core:1.6.0
+        * android.enable_androidx = True
+        """)
 
+        from .facade import *
 else:
     cast = lambda x, y: x
     autoclass = lambda x: None

{android_notify-1.60.10.dev0 → android_notify-1.61.0}/android_notify/internal/permissions.py

@@ -5,7 +5,7 @@ import os.path
 
 from .logger import logger
 from android_notify.config import on_android_platform, on_flet_app, get_python_activity_context
-from android_notify.internal.java_classes import autoclass, BuildVersion, Manifest, Intent, String, Settings, Uri, PackageManager, NotificationManagerCompat
+from android_notify.internal.java_classes import autoclass, BuildVersion, Manifest, Intent, String, Settings, Uri, NotificationManagerCompat
 from android_notify.internal.helper import execute_callback
 
 
@@ -19,10 +19,10 @@ def has_notification_permission():
 
     if BuildVersion.SDK_INT < 33:  # Android 12 and below
         try:
-            # NotificationManagerCompat is actually NotificationManager from android_notify.internal.java_classes
             context = get_python_activity_context()
-            nm = context.getSystemService(NotificationManagerCompat)
-            return nm.areNotificationsEnabled()
+            func_from = getattr(NotificationManagerCompat, "from")
+            compat_manager = func_from(context)
+            return compat_manager.areNotificationsEnabled()
         except Exception as error_checking_permission:
             logger.exception(f"On Android 12 and below Error checking permission: {error_checking_permission}")
             return None
@@ -30,8 +30,10 @@ def has_notification_permission():
     if on_flet_app():
         context = get_python_activity_context()
         permission = Manifest.POST_NOTIFICATIONS
-
-        return PackageManager.PERMISSION_GRANTED == context.checkSelfPermission(permission)
+        ContextCompat = autoclass('androidx.core.content.ContextCompat')
+        # if you get error `Failed to find class: androidx/core/app/ActivityCompat`
+        # in proguard-rules.pro add `-keep class androidx.core.app.ActivityCompat { *; }`
+        return ContextCompat.checkSelfPermission(context, permission)
     else:
         from android.permissions import Permission, check_permission  # type: ignore
         return check_permission(Permission.POST_NOTIFICATIONS)
@@ -80,10 +82,21 @@ def ask_notification_permission(callback=None, set_requesting_state=None, legacy
         execute_callback(callback, grants[0])
         execute_callback(set_requesting_state, False,from_who="package")
 
-    if legacy or on_flet_app():
+    if legacy:
         # TODO Handle activity with request code
+        PackageManager = autoclass("android.content.pm.PackageManager")
+        permission = Manifest.POST_NOTIFICATIONS
+
+        granted = context.checkSelfPermission(permission)
+        if granted != PackageManager.PERMISSION_GRANTED:
+            context.requestPermissions([permission], 101)
+        return None
+    elif on_flet_app():
+        # TODO Callback when user answers request question
+        # Can't bind activity result method is from p4a which is only on kivy
+        ActivityCompat = autoclass('androidx.core.app.ActivityCompat')
         permission = Manifest.POST_NOTIFICATIONS
-        context.requestPermissions([permission], 101)
+        ActivityCompat.requestPermissions(context, [permission], 101)
         return None
     else:
         from android.permissions import request_permissions, Permission  # type: ignore