sync IconClass, xmls, helper function and facade

Author: Fector101

android_notify/core.py

@@ -6,7 +6,7 @@
 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, IconCompat
+    NotificationCompatBigTextStyle, NotificationCompatBigPictureStyle, NotificationCompatInboxStyle, IconClass
 
 
 
@@ -61,7 +61,7 @@ def get_image_uri(relative_path):
 def get_icon_object(uri):
     context = get_python_activity_context()
     bitmap = BitmapFactory.decodeStream(context.getContentResolver().openInputStream(uri))
-    return IconCompat.createWithBitmap(bitmap)
+    return IconClass.createWithBitmap(bitmap)
 
 
 def insert_app_icon(builder, custom_icon_path):

android_notify/internal/facade.py

@@ -106,6 +106,49 @@ class Uri:
     def __init__(self, package_name):
         logger.debug("FACADE_URI")
 
+    @classmethod
+    def parse(cls, uri_string):
+        logger.debug(f"[MOCK] Uri.parse called with uri_string={uri_string}")
+        return cls
+
+    @classmethod
+    def fromFile(cls, java_file):
+        logger.debug(f"[MOCK] Uri.fromFile called with file={java_file}")
+        return cls
+
+
+class AudioAttributes:
+    CONTENT_TYPE_SONIFICATION = 4
+    USAGE_NOTIFICATION = 5
+    USAGE_ALARM = 4
+
+
+class AudioAttributesBuilder:
+    def __init__(self):
+        logger.debug("[MOCK] AudioAttributesBuilder initialized")
+
+    def setContentType(self, content_type):
+        logger.debug(f"[MOCK] AudioAttributesBuilder.setContentType called with content_type={content_type}")
+        return self
+
+    def setUsage(self, usage):
+        logger.debug(f"[MOCK] AudioAttributesBuilder.setUsage called with usage={usage}")
+        return self
+
+    def build(self):
+        logger.debug("[MOCK] AudioAttributesBuilder.build called")
+        return AudioAttributes()
+
+
+class File:
+    def __init__(self, path):
+        self.path = path
+        logger.debug(f"[MOCK] File initialized with path={path}")
+
+    def getAbsolutePath(self):
+        logger.debug(f"[MOCK] File.getAbsolutePath called, returning {self.path}")
+        return self.path
+
 
 class NotificationManager:
     pass
@@ -146,10 +189,10 @@ def setVibrationPattern(self, list_of_numbers):
         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:
@@ -402,6 +445,16 @@ def getPackageName():
         logger.debug("[MOCK] Context.getPackageName called")
         return None  # TODO get package name from buildozer.spec file
 
+    @staticmethod
+    def getExternalFilesDir(directory_type):
+        logger.debug(f"[MOCK] Context.getExternalFilesDir called with type={directory_type}")
+        return File("mock_external_files_dir")
+
+    @staticmethod
+    def getExternalCacheDir():
+        logger.debug("[MOCK] Context.getExternalCacheDir called")
+        return File("mock_external_cache_dir")
+
 
 class PackageManager:
     @property

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/internal/java_classes.py

@@ -37,8 +37,9 @@ def on_android_platform():
         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')
+        Color = autoclass('android.graphics.Color')
+        IconClass = autoclass('androidx.core.graphics.drawable.IconCompat')
     except Exception as e:
         from .facade import *
         logger.exception("Didn't get Basic Java Classes")
@@ -48,7 +49,6 @@ def on_android_platform():
         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')
 
         # Notification Design
         NotificationCompatBigTextStyle = autoclass('androidx.core.app.NotificationCompat$BigTextStyle')

android_notify/res/layout/an_colored_basic_large.xml

@@ -6,7 +6,6 @@
 
     <TextView
         android:id="@+id/title"
-        style="@style/TextAppearance.Compat.Notification.Title"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="1"

android_notify/res/layout/an_colored_basic_small.xml

@@ -6,7 +6,6 @@
 
     <TextView
         android:id="@+id/title"
-        style="@style/TextAppearance.Compat.Notification.Title"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="1"

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/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/widgets/images.py

@@ -4,7 +4,7 @@
 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, IconCompat
+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
 
@@ -128,7 +128,7 @@ def set_small_icon_with_bitmap(bitmap, builder):
         logger.warning("Bitmap Insert as Icon Not available below Android 6")
         return False
     try:
-        icon = IconCompat.createWithBitmap(bitmap)
+        icon = IconClass.createWithBitmap(bitmap)
         builder.setSmallIcon(icon)
         return True
     except Exception as autoclass_icon_error: