Изменение иконки приложения (#15)

* В процессе

* Доработал тесты

- Убрал лишний вариант теста, который ломал тесты
- Добавил новые тесты

* Рефактор

Author: easydev991

SwiftUI-Days.xcodeproj/project.pbxproj

@@ -503,8 +503,10 @@
 		672050522BA9F8C7005B00E7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon2 AppIcon3 AppIcon4 AppIcon5 AppIcon6 AppIcon7";
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon1;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = "SwiftUI-Days/SupportingFiles/SwiftUI_Days.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
@@ -532,7 +534,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oleg991.SwiftUI-Days";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -549,8 +551,10 @@
 		672050532BA9F8C7005B00E7 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon2 AppIcon3 AppIcon4 AppIcon5 AppIcon6 AppIcon7";
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon1;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = "SwiftUI-Days/SupportingFiles/SwiftUI_Days.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
@@ -578,7 +582,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oleg991.SwiftUI-Days";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;

SwiftUI-Days/Models/Item.swift

@@ -38,7 +38,7 @@ final class Item {
         let yearsCount = components.year ?? 0
         let monthsCount = components.month ?? 0
         let daysCount = components.day ?? 0
-        let todayString = NSLocalizedString("Today", comment: "Today")
+        let todayString = String(localized: "Today")
         guard yearsCount != 0 || monthsCount != 0 || daysCount != 0 else {
             return todayString
         }

SwiftUI-Days/Screens/More/MoreScreen.swift

@@ -12,7 +12,7 @@ struct MoreScreen: View {
                     Spacer().containerRelativeFrame([.vertical])
                     VStack(spacing: 16) {
                         Group {
-                            appThemePicker
+                            appThemeIconButton
                             appDataButton
                             feedbackButton
                             rateAppButton
@@ -30,24 +30,9 @@ struct MoreScreen: View {
         }
     }
 
-    private var appThemePicker: some View {
-        Menu {
-            Picker(
-                "App theme",
-                selection: .init(
-                    get: { appSettings.appTheme },
-                    set: { appSettings.appTheme = $0 }
-                )
-            ) {
-                ForEach(AppTheme.allCases) {
-                    Text($0.title).tag($0)
-                }
-            }
-        } label: {
-            Text("App theme")
-        }
-        .accessibilityIdentifier("appThemeButton")
-        .accessibilityValue(Text(appSettings.appTheme.title))
+    private var appThemeIconButton: some View {
+        NavigationLink("App theme and Icon", destination: ThemeIconScreen())
+            .accessibilityIdentifier("appThemeIconButton")
     }
 
     private var appDataButton: some View {

SwiftUI-Days/Screens/More/ThemeIcon/ThemeIconScreen+IconVariant.swift

@@ -0,0 +1,59 @@
+import SwiftUI
+import UIKit
+
+extension ThemeIconScreen {
+    enum IconVariant: String, CaseIterable {
+        case primary = "AppIcon1"
+        case one = "AppIcon2"
+        case two = "AppIcon3"
+        case three = "AppIcon4"
+        case four = "AppIcon5"
+        case five = "AppIcon6"
+        case six = "AppIcon7"
+
+        /// Название альтернативной иконки, для дефолтной иконки всегда `nil`
+        var alternateName: String? {
+            switch self {
+            case .primary: nil
+            default: rawValue
+            }
+        }
+
+        /// Уменьшенная картинка (обычный ассет) для отображения в списке
+        var listImage: Image {
+            Image("\(rawValue)Small")
+        }
+
+        @MainActor
+        var isSelected: Bool {
+            alternateName == UIApplication.shared.alternateIconName
+        }
+
+        @MainActor
+        var accessibilityLabel: String {
+            let isSelectedText = isSelected ? String(localized: "Selected") : String(localized: "Not selected")
+            switch self {
+            case .primary:
+                return String(localized: "Primary icon") + ", " + isSelectedText
+            default:
+                return String(format: String(localized: "Variant %lld"), variantNumber) + ", " + isSelectedText
+            }
+        }
+
+        init(name: String?) {
+            self = IconVariant(rawValue: name ?? "") ?? .primary
+        }
+
+        private var variantNumber: Int {
+            switch self {
+            case .primary: 1
+            case .one: 2
+            case .two: 3
+            case .three: 4
+            case .four: 5
+            case .five: 6
+            case .six: 7
+            }
+        }
+    }
+}

SwiftUI-Days/Screens/More/ThemeIcon/ThemeIconScreen+IconViewModel.swift

@@ -0,0 +1,50 @@
+import Foundation
+import Observation
+import OSLog
+import UIKit.UIApplication
+
+extension ThemeIconScreen {
+    @Observable @MainActor
+    final class IconViewModel {
+        private let logger = Logger(
+            subsystem: Bundle.main.bundleIdentifier!,
+            category: String(describing: IconViewModel.self)
+        )
+        private(set) var currentAppIcon: IconVariant
+
+        init() {
+            if let currentIconName = UIApplication.shared.alternateIconName {
+                currentAppIcon = IconVariant(name: currentIconName)
+            } else {
+                currentAppIcon = .primary
+            }
+        }
+
+        func setIcon(_ icon: IconVariant) async {
+            do {
+                guard UIApplication.shared.supportsAlternateIcons else {
+                    throw IconError.alternateIconsNotSupported
+                }
+                guard icon.alternateName != UIApplication.shared.alternateIconName else { return }
+                try await UIApplication.shared.setAlternateIconName(icon.alternateName)
+                currentAppIcon = icon
+                logger.info("Установили иконку: \(icon.rawValue)")
+            } catch {
+                logger.error("\(error.localizedDescription)")
+            }
+        }
+    }
+}
+
+extension ThemeIconScreen.IconViewModel {
+    enum IconError: Error, LocalizedError {
+        case alternateIconsNotSupported
+
+        var errorDescription: String? {
+            switch self {
+            case .alternateIconsNotSupported:
+                "Альтернативные иконки не поддерживаются"
+            }
+        }
+    }
+}

SwiftUI-Days/Screens/More/ThemeIcon/ThemeIconScreen.swift

@@ -0,0 +1,93 @@
+import SwiftUI
+
+struct ThemeIconScreen: View {
+    @Environment(AppSettings.self) private var appSettings
+    @State private var iconViewModel = IconViewModel()
+
+    var body: some View {
+        ScrollView {
+            VStack(alignment: .leading, spacing: 24) {
+                themePicker
+                iconsGrid
+                    .animation(.default, value: iconViewModel.currentAppIcon)
+            }
+            .padding()
+        }
+        .scrollBounceBehavior(.basedOnSize)
+        .navigationTitle("App theme and Icon")
+        .navigationBarTitleDisplayMode(.inline)
+    }
+
+    private var themePicker: some View {
+        HStack(spacing: 12) {
+            Text("App theme")
+                .bold()
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .accessibilityHidden(true)
+            Picker(
+                "App theme",
+                selection: .init(
+                    get: { appSettings.appTheme },
+                    set: { appSettings.appTheme = $0 }
+                )
+            ) {
+                ForEach(AppTheme.allCases) {
+                    Text($0.title).tag($0)
+                }
+            }
+            .accessibilityAddTraits(.isButton)
+            .accessibilityIdentifier("appThemePicker")
+        }
+    }
+
+    private var iconsGrid: some View {
+        VStack(spacing: 16) {
+            Text("App Icon")
+                .bold()
+                .frame(maxWidth: .infinity, alignment: .leading)
+            LazyVGrid(
+                columns: [GridItem(.adaptive(minimum: 65), spacing: 32, alignment: .leading)],
+                spacing: 32
+            ) {
+                ForEach(IconVariant.allCases, id: \.self) { icon in
+                    Button {
+                        Task { await iconViewModel.setIcon(icon) }
+                    } label: {
+                        makeView(for: icon)
+                    }
+                    .accessibilityLabel(Text(icon.accessibilityLabel))
+                }
+            }
+            .accessibilityIdentifier("appIconsGrid")
+        }
+    }
+
+    private func makeView(for icon: ThemeIconScreen.IconVariant) -> some View {
+        icon
+            .listImage
+            .resizable()
+            .scaledToFit()
+            .frame(width: 65, height: 65)
+            .clipShape(.rect(cornerRadius: 12))
+            .overlay {
+                RoundedRectangle(cornerRadius: 12)
+                    .strokeBorder(.iconBorder, lineWidth: 1)
+            }
+            .drawingGroup()
+            .overlay(alignment: .topTrailing) {
+                if icon == iconViewModel.currentAppIcon {
+                    Image(.thumbCheckmark)
+                        .offset(x: 6, y: -6)
+                        .transition(.opacity.combined(with: .scale))
+                        .accessibilityHidden(true)
+                }
+            }
+    }
+}
+
+#Preview {
+    NavigationStack {
+        ThemeIconScreen()
+    }
+    .environment(AppSettings())
+}