android-notify 1.60.7.dev0__tar.gz → 1.60.8__tar.gz

{android_notify-1.60.7.dev0 → android_notify-1.60.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: android-notify
-Version: 1.60.7.dev0
+Version: 1.60.8
 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.7.dev0
+requirements = python3, kivy, pyjnius, android-notify
 # Add permission for notifications
 android.permissions = POST_NOTIFICATIONS
+
+# Required dependencies (write exactly as shown, no quotation marks)
+android.gradle_dependencies = androidx.core:core:1.6.0, 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.7.dev0"
+  "pyjnius","android-notify==1.60.8.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.60.8.dev0` to install via `pip`
+
+<details>
+<summary><b>In Kivy</b></summary>
+<br/>
+
+```ini
+# buildozer.spec
+requirements = python3, kivy, pyjnius, android-notify==1.60.8.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.7.dev0`
+- In pip section where you're asked to insert `Libary name` paste `android-notify==1.60.8.dev0`
 - Minimal working example 
 ```py
-# Testing with `android-notify==1.60.7.dev0` on pydroid
+# Testing with `android-notify==1.60.8.dev0` on pydroid
 from kivy.app import App
 from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.button import Button
@@ -160,23 +193,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 +206,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 +269,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 +307,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.7.dev0 → android_notify-1.60.8}/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.7.dev0
+requirements = python3, kivy, pyjnius, android-notify
 # Add permission for notifications
 android.permissions = POST_NOTIFICATIONS
+
+# Required dependencies (write exactly as shown, no quotation marks)
+android.gradle_dependencies = androidx.core:core:1.6.0, 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.7.dev0"
+  "pyjnius","android-notify==1.60.8.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.60.8.dev0` to install via `pip`
+
+<details>
+<summary><b>In Kivy</b></summary>
+<br/>
+
+```ini
+# buildozer.spec
+requirements = python3, kivy, pyjnius, android-notify==1.60.8.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.7.dev0`
+- In pip section where you're asked to insert `Libary name` paste `android-notify==1.60.8.dev0`
 - Minimal working example 
 ```py
-# Testing with `android-notify==1.60.7.dev0` on pydroid
+# Testing with `android-notify==1.60.8.dev0` on pydroid
 from kivy.app import App
 from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.button import Button
@@ -137,23 +170,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 +183,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 +246,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 +284,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.7.dev0 → android_notify-1.60.8}/android_notify/__init__.py

@@ -1,5 +1,10 @@
-""""
-For Easier Imports For Public Classes
+"""
+Android-Notify
+=================
+
+For Creating Android Notifications In Python Apps.
+
+All the documentation is available at: https://android-notify.vercel.app/
 """
 from .core import send_notification
 from .styles import NotificationStyles

{android_notify-1.60.7.dev0 → android_notify-1.60.8}/android_notify/config.py

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

{android_notify-1.60.7.dev0 → android_notify-1.60.8}/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
 
 
 
@@ -49,7 +49,7 @@ def get_image_uri(relative_path):
     """
     app_root_path = get_app_root_path()
     output_path = os.path.join(app_root_path, relative_path)
-    # drint(output_path,'output_path')  # /data/user/0/org.laner.lan_ft/files/app/assets/imgs/icon.png
+    # rint(output_path,'output_path')  # /data/user/0/org.laner.lan_ft/files/app/assets/imgs/icon.png
 
     if not os.path.exists(output_path):
         raise FileNotFoundError(f"\nImage not found at path: {output_path}\n")
@@ -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.7.dev0 → android_notify-1.60.8}/android_notify/internal/facade.py

@@ -175,12 +175,6 @@ class NotificationManagerCompat:
     IMPORTANCE_MIN = ''
     IMPORTANCE_NONE = ''
 
-class AndroidNotification:
-    DEFAULT_ALL = 3
-    PRIORITY_HIGH = 4
-    PRIORITY_DEFAULT = ''
-    PRIORITY_LOW = ''
-    PRIORITY_MIN = ''
 
 class NotificationCompat:
     DEFAULT_ALL = 3

{android_notify-1.60.7.dev0 → android_notify-1.60.8}/android_notify/internal/helper.py

@@ -40,14 +40,16 @@ def get_package_path():
     return os.path.dirname(os.path.abspath(__file__))
 
 
-def execute_callback(callback,arg):
+def execute_callback(callback,arg, from_who="user"):
     """
     Executing Callbacks Safely
     """
-    if callback:
+    if not callback:
         return None
+    if from_who == "user":
+        logger.info(f"Executing On Permission Result Callback...")
     try:
-        if can_accept_arguments(callback, True):
+        if can_accept_arguments(callback, arg):
             callback(arg)
         else:
             callback()

{android_notify-1.60.7.dev0 → android_notify-1.60.8}/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.7.dev0 → android_notify-1.60.8}/android_notify/internal/permissions.py

@@ -1,10 +1,11 @@
 """
 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.internal.java_classes import autoclass, BuildVersion, Manifest, Intent, String, Settings, Uri, PackageManager
+from android_notify.internal.java_classes import autoclass, BuildVersion, Manifest, Intent, String, Settings, Uri
 from android_notify.internal.helper import execute_callback
 
 
@@ -22,8 +23,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)
@@ -45,10 +48,16 @@ def ask_notification_permission(callback=None, set_requesting_state=None, legacy
         logger.warning("Already have permission to send notifications")
         return None
 
-    if not can_show_permission_request_popup():
+    if not is_first_permission_ask() and not can_show_permission_request_popup():
         logger.warning("""Permission to send notifications has been denied permanently.
-        This happens when the user denies permission twice from the popup.
-        Opening notification settings...""")
+        This can happen when the user denies permission twice from the popup.
+        
+        Opening notification settings...
+        
+        Add in MDApp().on_resume():
+        >> if NotificationHandler.has_permission() and self.screen_manager:
+        >>      self.screen_manager.current = "home_screen"
+        """)
         open_notification_settings_screen()
         return None
 
@@ -57,21 +66,38 @@ def ask_notification_permission(callback=None, set_requesting_state=None, legacy
     def on_permissions_result(_, grants):
         # _ is permissions
         execute_callback(callback, grants[0])
-        execute_callback(set_requesting_state, False)
+        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
-        context.requestPermissions([permission], 101)
+
+        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
+        ActivityCompat.requestPermissions(context, [permission], 101)
         return None
     else:
         from android.permissions import request_permissions, Permission  # type: ignore
-        execute_callback(set_requesting_state, True)
+        execute_callback(set_requesting_state, True,from_who="package")
         request_permissions([Permission.POST_NOTIFICATIONS], on_permissions_result)
         return None
 
 
 def open_notification_settings_screen():
+    """In MDApp().on_resume()
+
+    Example:
+        >>> if NotificationHandler.has_permission() and self.screen_manager:
+        >>>     self.screen_manager.current = "home_screen"
+    """
     context = get_python_activity_context()
 
     if not context:
@@ -114,3 +140,14 @@ def can_show_permission_request_popup():
         return False
 
     return context.shouldShowRequestPermissionRationale(Manifest.POST_NOTIFICATIONS)
+
+
+def is_first_permission_ask():
+    from importlib.resources import files
+    buffer_file_name = "ASKED_PERMISSION.txt"
+    absolute_buffer_file_path = str(files("android_notify") / buffer_file_name) # Making sure one path is always used
+
+    if os.path.exists(absolute_buffer_file_path):
+        return False
+    open(absolute_buffer_file_path,'w').close()
+    return True

{android_notify-1.60.7.dev0 → android_notify-1.60.8}/android_notify/tests/main.py

@@ -29,6 +29,7 @@ from android_notify.tests.test_notification_behavior import TestNotificationBeha
 from android_notify.tests.test_notification_progress import TestNotificationProgress
 from android_notify.tests.test_notification_sound import TestNotificationSound
 from android_notify.tests.test_notification_clear import TestClearNotifications
+from android_notify.tests.test_notification_permission import NOTIFICATION_PERMISSION_TESTS
 from kivy.clock import Clock
 
 # -----------------------------
@@ -82,6 +83,7 @@ class TripleClickButton(Button):
 class AndroidNotifyDemoApp(MDApp):
 
     def on_start(self):
+        print('starting app...')
         try:
             from kivymd.toast import toast
             name = NotificationHandler.get_name(on_start=True)
@@ -89,6 +91,7 @@ class AndroidNotifyDemoApp(MDApp):
         except Exception as e:
             print("Error getting notify name:", e)
 
+        print('on_start','-'*33)
 
         def android_service():
 
@@ -154,11 +157,28 @@ class AndroidNotifyDemoApp(MDApp):
             self.test_buttons.append(btn)
             main.add_widget(btn)
 
+        # Permission request needs human inputs for tests
+        for label, action in NOTIFICATION_PERMISSION_TESTS.items():
+            btn = self._btn(
+                f"Run: {label}",
+                lambda _, fn=action: self.run_action(fn, _)
+            )
+            main.add_widget(btn)
         return root
 
-    # -----------------------------
-    # Helper to make buttons
-    # -----------------------------
+    def run_action(self, action_fn, btn_instance):
+        btn_instance.disabled = True
+        print(f"\n▶ Running action: {action_fn.__name__}")
+
+        try:
+            action_fn()
+        except Exception as error_running_action:
+            print("error_running_action:", error_running_action)
+            traceback.print_exc()
+        finally:
+            # Re-enable AFTER user interaction finishes
+            btn_instance.disabled = False
+
     def _btn(self, text, callback, height=80):
         return TripleClickButton(
             text=text,
@@ -185,9 +205,6 @@ class AndroidNotifyDemoApp(MDApp):
             for btn in self.test_buttons:
                 btn.disabled = False
 
-    # -----------------------------
-    # Actions
-    # -----------------------------
     def request_permission(self, btn_instance):
         asks_permission_if_needed()
         btn_instance.disabled = False
@@ -204,16 +221,17 @@ class AndroidNotifyDemoApp(MDApp):
         btn_instance.disabled = False
 
     def on_resume(self):
+        print('resuming app..')
         try:
             from kivymd.toast import toast
             name = NotificationHandler.get_name()
-            toast(text=f"name: {name}", length_long=True)
+
+            toast(text=f"name: {name}, Permission:{NotificationHandler.has_permission()}", length_long=True)
         except Exception as e:
             print("Error getting notify name:", e)
+        print('on_resume','-'*33)
+
 
 
-# -----------------------------
-# Entry
-# -----------------------------
 if __name__ == "__main__":
     AndroidNotifyDemoApp().run()

android_notify-1.60.8/android_notify/tests/test_notification_permission.py

@@ -0,0 +1,36 @@
+from android_notify import NotificationHandler
+from android_notify.internal.permissions import ask_notification_permission
+from android_notify.core import asks_permission_if_needed
+
+
+def ask_permission_no_callback():
+    NotificationHandler.asks_permission()
+
+
+def ask_permission_with_callback():
+    def some_callback(answer):
+        print(f"Hey Dude, Notification Request result {answer}.")
+    NotificationHandler.asks_permission(some_callback)
+
+
+def ask_permission_simple_regular():
+    asks_permission_if_needed()
+
+
+def ask_permission_simple_legacy():
+    asks_permission_if_needed(legacy=True)
+
+
+def ask_permission_from_source():
+    def some_callback(answer):
+        print(f"Hey, Notification Request Request1: {answer}")
+    ask_notification_permission(callback=some_callback)
+
+
+NOTIFICATION_PERMISSION_TESTS = {
+    "permission (no callback)": ask_permission_no_callback,
+    "permission (with callback)": ask_permission_with_callback,
+    "permission (simple)": ask_permission_simple_regular,
+    "permission (legacy)": ask_permission_simple_legacy,
+    "permission (from source)": ask_permission_from_source,
+}

{android_notify-1.60.7.dev0 → android_notify-1.60.8}/android_notify/widgets/images.py

@@ -4,7 +4,7 @@ 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.internal.java_classes import autoclass, BitmapFactory, Uri, BuildVersion, Color, IconCompat
 from android_notify.internal.helper import get_package_path
 from android_notify.internal.logger import logger
 
@@ -75,8 +75,6 @@ def icon_finder(icon_name):
         # noinspection PyPackageRequirements
         from importlib.resources import files
         return str(files("android_notify")/"fallback-icons"/icon_name)
-        # import pkg_resources
-        # return pkg_resources.resource_filename(__name__, f"fallback-icons/{icon_name}")
     except Exception:
         # Fallback if pkg_resources not available
         package_dir = get_package_path()
@@ -130,7 +128,6 @@ 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)
         builder.setSmallIcon(icon)
         return True