Рефактор локализации (#20)

- Применил новые настройки для генерации локализации
- Переезд на String(localized:)

Author: easydev991

SwiftUI-Days.xcodeproj/project.pbxproj

@@ -188,7 +188,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1610;
-				LastUpgradeCheck = 1630;
+				LastUpgradeCheck = 2600;
 				TargetAttributes = {
 					6717F8CD2BBEA5F700A32083 = {
 						CreatedOnToolsVersion = 15.3;
@@ -434,6 +434,7 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -494,6 +495,7 @@
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 6.0;
@@ -512,8 +514,10 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"SwiftUI-Days/Preview Content\"";
+				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SELECTED_FILES = readonly;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "SwiftUI-Days/SupportingFiles/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = Days;
@@ -534,7 +538,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.10;
+				MARKETING_VERSION = 1.11;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oleg991.SwiftUI-Days";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -560,8 +564,10 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"SwiftUI-Days/Preview Content\"";
+				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SELECTED_FILES = readonly;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "SwiftUI-Days/SupportingFiles/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = Days;
@@ -582,7 +588,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.10;
+				MARKETING_VERSION = 1.11;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oleg991.SwiftUI-Days";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;

SwiftUI-Days.xcodeproj/xcshareddata/xcschemes/SwiftUI-Days.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1630"
+   LastUpgradeVersion = "2600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

SwiftUI-Days.xcodeproj/xcshareddata/xcschemes/SwiftUI-DaysUITests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1630"
+   LastUpgradeVersion = "2600"
    version = "2.2">
    <BuildAction
       parallelizeBuildables = "YES"

SwiftUI-Days/Models/AppTheme.swift

@@ -6,11 +6,11 @@ enum AppTheme: Int, CaseIterable, Identifiable {
     case light = 1
     case dark = 2
 
-    var title: LocalizedStringResource {
+    var title: String {
         switch self {
-        case .system: "System"
-        case .light: "Light"
-        case .dark: "Dark"
+        case .system: String(localized: .system)
+        case .light: String(localized: .light)
+        case .dark: String(localized: .dark)
         }
     }
 

SwiftUI-Days/Models/DisplayOption.swift

@@ -16,11 +16,11 @@ enum DisplayOption: String, Codable, CaseIterable, Hashable {
     }
 
     /// Локализованное название формата отображения
-    var localizedTitle: LocalizedStringKey {
+    var localizedTitle: String {
         switch self {
-        case .day: "Days only"
-        case .monthDay: "Months and days"
-        case .yearMonthDay: "Years, months and days"
+        case .day: String(localized: .daysOnly)
+        case .monthDay: String(localized: .monthsAndDays)
+        case .yearMonthDay: String(localized: .yearsMonthsAndDays)
         }
     }
 }

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 = String(localized: "Today")
+        let todayString = String(localized: .today)
         guard yearsCount != 0 || monthsCount != 0 || daysCount != 0 else {
             return todayString
         }

SwiftUI-Days/Models/SortOrder+.swift

@@ -1,10 +1,10 @@
 import SwiftUI
 
 extension SortOrder {
-    var name: LocalizedStringKey {
+    var name: String {
         switch self {
-        case .forward: "Old first"
-        case .reverse: "New first"
+        case .forward: String(localized: .oldFirst)
+        case .reverse: String(localized: .newFirst)
         }
     }
 }

SwiftUI-Days/Screens/CommonViews/SectionTitleView.swift

@@ -2,9 +2,9 @@ import SwiftUI
 
 struct SectionTitleView: View {
     @Environment(\.isEnabled) private var isEnabled
-    private let title: LocalizedStringKey
+    private let title: String
 
-    init(_ title: LocalizedStringKey) {
+    init(_ title: String) {
         self.title = title
     }
 
@@ -17,10 +17,10 @@ struct SectionTitleView: View {
 }
 
 #Preview(traits: .sizeThatFitsLayout) {
-    let titleStringKeys: [LocalizedStringKey] = [
-        "Title",
-        "Details",
-        "Add color tag"
+    let titleStringKeys: [String] = [
+        String(localized: "Title"),
+        String(localized: "Details"),
+        String(localized: "Add color tag")
     ]
     VStack(spacing: 20) {
         ForEach(

SwiftUI-Days/Screens/Detail/EditItemScreen.swift

@@ -46,7 +46,7 @@ struct EditItemScreen: View {
                 .accessibilityIdentifier(backButtonAccessibilityIdentifier)
             }
             ToolbarItem(placement: .topBarTrailing) {
-                Button("Save") {
+                Button(.save) {
                     save()
                     closeAction()
                 }
@@ -58,8 +58,8 @@ struct EditItemScreen: View {
 
     private var titleSection: some View {
         EditSectionView(
-            headerText: "Title",
-            placeholder: "Title for the Item",
+            headerText: String(localized: .title),
+            placeholder: String(localized: .titleForTheItem),
             text: $title
         )
         .focused($isFirstFieldFocused)
@@ -68,8 +68,8 @@ struct EditItemScreen: View {
 
     private var detailsSection: some View {
         EditSectionView(
-            headerText: "Details",
-            placeholder: "Details for the Item",
+            headerText: String(localized: .details),
+            placeholder: String(localized: .detailsForTheItem),
             text: $details
         )
     }
@@ -87,12 +87,12 @@ struct EditItemScreen: View {
                     }
                 ),
                 label: {
-                    SectionTitleView("Add color tag")
+                    SectionTitleView(String(localized: .addColorTag))
                 }
             )
             if let colorTag {
                 ColorPicker(
-                    "Color tag",
+                    .colorTag,
                     selection: .init(
                         get: { colorTag },
                         set: { self.colorTag = $0 }
@@ -112,12 +112,12 @@ struct EditItemScreen: View {
         ItemDisplayOptionPicker(displayOption: $displayOption)
     }
 
-    private var navigationTitle: LocalizedStringKey {
-        oldItem == nil ? "New Item" : "Edit Item"
+    private var navigationTitle: String {
+        oldItem == nil ? String(localized: .newItem) : String(localized: .editItem)
     }
 
-    private var backButtonTitle: LocalizedStringKey {
-        oldItem == nil ? "Close" : "Cancel"
+    private var backButtonTitle: String {
+        oldItem == nil ? String(localized: .close) : String(localized: .cancel)
     }
 
     private var backButtonAccessibilityIdentifier: String {

SwiftUI-Days/Screens/Detail/EditSectionView.swift

@@ -1,8 +1,8 @@
 import SwiftUI
 
 struct EditSectionView: View {
-    let headerText: LocalizedStringKey
-    let placeholder: LocalizedStringKey
+    let headerText: String
+    let placeholder: String
     @Binding var text: String
 
     var body: some View {
@@ -23,8 +23,8 @@ struct EditSectionView: View {
 
 #Preview {
     EditSectionView(
-        headerText: "Title",
-        placeholder: "Title for the Item",
+        headerText: String(localized: "Title"),
+        placeholder: String(localized: "Title for the Item"),
         text: .constant("Событие, которое очень хочется запомнить, и никак нельзя забывать, например, первая поездка на велосипеде")
     )
 }