Windowing: Fix deprecation warnings for iOS 17

ControlVegetal · Oct 29, 2024 · eb6ebaf · eb6ebaf
1 parent dbe74e9
commit eb6ebaf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp
@@ -75,10 +75,7 @@
  #endif
 
 #elif JUCE_IOS
- #if JUCE_PUSH_NOTIFICATIONS
-  #import <UserNotifications/UserNotifications.h>
- #endif
-
+ #import <UserNotifications/UserNotifications.h>
  #import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
  #import <MetalKit/MetalKit.h>
  #import <UIKit/UIActivityViewController.h>

diff --git a/modules/juce_gui_basics/native/juce_Windowing_ios.mm b/modules/juce_gui_basics/native/juce_Windowing_ios.mm
@@ -168,10 +168,27 @@ - (void) applicationWillEnterForeground: (UIApplication*) application
         app->resumed();
 }
 
-- (void) applicationDidBecomeActive: (UIApplication*) application
+struct BadgeUpdateTrait
 {
-    application.applicationIconBadgeNumber = 0;
+   #if defined (__IPHONE_16_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_0
+    API_AVAILABLE (ios (16))
+    static void newFn (UIApplication*)
+    {
+        [[UNUserNotificationCenter currentNotificationCenter] setBadgeCount: 0 withCompletionHandler: nil];
+    }
+   #endif
+
+    static void oldFn (UIApplication* app)
+    {
+        JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations")
+        app.applicationIconBadgeNumber = 0;
+        JUCE_END_IGNORE_WARNINGS_GCC_LIKE
+    }
+};
 
+- (void) applicationDidBecomeActive: (UIApplication*) application
+{
+    ifelse_17_0<BadgeUpdateTrait> (application);
     isIOSAppActive = true;
 }