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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: android-notify
-Version: 1.60.10.dev0
+Version: 1.61.0.dev0
 Summary: A Python package that simplifies creating Android notifications in Kivy and Flet apps.
 Author-email: Fabian <fector101@yahoo.com>
 License-Expression: MIT
@@ -81,7 +81,7 @@ 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==1.61.0.dev0
 # Add permission for notifications
 android.permissions = POST_NOTIFICATIONS
 ```
@@ -99,7 +99,7 @@ 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]
@@ -117,10 +117,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

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

@@ -58,7 +58,7 @@ 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==1.61.0.dev0
 # Add permission for notifications
 android.permissions = POST_NOTIFICATIONS
 ```
@@ -76,7 +76,7 @@ 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]
@@ -94,10 +94,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

{android_notify-1.60.10.dev0 → android_notify-1.61.0.dev0}/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.dev0}/android_notify/config.py

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

{android_notify-1.60.10.dev0 → android_notify-1.61.0.dev0}/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.dev0}/android_notify/internal/helper.py

@@ -54,4 +54,7 @@ def execute_callback(callback,arg, from_who="user"):
         else:
             callback()
     except Exception as on_permissions_result_callback_error:
-        logger.exception(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.60.10.dev0 → android_notify-1.61.0.dev0}/android_notify/internal/permissions.py

@@ -6,7 +6,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.helper import execute_callback
+from android_notify.internal.helper import execute_callback, on_pydroid_app
 
 
 def has_notification_permission():
@@ -80,7 +80,7 @@ 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 or on_flet_app() or on_pydroid_app():
         # TODO Handle activity with request code
         permission = Manifest.POST_NOTIFICATIONS
         context.requestPermissions([permission], 101)

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

@@ -8,7 +8,8 @@ from .internal.helper import generate_channel_id
 from .config import from_service_file, get_notification_manager, on_flet_app, get_package_name, run_on_ui_thread, \
     get_python_activity_context, on_android_platform
 from .internal.android import cancel_all_notifications, cancel_notifications, dispatch_notification, \
-    set_when, show_infinite_progressbar, remove_buttons, set_sound, get_android_importance, force_vibrate
+    set_when, show_infinite_progressbar, remove_buttons, set_sound, get_android_importance, force_vibrate, \
+    get_active_notification_ids
 
 # Types
 from .internal.an_types import Importance
@@ -40,23 +41,16 @@ class Notification(BaseNotification):
     :param message: Message body.
     ---
     (Style Options)
-    :param style: Style of the notification ('simple', 'progress', 'big_text', 'inbox', 'big_picture', 'large_icon', 'both_imgs'). both_imgs == using lager icon and big picture
-    :param big_picture_path: Relative Path to the image resource.
-    :param large_icon_path: Relative Path to the image resource.
     :param progress_current_value: Integer To set progress bar current value.
     :param progress_max_value: Integer To set Max range for progress bar.
-    :param body: Large text For `big_Text` style, while `message` acts as subtitle.
-    :param lines_txt: text separated by newLine symbol For `inbox` style `use addLine method instead`
     ---
     (Advance Options)
-    :param sub_text: str for additional information next to title
     :param id: Pass in Old 'id' to use old instance
     :param callback: Function for notification Click.
     :param channel_name: - str Defaults to "Default Channel"
     :param channel_id: - str Defaults to "default_channel"
-    ---
-    (Options during Dev On PC)
-    :param logs: - Bool Defaults to True
+    :param silent: - boolean to make notification silent
+    :param app_icon: - change default app icon
     ---
     (Custom Style Options)
     :param title_color: title color str (to be safe use hex code)
@@ -77,6 +71,7 @@ class Notification(BaseNotification):
 
         self.__called_set_data = None
         self.data_object = None
