android-notify 1.61.3.dev0__tar.gz → 1.61.4__tar.gz

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: android-notify
-Version: 1.61.3.dev0
+Version: 1.61.4
 Summary: A Python package that simplifies creating Android notifications in Kivy and Flet apps.
 Author-email: Fabian <fector101@yahoo.com>
 License-Expression: MIT
@@ -53,6 +53,8 @@ The Android Notify package provides a simple yet comprehensive way to create and
   - Persistent notifications
   - Click handlers and callbacks
   - Cancel Notifications
+  - Use [Custom Sound](https://android-notify.vercel.app/advanced-methods#custom-sound)
+  - Vibration [section](https://android-notify.vercel.app/advanced-methods#vibration)
 
 ## Quick Start
 
@@ -80,14 +82,13 @@ 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.61.3.dev0
+requirements = python3, kivy, pyjnius, android-notify
 # Add permission for notifications
 android.permissions = POST_NOTIFICATIONS
 ```
 
 </details>
 
-
 <details>
 <summary><b>Flet apps:</b></summary>
 <br/>
@@ -98,7 +99,7 @@ In your `pyproject.toml` file, ensure you include the following:
 ```toml
 [tool.flet.android]
 dependencies = [
-  "pyjnius","android-notify==1.61.3.dev0"
+  "pyjnius","android-notify"
 ]
 
 [tool.flet.android.permission]
@@ -108,23 +109,19 @@ dependencies = [
 
 </details>
 
-
-
 <details>
 
 <summary><b>On Pydroid 3</b></summary>
 <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.61.3.dev0`
+- In pip section where you're asked to insert `Libary name` paste `android-notify`
 - Minimal working example 
 ```py
-# Testing with `android-notify==1.61.3.dev0` on pydroid
 from kivy.app import App
 from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.button import Button
-from android_notify import Notification
-from android_notify.core import asks_permission_if_needed
+from android_notify import Notification, NotificationHandler
 
 
 class AndroidNotifyDemoApp(App):
@@ -146,9 +143,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()
 
 
@@ -173,38 +168,11 @@ 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>
-<summary> <b> To talk to BroadCast Listener From Buttons </b> </summary>
-
-- Make things happen without being in your app
-```python
-from android_notify import Notification
-notification = Notification(title="Receiver Notification")
-notification.addButton(text="Stop", receiver_name="CarouselReceiver", action="ACTION_STOP")
-notification.addButton(text="Skip", receiver_name="CarouselReceiver", action="ACTION_SKIP")
-```
-You can use this [wiki](https://github.com/Fector101/android_notify/wiki/How-to-Use-with-Broadcast-Listener) as a guide create a broadcast listener
-</details>
-
-<details>
-<summary> <b> To use colored text in your notifications </b> </summary>
-
-- Copy the [res](https://github.com/Fector101/android_notify/tree/main/android_notify/res) folder to your app path.  
-- Lastly in your `buildozer.spec` file  
-Add `source.include_exts = xml` and `android.add_resources = # path you pasted`
-```python
-# Use Hex Code to be Safe
-n = Notification(title="Title and Message Color", message="Testing",title_color="red")
-n.send()
-```
-
-</details>
-
 <details>
 <summary> <b>To use Custom Sounds </b> </summary>
 
@@ -267,26 +235,6 @@ Private files (e.g., in app's `data/` directory) are automatically copied to ext
 </details>
 
 
-<details>
-<summary> <b> Vibrate feature</b> </summary>
-
-```ini
-# buildozer.spec
-android.permissions = VIBRATE
-```
-
-```python
-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.send()
-```
-
-</details>
-
-
 <details>
 <summary> <b> Add Data to Notification</b> </summary>
 
@@ -324,3 +272,16 @@ Or Giving it a star on 🌟 [GitHub](https://github.com/Fector101/android_notify
 <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>
+
+## Bug Reports & Feature Requests
+
+Found a bug or have an idea for a new feature?  
+Feel free to open an issue [here](https://reference-url-citation.invalid/0)
+
+When reporting a bug, try to include:
+- Device name
+- Android version
+- Steps to reproduce the issue
+- Screenshots or logs (if possible)
+
+Feature suggestions are also welcome.

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/README.md

@@ -31,6 +31,8 @@ The Android Notify package provides a simple yet comprehensive way to create and
   - Persistent notifications
   - Click handlers and callbacks
   - Cancel Notifications
+  - Use [Custom Sound](https://android-notify.vercel.app/advanced-methods#custom-sound)
+  - Vibration [section](https://android-notify.vercel.app/advanced-methods#vibration)
 
 ## Quick Start
 
@@ -58,14 +60,13 @@ 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.61.3.dev0
+requirements = python3, kivy, pyjnius, android-notify
 # Add permission for notifications
 android.permissions = POST_NOTIFICATIONS
 ```
 
 </details>
 
-
 <details>
 <summary><b>Flet apps:</b></summary>
 <br/>
@@ -76,7 +77,7 @@ In your `pyproject.toml` file, ensure you include the following:
 ```toml
 [tool.flet.android]
 dependencies = [
-  "pyjnius","android-notify==1.61.3.dev0"
+  "pyjnius","android-notify"
 ]
 
 [tool.flet.android.permission]
@@ -86,23 +87,19 @@ dependencies = [
 
 </details>
 
-
-
 <details>
 
 <summary><b>On Pydroid 3</b></summary>
 <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.61.3.dev0`
+- In pip section where you're asked to insert `Libary name` paste `android-notify`
 - Minimal working example 
 ```py
-# Testing with `android-notify==1.61.3.dev0` on pydroid
 from kivy.app import App
 from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.button import Button
-from android_notify import Notification
-from android_notify.core import asks_permission_if_needed
+from android_notify import Notification, NotificationHandler
 
 
 class AndroidNotifyDemoApp(App):
@@ -124,9 +121,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()
 
 
@@ -151,38 +146,11 @@ 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>
-<summary> <b> To talk to BroadCast Listener From Buttons </b> </summary>
-
-- Make things happen without being in your app
-```python
-from android_notify import Notification
-notification = Notification(title="Receiver Notification")
-notification.addButton(text="Stop", receiver_name="CarouselReceiver", action="ACTION_STOP")
-notification.addButton(text="Skip", receiver_name="CarouselReceiver", action="ACTION_SKIP")
-```
-You can use this [wiki](https://github.com/Fector101/android_notify/wiki/How-to-Use-with-Broadcast-Listener) as a guide create a broadcast listener
-</details>
-
-<details>
-<summary> <b> To use colored text in your notifications </b> </summary>
-
-- Copy the [res](https://github.com/Fector101/android_notify/tree/main/android_notify/res) folder to your app path.  
-- Lastly in your `buildozer.spec` file  
-Add `source.include_exts = xml` and `android.add_resources = # path you pasted`
-```python
-# Use Hex Code to be Safe
-n = Notification(title="Title and Message Color", message="Testing",title_color="red")
-n.send()
-```
-
-</details>
-
 <details>
 <summary> <b>To use Custom Sounds </b> </summary>
 
@@ -245,26 +213,6 @@ Private files (e.g., in app's `data/` directory) are automatically copied to ext
 </details>
 
 
-<details>
-<summary> <b> Vibrate feature</b> </summary>
-
-```ini
-# buildozer.spec
-android.permissions = VIBRATE
-```
-
-```python
-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.send()
-```
-
-</details>
-
-
 <details>
 <summary> <b> Add Data to Notification</b> </summary>
 
@@ -302,3 +250,16 @@ Or Giving it a star on 🌟 [GitHub](https://github.com/Fector101/android_notify
 <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>
+
+## Bug Reports & Feature Requests
+
+Found a bug or have an idea for a new feature?  
+Feel free to open an issue [here](https://reference-url-citation.invalid/0)
+
+When reporting a bug, try to include:
+- Device name
+- Android version
+- Steps to reproduce the issue
+- Screenshots or logs (if possible)
+
+Feature suggestions are also welcome.

android_notify-1.61.4/android_notify/__main__.py

@@ -0,0 +1,75 @@
+import argparse
+import os
+import shutil
+from .config import __version__
+
+BUILD_PATHS = [
+    os.path.join(".buildozer", "android", "platform", "build-arm64-v8a_armeabi-v7a", "build", "python-installs"),
+    os.path.join(".buildozer", "android", "platform", "build-arm64-v8a_armeabi-v7a", "dists"),
+# ".buildozer/android/platform/build-arm64-v8a_armeabi-v7a/build/python-installs",
+# ".buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists",
+]
+
+def print_version():
+    text = f"android_notify: v{__version__}"
+    border = '+'+'-'*(len(text) + 2)+'+'
+    print(border)
+    print(f'| {text} |')
+    print(border)
+
+def cmd_prune(args):
+    project_path = str(os.path.abspath(args.path))
+    items = []
+
+    for rel in BUILD_PATHS:
+        root = os.path.join(project_path, rel)
+        if not os.path.isdir(root):
+            continue
+        for dirpath, dir_names, filenames in os.walk(root):
+            for name in dir_names + filenames:
+                if name.startswith("android_notify"):
+                    items.append(os.path.join(dirpath, name))
+
+    if not items:
+        print("No android_notify items found.")
+        return
+
+    print("\n=== android_notify items found ===")
+    for i, item in enumerate(items, 1):
+        print(f"  {i}. {item}")
+    print("==================================\n")
+
+    ans = input("Delete these? (y/N) ").strip().lower()
+    if ans == "y":
+        items.sort(key=len, reverse=True)
+        for item in items:
+            if not os.path.exists(item):
+                continue
+            if os.path.isdir(item):
+                shutil.rmtree(item)
+            else:
+                os.remove(item)
+            print(f"  Deleted: {item}")
+        print("Done.")
+    else:
+        print("Skipped.")
+
+def main():
+    parser = argparse.ArgumentParser(description="Android Notify CLI")
+    parser.add_argument('-v', '--version', action='store_true', help="Show the version of android_notify")
+
+    subparsers = parser.add_subparsers(dest='command', help='Available commands')
+    prune_parser = subparsers.add_parser('prune', help='Remove old android_notify build artifacts from .buildozer')
+    prune_parser.add_argument('-p', '--path', default='.', help='Path to the project directory (default: current directory)')
+
+    args = parser.parse_args()
+
+    if args.version:
+        print_version()
+    elif args.command == 'prune':
+        cmd_prune(args)
+    elif args.command is None:
+        parser.print_help()
+
+if __name__ == "__main__":
+    main()

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/android_notify/config.py

@@ -1,12 +1,9 @@
 import os
 
-__version__ = "1.61.3.dev0"
+__version__ = "1.61.4"
 
-
-from .internal.java_classes import autoclass, cast, NotificationManager
 from .internal.logger import logger
 
-
 def on_kivy_android():
     kivy_build = os.environ.get('KIVY_BUILD', '')
     if kivy_build in {'android'}:
@@ -27,6 +24,37 @@ def on_android_platform():
     return on_kivy_android() or on_flet_app()
 
 
+if on_android_platform():
+    try:
+        from jnius import cast, autoclass
+    except ModuleNotFoundError:
+        cast = lambda x, y: x
+        autoclass = lambda x: None
+else:
+    cast = lambda x, y: x
+    autoclass = lambda x: None
+
+
+def on_pydroid_app():
+    package_name = "ru.iiec.pydroid3"
+    if package_name in os.environ.get("PYTHONHOME",""):
+        return True
+    elif package_name in os.path.dirname(os.path.abspath(__file__)):
+        return True
+    elif on_android_platform():
+        return package_name == get_package_name()
+    return False
+
+
+def has_androidx_dependency():
+    """Check if androidx dependencies are available"""
+    try:
+        _=autoclass('androidx.core.app.NotificationCompat')
+        return True
+    except Exception:
+        return False
+
+
 def get_activity_class_name():
     ACTIVITY_CLASS_NAME = os.getenv("MAIN_ACTIVITY_HOST_CLASS_NAME")  # flet python
     if not ACTIVITY_CLASS_NAME:
@@ -99,6 +127,7 @@ def get_notification_manager():
     if not on_android_platform():
         logger.warning("Can't get notification manager, Not on Android.")
         return None
+    NotificationManager = autoclass('android.app.NotificationManager')
 
     context = get_python_activity_context()
     notification_service = context.getSystemService(context.NOTIFICATION_SERVICE)

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/android_notify/core.py

@@ -3,15 +3,12 @@ import random
 import os
 
 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.config import get_python_activity, on_android_platform, get_python_activity_context, on_flet_app, on_pydroid_app
 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, IconClass
 
-def on_flet_app():
-    return os.getenv("MAIN_ACTIVITY_HOST_CLASS_NAME")
 
 
 if on_android_platform():
@@ -60,9 +57,8 @@ 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)
+    return IconClass.createWithBitmap(bitmap)
 
 
 def insert_app_icon(builder, custom_icon_path):
@@ -115,7 +111,8 @@ def send_notification(
         return None
     context = get_python_activity_context()
 
-    asks_permission_if_needed(legacy=True)
+    use_legacy =  on_flet_app() or on_pydroid_app()
+    asks_permission_if_needed(legacy=use_legacy)
     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.61.3.dev0 → android_notify-1.61.4}/android_notify/internal/channels.py

@@ -46,7 +46,7 @@ def create_channel(id__, name: str, description='', importance: Importance = 'ur
 
     notification_manager = get_notification_manager()
     android_importance_value = get_android_importance(importance)
-    
+
     if sound_path:
         sound_uri = get_sound_uri_from_path(sound_path)
     else:

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/android_notify/internal/facade.py

@@ -149,11 +149,9 @@ class File:
         logger.debug(f"[MOCK] File.getAbsolutePath called, returning {self.path}")
         return self.path
 
-
 class NotificationManager:
     pass
 
-
 class NotificationChannel:
     def __init__(self, channel_id, channel_name, importance):
         self.description = None
@@ -189,10 +187,10 @@ class NotificationChannel:
         logger.debug(f"[MOCK] NotificationChannel.setVibrationPattern called, list_of_numbers={list_of_numbers}")
 
 
-class IconCompat:
+class IconClass:
     @classmethod
     def createWithBitmap(cls, bitmap):
-        logger.debug(f"[MOCK] IconCompat.createWithBitmap called with bitmap={bitmap}")
+        logger.debug(f"[MOCK] IconClass.createWithBitmap called with bitmap={bitmap}")
 
 
 class Color:

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/android_notify/internal/helper.py

@@ -3,7 +3,6 @@
 import inspect, os, re
 from .logger import logger
 
-
 def can_accept_arguments(func, *args, **kwargs):
     try:
         sig = inspect.signature(func)
@@ -55,6 +54,3 @@ def execute_callback(callback,arg, from_who="user"):
             callback()
     except Exception as on_permissions_result_callback_error:
         logger.exception(on_permissions_result_callback_error)
-
-def on_pydroid_app():
-    return "ru.iiec.pydroid3" in os.path.dirname(os.path.abspath(__file__))

android_notify-1.61.4/android_notify/internal/java_classes.py

@@ -0,0 +1,85 @@
+
+from android_notify.config import has_androidx_dependency,on_pydroid_app, on_android_platform,on_flet_app
+from .logger import logger
+
+if on_android_platform():
+    try:
+        from jnius import cast, autoclass
+    except ModuleNotFoundError:
+        cast = lambda x, y: x
+        autoclass = lambda x: None
+        logger.exception("add pyjnius to dependencies list")
+
+    # Leaving this as a broad Exception for unforeseen case so apps don't crash
+    # noinspection PyBroadException
+    try:
+        # Get the required Java classes needs to run on android to import
+        Bundle = autoclass('android.os.Bundle')
+        String = autoclass('java.lang.String')
+        Intent = autoclass('android.content.Intent')
+        PendingIntent = autoclass('android.app.PendingIntent')
+        BitmapFactory = autoclass('android.graphics.BitmapFactory')
+        BuildVersion = autoclass('android.os.Build$VERSION')
+        NotificationManager = autoclass('android.app.NotificationManager')
+        NotificationChannel = autoclass('android.app.NotificationChannel')
+        RemoteViews = autoclass('android.widget.RemoteViews')
+        Settings = autoclass("android.provider.Settings")
+        Uri = autoclass("android.net.Uri")
+        Manifest = autoclass('android.Manifest$permission')
+        Context = autoclass('android.content.Context')
+        PackageManager = autoclass("android.content.pm.PackageManager")
+        AudioAttributes = autoclass('android.media.AudioAttributes')
+        AudioAttributesBuilder = autoclass('android.media.AudioAttributes$Builder')
+        File = autoclass('java.io.File')
+        Color = autoclass('android.graphics.Color')
+    except Exception as e:
+        from .facade import *
+        logger.exception("Didn't get Basic Java Classes")
+
+    if on_flet_app() or on_pydroid_app() or not has_androidx_dependency():
+        # Leaving this as a broad Exception for unforeseen case so apps don't crash
+        # noinspection PyBroadException
+        try:
+            IconClass = autoclass('android.graphics.drawable.Icon')
+            NotificationCompat = autoclass("android.app.Notification")
+            NotificationManagerCompat = autoclass('android.app.NotificationManager')
+            NotificationCompatBuilder = autoclass('android.app.Notification$Builder')
+
+            NotificationCompatBigTextStyle = autoclass('android.app.Notification$BigTextStyle')
+            NotificationCompatBigPictureStyle = autoclass('android.app.Notification$BigPictureStyle')
+            NotificationCompatInboxStyle = autoclass('android.app.Notification$InboxStyle')
+            NotificationCompatDecoratedCustomViewStyle = autoclass('android.app.Notification$DecoratedCustomViewStyle')
+        except Exception as styles_import_error:
+            logger.exception(styles_import_error)
+            from .facade import *
+    elif has_androidx_dependency():
+
+        # Leaving this as a broad Exception for unforeseen case so apps don't crash
+        # noinspection PyBroadException
+        try:
+            IconClass = autoclass('androidx.core.graphics.drawable.IconCompat')
+            NotificationCompat = autoclass('androidx.core.app.NotificationCompat')
+            NotificationManagerCompat = autoclass('androidx.core.app.NotificationManagerCompat')
+            NotificationCompatBuilder = autoclass('androidx.core.app.NotificationCompat$Builder')
+
+            # 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:1.12.0
+            * android.enable_androidx = True
+            """)
+
+            from .facade import *
+else:
+    cast = lambda x, y: x
+    autoclass = lambda x: None
+    # noinspection PyUnresolvedReferences
+    from .facade import *
+    logger.warning("Did not initialize java classes, Not on Android")
+

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/android_notify/internal/permissions.py

@@ -4,11 +4,49 @@ For Permission Related Blocks
 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.config import on_android_platform, on_flet_app, get_python_activity_context, on_pydroid_app, has_androidx_dependency
 from android_notify.internal.java_classes import autoclass, BuildVersion, Manifest, Intent, String, Settings, Uri, PackageManager, NotificationManagerCompat
-from android_notify.internal.helper import execute_callback, on_pydroid_app
+from android_notify.internal.helper import execute_callback
 
 
+def check_notification_permission_legacy_android12_below():
+    # NotificationManagerCompat is actually NotificationManager from android_notify.internal.java_classes
+    context = get_python_activity_context()
+    nm = context.getSystemService(NotificationManagerCompat)
+    return nm.areNotificationsEnabled()
+
+def check_notification_permission_androidx_android12_below():
+    context = get_python_activity_context()
+    func_from = getattr(NotificationManagerCompat, "from")
+    compat_manager = func_from(context)
+    return compat_manager.areNotificationsEnabled()
+
+def check_notification_permission_legacy_android12_above():
+    # NotificationManagerCompat is actually NotificationManager from android_notify.internal.java_classes
+    context = get_python_activity_context()
+    permission = Manifest.POST_NOTIFICATIONS
+    return PackageManager.PERMISSION_GRANTED == context.checkSelfPermission(permission)
+
+def check_notification_permission_androidx_android12_above():
+    # Unused keeping for future reference
+    context = get_python_activity_context()
+    permission = Manifest.POST_NOTIFICATIONS
+    ContextCompat = autoclass('androidx.core.content.ContextCompat')
+    # For flet
+    # 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)
+
+def ask_notification_permission_androidx():
+    # Unused keeping for future reference
+    # TODO Callback when user answers request question
+    # Can't bind activity result method is from p4a which is only on kivy
+    context = get_python_activity_context()
+    ActivityCompat = autoclass('androidx.core.app.ActivityCompat')
+    permission = Manifest.POST_NOTIFICATIONS
+    ActivityCompat.requestPermissions(context, [permission], 101)
+    return None
+
 def has_notification_permission():
     """
     Checks if device has permission to send notifications
@@ -19,24 +57,20 @@ 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()
+            if on_flet_app() or on_pydroid_app() or not has_androidx_dependency():
+                return check_notification_permission_legacy_android12_below()
+            elif has_androidx_dependency():
+                return check_notification_permission_androidx_android12_below()
         except Exception as error_checking_permission:
             logger.exception(f"On Android 12 and below Error checking permission: {error_checking_permission}")
             return None
 
-    if on_flet_app():
-        context = get_python_activity_context()
-        permission = Manifest.POST_NOTIFICATIONS
-
-        return PackageManager.PERMISSION_GRANTED == context.checkSelfPermission(permission)
+    if on_flet_app() or on_pydroid_app() or not has_androidx_dependency():
+        return check_notification_permission_legacy_android12_above()
     else:
         from android.permissions import Permission, check_permission  # type: ignore
         return check_permission(Permission.POST_NOTIFICATIONS)
 
-
 def ask_notification_permission(callback=None, set_requesting_state=None, legacy=False):
     if not on_android_platform():
         logger.warning("Can't ask permission when not on android")
@@ -91,7 +125,6 @@ def ask_notification_permission(callback=None, set_requesting_state=None, legacy
         request_permissions([Permission.POST_NOTIFICATIONS], on_permissions_result)
         return None
 
-
 def open_notification_settings_screen():
     """In MDApp().on_resume()
 
@@ -126,7 +159,6 @@ def open_notification_settings_screen():
 
     # https://stackoverflow.com/a/45192258/19961621
 
-
 def can_show_permission_request_popup():
     """
     Check if we can show permission request popup for POST_NOTIFICATIONS
@@ -143,7 +175,6 @@ def can_show_permission_request_popup():
 
     return context.shouldShowRequestPermissionRationale(Manifest.POST_NOTIFICATIONS)
 
-
 def is_first_permission_ask():
     from importlib.resources import files
     buffer_file_name = "ASKED_PERMISSION.txt"

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/android_notify/tests/flet/basic/src/core.py

@@ -105,10 +105,10 @@ def get_image_uri(relative_path):
 
 def get_icon_object(uri):
     BitmapFactory = autoclass('android.graphics.BitmapFactory')
-    IconCompat = autoclass('androidx.core.graphics.drawable.IconCompat')
+    IconClass = autoclass('android.graphics.drawable.Icon')
 
     bitmap= BitmapFactory.decodeStream(context.getContentResolver().openInputStream(uri))
-    return IconCompat.createWithBitmap(bitmap)
+    return IconClass.createWithBitmap(bitmap)
 
 def insert_app_icon(builder,custom_icon_path):
     if custom_icon_path:

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/android_notify/tests/flet/flet-working/src/core.py

@@ -105,10 +105,10 @@ def get_image_uri(relative_path):
 
 def get_icon_object(uri):
     BitmapFactory = autoclass('android.graphics.BitmapFactory')
-    IconCompat = autoclass('androidx.core.graphics.drawable.IconCompat')
+    IconClass = autoclass('android.graphics.drawable.Icon')
 
     bitmap= BitmapFactory.decodeStream(context.getContentResolver().openInputStream(uri))
-    return IconCompat.createWithBitmap(bitmap)
+    return IconClass.createWithBitmap(bitmap)
 
 def insert_app_icon(builder,custom_icon_path):
     if custom_icon_path:

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/android_notify/tests/main.py

@@ -102,7 +102,7 @@ class AndroidNotifyDemoApp(MDApp):
 
                 def get_free_port_():
                     s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-                    s.bind(("", 0))  # bind to a random free port
+                    s.bind(("127.0.0.1", 0))  # bind to a random free port on loopback only
                     port = s.getsockname()[1]
                     s.close()
                     return port

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/android_notify/widgets/images.py

@@ -3,8 +3,8 @@ For image related things
 """
 import os
 
-from android_notify.config import app_storage_path, on_flet_app, on_android_platform, get_python_activity_context
-from android_notify.internal.java_classes import autoclass, BitmapFactory, Uri, BuildVersion, Color
+from android_notify.config import app_storage_path, on_flet_app, on_android_platform, get_python_activity_context, on_pydroid_app
+from android_notify.internal.java_classes import autoclass, BitmapFactory, Uri, BuildVersion, Color, IconClass
 from android_notify.internal.helper import get_package_path
 from android_notify.internal.logger import logger
 
@@ -94,7 +94,7 @@ def find_and_set_default_icon(builder):
     fallback_icon_path = None
     if on_flet_app():
         fallback_icon_path = icon_finder("flet-appicon.png")
-    elif "ru.iiec.pydroid3" in os.path.dirname(os.path.abspath(__file__)):
+    elif on_pydroid_app():
         fallback_icon_path = icon_finder("pydroid3-appicon.png")
 
     if fallback_icon_path:
@@ -128,8 +128,7 @@ def set_small_icon_with_bitmap(bitmap, builder):
         logger.warning("Bitmap Insert as Icon Not available below Android 6")
         return False
     try:
-        IconCompat = autoclass('android.graphics.drawable.Icon')
-        icon = IconCompat.createWithBitmap(bitmap)
+        icon = IconClass.createWithBitmap(bitmap)
         builder.setSmallIcon(icon)
         return True
     except Exception as autoclass_icon_error:

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/android_notify/widgets/texts.py

@@ -106,7 +106,7 @@ def set_lines(builder, lines):
 
 
 
-from android_notify.internal.java_classes import Color, RemoteViews
+from android_notify.internal.java_classes import Color, RemoteViews, NotificationCompatDecoratedCustomViewStyle
 from android_notify.internal.logger import logger
 from android_notify.config import get_python_activity_context
 
@@ -121,10 +121,6 @@ def setLayoutText(layout, text_id, text, color):
 
 def set_custom_colors(builder, title, message, title_color, message_color):
     # Load layout
-    from android_notify.internal.java_classes import autoclass
-    NotificationCompatDecoratedCustomViewStyle = autoclass(
-        'android.app.Notification$DecoratedCustomViewStyle')
-
     context = get_python_activity_context()
     resources = context.getResources()
     package_name = context.getPackageName()

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/android_notify.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: android-notify
-Version: 1.61.3.dev0
+Version: 1.61.4
 Summary: A Python package that simplifies creating Android notifications in Kivy and Flet apps.
 Author-email: Fabian <fector101@yahoo.com>
 License-Expression: MIT
@@ -53,6 +53,8 @@ The Android Notify package provides a simple yet comprehensive way to create and
   - Persistent notifications
   - Click handlers and callbacks
   - Cancel Notifications
+  - Use [Custom Sound](https://android-notify.vercel.app/advanced-methods#custom-sound)
+  - Vibration [section](https://android-notify.vercel.app/advanced-methods#vibration)
 
 ## Quick Start
 
@@ -80,14 +82,13 @@ 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.61.3.dev0
+requirements = python3, kivy, pyjnius, android-notify
 # Add permission for notifications
 android.permissions = POST_NOTIFICATIONS
 ```
 
 </details>
 
-
 <details>
 <summary><b>Flet apps:</b></summary>
 <br/>
@@ -98,7 +99,7 @@ In your `pyproject.toml` file, ensure you include the following:
 ```toml
 [tool.flet.android]
 dependencies = [
-  "pyjnius","android-notify==1.61.3.dev0"
+  "pyjnius","android-notify"
 ]
 
 [tool.flet.android.permission]
@@ -108,23 +109,19 @@ dependencies = [
 
 </details>
 
-
-
 <details>
 
 <summary><b>On Pydroid 3</b></summary>
 <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.61.3.dev0`
+- In pip section where you're asked to insert `Libary name` paste `android-notify`
 - Minimal working example 
 ```py
-# Testing with `android-notify==1.61.3.dev0` on pydroid
 from kivy.app import App
 from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.button import Button
-from android_notify import Notification
-from android_notify.core import asks_permission_if_needed
+from android_notify import Notification, NotificationHandler
 
 
 class AndroidNotifyDemoApp(App):
@@ -146,9 +143,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()
 
 
@@ -173,38 +168,11 @@ 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>
-<summary> <b> To talk to BroadCast Listener From Buttons </b> </summary>
-
-- Make things happen without being in your app
-```python
-from android_notify import Notification
-notification = Notification(title="Receiver Notification")
-notification.addButton(text="Stop", receiver_name="CarouselReceiver", action="ACTION_STOP")
-notification.addButton(text="Skip", receiver_name="CarouselReceiver", action="ACTION_SKIP")
-```
-You can use this [wiki](https://github.com/Fector101/android_notify/wiki/How-to-Use-with-Broadcast-Listener) as a guide create a broadcast listener
-</details>
-
-<details>
-<summary> <b> To use colored text in your notifications </b> </summary>
-
-- Copy the [res](https://github.com/Fector101/android_notify/tree/main/android_notify/res) folder to your app path.  
-- Lastly in your `buildozer.spec` file  
-Add `source.include_exts = xml` and `android.add_resources = # path you pasted`
-```python
-# Use Hex Code to be Safe
-n = Notification(title="Title and Message Color", message="Testing",title_color="red")
-n.send()
-```
-
-</details>
-
 <details>
 <summary> <b>To use Custom Sounds </b> </summary>
 
@@ -267,26 +235,6 @@ Private files (e.g., in app's `data/` directory) are automatically copied to ext
 </details>
 
 
-<details>
-<summary> <b> Vibrate feature</b> </summary>
-
-```ini
-# buildozer.spec
-android.permissions = VIBRATE
-```
-
-```python
-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.send()
-```
-
-</details>
-
-
 <details>
 <summary> <b> Add Data to Notification</b> </summary>
 
@@ -324,3 +272,16 @@ Or Giving it a star on 🌟 [GitHub](https://github.com/Fector101/android_notify
 <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>
+
+## Bug Reports & Feature Requests
+
+Found a bug or have an idea for a new feature?  
+Feel free to open an issue [here](https://reference-url-citation.invalid/0)
+
+When reporting a bug, try to include:
+- Device name
+- Android version
+- Steps to reproduce the issue
+- Screenshots or logs (if possible)
+
+Feature suggestions are also welcome.

{android_notify-1.61.3.dev0 → android_notify-1.61.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "android-notify"
-version = "1.61.3.dev0"
+version = "1.61.4"
 description = "A Python package that simplifies creating Android notifications in Kivy and Flet apps."
 readme = { file = "README.md", content-type = "text/markdown" }
 
@@ -13,7 +13,6 @@ authors = [
 ]
 
 license = "MIT"
-
 dependencies = [
     "pyjnius"
 ]

android_notify-1.61.3.dev0/android_notify/__main__.py

@@ -1,24 +0,0 @@
-import argparse
-from .config import __version__
-
-def print_version():
-    text = f"android_notify: v{__version__}"
-    border = '+'+'-'*(len(text) + 2)+'+'
-    print(border)
-    print(f'| {text} |')
-    print(border)
-
-def main():
-    parser = argparse.ArgumentParser(description="Android Notify CLI")
-    parser.add_argument('-v','--version', action='store_true', help="Show the version of android_notify")
-    args = parser.parse_args()
-
-    if args.version:
-        print_version()
-    # # Placeholder for the main functionality
-    # print("Android Notify CLI is running...")
-    # DEV:  pip install -e ., when edit and test project locally
-
-
-if __name__ == "__main__":
-    main()

android_notify-1.61.3.dev0/android_notify/internal/java_classes.py

@@ -1,69 +0,0 @@
-import os
-
-from .logger import logger
-
-def on_android_platform():
-    kivy_build = os.environ.get('KIVY_BUILD', '')
-    if kivy_build in {'android'}:
-        return True
-    elif 'P4A_BOOTSTRAP' in os.environ:
-        return True
-    elif 'ANDROID_ARGUMENT' in os.environ:
-        return True
-    return os.getenv("MAIN_ACTIVITY_HOST_CLASS_NAME")
-
-
-if on_android_platform():
-    try:
-        from jnius import cast, autoclass
-    except ModuleNotFoundError:
-        cast = lambda x, y: x
-        autoclass = lambda x: None
-        logger.exception("run pip install pyjnius")
-
-    # Leaving this as a broad Exception for unforeseen case so apps don't crash
-    # noinspection PyBroadException
-    try:
-        # Get the required Java classes needs to run on android to import
-        Bundle = autoclass('android.os.Bundle')
-        String = autoclass('java.lang.String')
-        Intent = autoclass('android.content.Intent')
-        PendingIntent = autoclass('android.app.PendingIntent')
-        BitmapFactory = autoclass('android.graphics.BitmapFactory')
-        BuildVersion = autoclass('android.os.Build$VERSION')
-        NotificationManager = autoclass('android.app.NotificationManager')
-        NotificationChannel = autoclass('android.app.NotificationChannel')
-        RemoteViews = autoclass('android.widget.RemoteViews')
-        Settings = autoclass("android.provider.Settings")
-        Uri = autoclass("android.net.Uri")
-        Manifest = autoclass('android.Manifest$permission')
-        Color = autoclass('android.graphics.Color')
-        Context = autoclass('android.content.Context')
-        PackageManager = autoclass("android.content.pm.PackageManager")
-        AudioAttributes = autoclass('android.media.AudioAttributes')
-        AudioAttributesBuilder = autoclass('android.media.AudioAttributes$Builder')
-        File = autoclass('java.io.File')
-    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')
-
-    except Exception as styles_import_error:
-        logger.exception(styles_import_error)
-        from .facade import *
-
-else:
-    cast = lambda x, y: x
-    autoclass = lambda x: None
-    # noinspection PyUnresolvedReferences
-    from .facade import *
-    logger.warning("Did not initialize java classes, Not on Android")
-