Replace gadget bridge on iOS

app/src/applications/notification/ui_export/CMakeLists.txt

@@ -4,6 +4,7 @@ SET(SOURCES
     images/ui_img_call_png.c
     images/ui_img_mail_png.c
     images/ui_img_gadget_png.c
+    images/ui_img_apple.c
     images/ui_img_youtube_png.c
     images/ui_img_homeassistant_png.c
     images/ui_img_whatsapp_png.c

app/src/ble/ble_ancs.c

@@ -497,6 +497,11 @@ static int gattp_init(void)
     return bt_gattp_init(&gattp);
 }
 
+bool ble_ancs_present(void)
+{
+    return atomic_test_bit(&discovery_flags, DISCOVERY_ANCS_SUCCEEDED);
+}
+
 int ble_ancs_init(void)
 {
     int err = bt_ancs_client_init(&ancs_c);

app/src/ble/ble_ancs.h

@@ -3,4 +3,14 @@
 #include <zephyr/kernel.h>
 #include "ble/ble_comm.h"
 
-int ble_ancs_init(void);
+/**
+ * @brief Init Apple Notification Center Service, ANCS
+ */
+int ble_ancs_init(void);
+
+/**
+ * @brief Check if ANCS service is present on the device connected to the watch
+ *
+ * @return true if ANCS is present
+ */
+bool ble_ancs_present(void);

app/src/images/binaries/README.md

@@ -1,12 +1,12 @@
 # External SPI Flash resource storage
 Normally try to put all resources in external flash as they quickly fill up the internal flash. This is however
-only possible on ZSWatch v4 and later which have external flash on QSPI (fast).
+only possible on ZSWatch v3 and later. It can be disabled by `CONFIG_STORE_IMAGES_EXTERNAL_FLASH=n` configuration.
 To be compatible with both with and without QSPI flash the code need to use the following macros for declaring images:
 
 Use `ZSW_LV_IMG_DECLARE(file_name)` instead of LVGL's `LV_IMG_DECLARE(file_name)`.<br>
 Use `ZSW_LV_IMG_USE(file_name)` instead of `lv_img_set_src(img, &file_name)`.
 
-Those two macros will automatically pick the file from internal flash if no QSPI flash and from QSPI flash if ZSWatch version supports it.
+Those two macros will automatically pick the file from internal flash if ZSWatch version supports it.
 You do however need to convert the image both to `.c` and `.bin` to use this approach right now and place the `.c` in `app/src/images/` folder and the .`bin` in `app/src/images/binaries/lvgl_lfs`
 
 If the resource is big and always shall be in external flash just do `lv_img_set_src(img, "/lvgl_lfs/filename.bin")`

app/src/ui/utils/zsw_ui_utils.c

@@ -15,9 +15,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <lvgl.h>
 #include "utils/zsw_ui_utils.h"
+#include "ble/ble_ancs.h"
 #include "managers/zsw_notification_manager.h"
+#include <lvgl.h>
 
 #if CONFIG_WATCHFACE_BACKGROUND_SPACE
 ZSW_LV_IMG_DECLARE(space_blur_bg);
@@ -44,6 +45,7 @@ LV_IMG_DECLARE(unknown);
 
 ZSW_LV_IMG_DECLARE(ui_img_call_png);
 ZSW_LV_IMG_DECLARE(ui_img_gadget_png);
+ZSW_LV_IMG_DECLARE(ui_img_apple);
 ZSW_LV_IMG_DECLARE(ui_img_mail_png);
 ZSW_LV_IMG_DECLARE(ui_img_whatsapp_png);
 ZSW_LV_IMG_DECLARE(ui_img_trash_png);
@@ -333,7 +335,11 @@ const void *zsw_ui_utils_icon_from_notification(zsw_notification_src_t src)
         case NOTIFICATION_SRC_CALENDAR:
             return ZSW_LV_IMG_USE(google_calendar_icon);
         default:
-            return ZSW_LV_IMG_USE(ui_img_gadget_png);
+            if (ble_ancs_present()) {
+                return ZSW_LV_IMG_USE(ui_img_apple);
+            } else {
+                return ZSW_LV_IMG_USE(ui_img_gadget_png);
+            }
     }
 }