+        self.obey_user_clear = False # if to allow content after Users clear it form Tray, So it doesn't pop up again which becomes annoying
         self.__id = self.id or self.__get_unique_id()  # Different use from self.name all notifications require `integers` id's not `strings`
         self.id = self.__id  # To use same Notification in different instances
 
@@ -88,6 +83,13 @@ class Notification(BaseNotification):
 
         self.__generic_parameters_filled = False
         self.__using_set_priority_method = False
+        self.__only_alert_once_state = True  # controls heads up use .setOnlyAlertOnce()
+
+        # These Attributes are for reference, For Changes Use setBigText, setSubText,setLargeIcon, setBigPicture
+        self.sub_text=""
+        self.body=""
+        self.large_icon_path=""
+        self.big_picture_path=""
 
         # For components
         self.__lines = []
@@ -122,7 +124,6 @@ class Notification(BaseNotification):
         add_intent_to_open_app(builder=self.builder, action_name=action_name, notification_title=str(self.title),
                                notification_id=self.__id, data_object=self.data_object)
 
-
     def addLine(self, text: str):
         self.__lines.append(text)
 
@@ -182,7 +183,12 @@ class Notification(BaseNotification):
 
     def refresh(self):
         """TO apply new components on notification"""
-        if self.__generic_parameters_filled:
+        if not on_android_platform():
+            return
+
+        in_tray = self.isInTray() if self.obey_user_clear else True
+
+        if in_tray and self.__generic_parameters_filled:
             # Don't dispatch before filling required values `self.__create_basic_notification`, Shouldn't dispatch till .send() is called
             self.__applyNewLinesIfAny()
             dispatch_notification(notification_id=self.__id, builder=self.builder, passed_check=self.passed_check)
@@ -193,6 +199,7 @@ class Notification(BaseNotification):
         :param path: can be `Relative Path` or `URL`
         :return:
         """
+        self.big_picture_path=path
         if on_android_platform():
             self.__build_img(path, NotificationStyles.BIG_PICTURE)
         logger.info('Done setting big picture.')
@@ -214,6 +221,7 @@ class Notification(BaseNotification):
         :param path: can be `Relative Path` or `URL`
         :return:
         """
+        self.large_icon_path = path
         if on_android_platform():
             self.__build_img(path, NotificationStyles.LARGE_ICON)
         logger.info('Done setting large icon.')
@@ -225,6 +233,7 @@ class Notification(BaseNotification):
         :param title: The big text title
         :param summary: The big text summary
         """
+        self.body = str(body)
         set_big_text(builder=self.builder, body=str(body), title=str(title), summary=str(summary))
 
     def setSubText(self, text):
@@ -359,7 +368,7 @@ class Notification(BaseNotification):
         In-Built Delay of 0.5 sec 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
+        # To Cancel any queued timer from `updateProgressBar` method and to avoid race effect in case 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:
@@ -453,10 +462,10 @@ class Notification(BaseNotification):
             >>> self.setVibrate()
             >>> self.setVibrate([0, 500, 200, 500])
         """
-        if on_android_platform() and BuildVersion < 26:
+        if on_android_platform() and BuildVersion.SDK_INT < 26:
             pattern = pattern or [0, 500]
             self.builder.setVibrate(pattern)
-        if not on_android_platform() or BuildVersion < 26:
+        if not on_android_platform() or BuildVersion.SDK_INT < 26:
             logger.info(f"Vibration pattern set to {pattern}")
 
     @staticmethod
@@ -474,7 +483,7 @@ class Notification(BaseNotification):
         print("\n Sent Notification!!!")
         displayed_args = [
             "title", "message",
-            "style", "body", "large_icon_path", "big_picture_path",
+            "sub_text", "body", "large_icon_path", "big_picture_path",
             "progress_max_value",
             'name', "channel_name",
         ]
@@ -545,43 +554,6 @@ class Notification(BaseNotification):
         remove_buttons(self.builder)
         self.refresh()
 
