Преглед изворни кода

Revert "resolve xcode 16 issue loading icons for inapp notifications"

This reverts commit 046bf2b351b735337753eba7f6830c92e966c7b2.
kskandis пре 1 година
родитељ
комит
63447773c7
1 измењених фајлова са 3 додато и 29 уклоњено
  1. 3 29
      FreeAPS/Sources/Modules/Main/MainStateModel.swift

+ 3 - 29
FreeAPS/Sources/Modules/Main/MainStateModel.swift

@@ -148,34 +148,6 @@ extension Main {
             }
         }
 
-        func loadAlternateAppIcon() -> UIImage? {
-            guard let alternateIconName = UIApplication.shared.alternateIconName else { return nil }
-
-            if let iconsDictionary = Bundle.main.object(forInfoDictionaryKey: "CFBundleIcons") as? [String: Any],
-               let alternateIcons = iconsDictionary["CFBundleAlternateIcons"] as? [String: Any],
-               let alternateIconInfo = alternateIcons[alternateIconName] as? [String: Any],
-               let iconFiles = alternateIconInfo["CFBundleIconFiles"] as? [String]
-            {
-                if let iconFilename = iconFiles.last {
-                    return UIImage(named: iconFilename)
-                }
-            }
-
-            return nil
-        }
-
-        func loadPrimaryAppIcon() -> UIImage? {
-            guard let iconsDictionary = Bundle.main.object(forInfoDictionaryKey: "CFBundleIcons") as? [String: Any],
-                  let primaryIcons = iconsDictionary["CFBundlePrimaryIcon"] as? [String: Any],
-                  let iconFiles = primaryIcons["CFBundleIconFiles"] as? [String],
-                  let lastIcon = iconFiles.last
-            else {
-                return nil
-            }
-
-            return UIImage(named: lastIcon)
-        }
-
         // Read the color scheme preference from UserDefaults; defaults to system default setting
         @AppStorage("colorSchemePreference") private var colorSchemePreference: ColorSchemeOption = .systemDefault
 
@@ -196,7 +168,9 @@ extension Main {
             }
 
             let titleContent: String
-            let iconImage = loadAlternateAppIcon() ?? loadPrimaryAppIcon() ?? UIImage()
+
+            let iconName = UIApplication.shared.alternateIconName ?? "trioBlack"
+            let iconImage = UIImage(named: iconName) ?? UIImage()
 
             view.configureContent(
                 title: "title",