-    @run_on_ui_thread
-    def addNotificationStyle(self, style: str, already_sent=False):
-        """Adds Style to Notification
-
-        NOTE: This method has Deprecated Use - (setLargeIcon, setBigPicture, setBigText and setLines) Instead
-
-        --------
-        Args:
-            style (str): required style
-            already_sent (bool,False): If notification was already sent
-        """
-
-        if not on_android_platform():
-            # TODO for logs when not on android and style related to imgs extract app path from buildozer.spec and log
-            return False
-
-        if self.body:
-            self.setBigText(self.body)
-
-        elif self.lines_txt:
-            lines = self.lines_txt.split("\n")
-            self.setLines(lines)
-
-        elif self.big_picture_path or self.large_icon_path:
-            if self.big_picture_path:
-                self.setBigPicture(self.big_picture_path)
-            if self.large_icon_path:
-                self.setLargeIcon(self.large_icon_path)
-
-        elif self.progress_max_value or self.progress_current_value:
-            self.builder.setProgress(self.progress_max_value, self.progress_current_value or 0.1, False)
-
-        if already_sent:
-            self.refresh()
-
-        return True
-
     def setLines(self, lines: list):
         """Pass in a list of strings to be used for lines"""
         set_lines(builder=self.builder, lines=lines)
@@ -595,21 +567,28 @@ class Notification(BaseNotification):
         return set_sound(self.builder, res_sound_name)
 
     def fill_args(self, silent: bool = False, persistent=False, close_on_click=True):
-        """Name Makes More sense than start_building"""
-        return self.start_building(silent, persistent , close_on_click)
-
-    def start_building(self, silent: bool = False, persistent=False, close_on_click=True):
-        # Main use is for foreground service, bypassing .notify in .send method to let service.startForeground(...) send it
+        """Name Makes More sense than start_building
+        Main use is for foreground service, bypassing .notify in .send method to let service.startForeground(...) send it
+        """
         self.silent = silent or self.silent
         if not on_android_platform():
             return NotificationCompatBuilder  # this is just a facade
         self.__create_basic_notification(persistent, close_on_click)
-        if self.style not in ['simple', '']:
-            self.addNotificationStyle(self.style)
         self.__applyNewLinesIfAny()
 
         return self.builder
 
+    def start_building(self, silent: bool = False, persistent=False, close_on_click=True):
+        logger.warning("Please Use `fill_args` instead of `start_building`, `start_building` method will be removed in next major release")
+        return self.fill_args(silent, persistent , close_on_click)
+
+    def setOnlyAlertOnce(self, state: bool):
+        self.__only_alert_once_state = state
+        if not on_android_platform():
+            return
+        if self.builder:
+            self.builder.setOnlyAlertOnce(self.__only_alert_once_state)
+
     def __applyNewLinesIfAny(self):
         if self.__lines:
             set_lines(builder=self.builder, lines=self.__lines)
@@ -629,7 +608,7 @@ class Notification(BaseNotification):
             self.builder.setContentText(str(self.message))
         self.__insert_app_icon()
         self.builder.setDefaults(NotificationCompat.DEFAULT_ALL)
-        self.builder.setOnlyAlertOnce(True)
+        self.builder.setOnlyAlertOnce(self.__only_alert_once_state)
         self.builder.setOngoing(persistent)
         self.builder.setAutoCancel(close_on_click)
 
@@ -737,6 +716,16 @@ class Notification(BaseNotification):
             return int(time.time() * 1000) % 2_147_483_647
 
         notification_id = self.notification_ids[-1] + 1
+        try:
+            ids_in_tray = get_active_notification_ids(notification_manager = get_notification_manager())
+            if notification_id in ids_in_tray:
+                for _ in ids_in_tray: # I am avoiding while loops
+                    notification_id = notification_id + 1
+                    if notification_id not in ids_in_tray:
+                        break
+        except Exception as error_getting_id_that_is_not_in_tray:
+            logger.exception(error_getting_id_that_is_not_in_tray)
+            traceback.print_exc()
         self.notification_ids.append(notification_id)
         return notification_id
 
@@ -758,6 +747,27 @@ class Notification(BaseNotification):
     def isUsingCustom(self):
         self.__using_custom = self.title_color or self.message_color
         return bool(self.__using_custom)
+
+    def setObeyUserClear(self, state: bool):
+        """
+        Control whether the notification reappears when updated by the app
+        after the user clears it.
+
+        Android 6+.
+        """
+        self.obey_user_clear = state
+
+    def isInTray(self) -> bool:
+        """
+        Check whether this notification is currently present in the system tray.
+
+        Android 6+.
+        :return: True if the notification is active in the tray, otherwise False.
+        """
+        if not on_android_platform():
+            return False
+        return self.id in get_active_notification_ids(notification_manager = self.notification_manager)
+
     # TODO method to create channel groups
 
 
@@ -782,7 +792,7 @@ class NotificationHandler:
 
         saved_intent = cls.__name
         cls.__name = None  # so value won't be set when opening app not from notification
-        # drint('saved_intent ',saved_intent)
+        # rint('saved_intent ',saved_intent)
         # if not saved_intent or (isinstance(saved_intent, str) and saved_intent.startswith("android.intent")):
         # Below action is always None
         # __PythonActivity = autoclass(ACTIVITY_CLASS_NAME)
@@ -791,8 +801,8 @@ class NotificationHandler:
         # __Intent = autoclass('android.content.Intent')
         # __intent = __Intent(__context, __PythonActivity)
         # action = __intent.getAction()
-        # drint('Start up Intent ----', action)
-        # drint('start Up Title --->',__intent.getStringExtra("title"))
+        # rint('Start up Intent ----', action)
+        # rint('start Up Title --->',__intent.getStringExtra("title"))
 
         if on_start:    # Using `on_start` arg because no way to know if opening from `Recents` only `Home Screen`
         # if not saved_intent and cls.opened_from_notification:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: android-notify
-Version: 1.60.10.dev0
+Version: 1.61.0.dev0
 Summary: A Python package that simplifies creating Android notifications in Kivy and Flet apps.
 Author-email: Fabian <fector101@yahoo.com>
 License-Expression: MIT
@@ -81,7 +81,7 @@ 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==1.61.0.dev0
 # Add permission for notifications
 android.permissions = POST_NOTIFICATIONS
 ```
@@ -99,7 +99,7 @@ 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]
@@ -117,10 +117,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

{android_notify-1.60.10.dev0 → android_notify-1.61.0.dev0}/android_notify.egg-info/SOURCES.txt

@@ -48,5 +48,4 @@ android_notify/tests/flet/flet-working/src/main.py
 android_notify/tests/p4a/hook.py
 android_notify/tests/serivces/wallpaper.py
 android_notify/widgets/images.py
-android_notify/widgets/texts.py
-docs/website/src/pages/data/laner_Sent.py
+android_notify/widgets/texts.py

{android_notify-1.60.10.dev0 → android_notify-1.61.0.dev0}/pyproject.toml

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

android_notify-1.60.10.dev0/docs/website/src/pages/data/laner_Sent.py

@@ -1,24 +0,0 @@
-import React, { useState, useEffect } from 'react';
-
-const ResponsiveText: React.FC = () => {
-  const [fontSize, setFontSize] = useState<string>(getFontSize());
-
-  function getFontSize(): string {
-    return window.innerWidth < 600 ? '12px' : '16px';
-  }
-
-  useEffect(() => {
-    const handleResize = () => setFontSize(getFontSize());
-
-    window.addEventListener('resize', handleResize);
-    return () => window.removeEventListener('resize', handleResize);
-  }, []);
-
-  return (
-    <p style={{ fontSize }}>
-      This text adjusts size based on screen width!
-    </p>
-  );
-};
-
-export default ResponsiveText;