Merge branch 'release/1.7.2'

woin2ee · Feb 27, 2024 · d0ebadf · d0ebadf
2 parents 92375f2 + 96f7b41
commit d0ebadf
Show file tree

Hide file tree

Showing 179 changed files with 1,451 additions and 1,281 deletions.
diff --git a/.gitignore b/.gitignore
@@ -81,3 +81,6 @@ Tests/**/*.plist
 
 ### Changelog
 Changelog/next.md
+
+### Personal Playground
+MyPlayground.playground
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,6 +1,8 @@
 disabled_rules:
     - line_length
     - identifier_name
+    - type_name
+    - function_body_length
 
 trailing_whitespace:
     severity: error
@@ -11,15 +13,7 @@ trailing_comma:
 
 included:
     - Sources/
-    - Tests/
-
-    - Project.swift
-
-    # Equivalent to Tuist/**/*.swift
-    - Tuist/*.swift
-    - Tuist/ProjectDescriptionHelpers/*.swift
-    - Tuist/ProjectDescriptionHelpers/Extensions/*.swift
 
 excluded:
-    - Tests/InfrastructureTests/UserDefaults/UserSettingsRepositoryTests.swift.plist
-    - Tests/InfrastructureTests/UserDefaults/WCUserDefaultsTests.swift.plist
+    - Tests/
+    - Tuist/
diff --git a/Changelog/1.7.2.md b/Changelog/1.7.2.md
@@ -0,0 +1,2 @@
+## Fixed
+- Fixed bug with adding first word.
diff --git a/Project.swift b/Project.swift
@@ -23,6 +23,7 @@ func targets() -> [Target] {
                 .external(name: ExternalDependencyName.rxUtilityDynamic),
                 .external(name: ExternalDependencyName.swinject),
                 .external(name: ExternalDependencyName.swinjectExtension),
+                .external(name: ExternalDependencyName.foundationPlus),
             ],
             hasTests: true,
             additionalTestDependencies: [
@@ -89,7 +90,6 @@ func targets() -> [Target] {
             dependencies: [
                 .target(name: "Domain"),
                 .target(name: "Utility"),
-                .external(name: ExternalDependencyName.foundationPlus),
                 .external(name: ExternalDependencyName.rxSwift),
                 .external(name: ExternalDependencyName.rxCocoa),
                 .external(name: ExternalDependencyName.rxUtilityDynamic),
@@ -100,14 +100,14 @@ func targets() -> [Target] {
                 .external(name: ExternalDependencyName.sfSafeSymbols),
                 .external(name: ExternalDependencyName.swinject),
                 .external(name: ExternalDependencyName.swinjectExtension),
+                .external(name: ExternalDependencyName.uiKitPlus),
                 .package(product: ExternalDependencyName.swiftCollections),
             ],
             appendSchemeTo: &schemes
         )
         + Target.module(
-            name: "WordChecking",
-            sourcesPrefix: "IOSScenes",
-            resourceOptions: [.additional("Resources/IOSSupport/**")],
+            name: "IOSScene_WordChecking",
+            resourceOptions: [.own],
             dependencies: [
                 .target(name: "IOSSupport"),
             ],
@@ -120,20 +120,18 @@ func targets() -> [Target] {
             appendSchemeTo: &schemes
         )
         + Target.module(
-            name: "WordCheckingExample",
+            name: "IOSScene_WordCheckingExample",
             product: .app,
             infoPlist: .file(path: "Resources/InfoPlist/InfoExample.plist"),
-            sourcesPrefix: "IOSScenes",
             dependencies: [
-                .target(name: "WordChecking"),
+                .target(name: "IOSScene_WordChecking"),
                 .target(name: "DomainTesting"),
             ],
             appendSchemeTo: &schemes
         )
         + Target.module(
-            name: "WordList",
-            sourcesPrefix: "IOSScenes",
-            resourceOptions: [.additional("Resources/IOSSupport/**")],
+            name: "IOSScene_WordList",
+            resourceOptions: [.own],
             dependencies: [
                 .target(name: "IOSSupport"),
             ],
@@ -146,9 +144,8 @@ func targets() -> [Target] {
             appendSchemeTo: &schemes
         )
         + Target.module(
-            name: "WordDetail",
-            sourcesPrefix: "IOSScenes",
-            resourceOptions: [.additional("Resources/IOSSupport/**")],
+            name: "IOSScene_WordDetail",
+            resourceOptions: [.own],
             dependencies: [
                 .target(name: "IOSSupport"),
             ],
@@ -161,9 +158,8 @@ func targets() -> [Target] {
             appendSchemeTo: &schemes
         )
         + Target.module(
-            name: "WordAddition",
-            sourcesPrefix: "IOSScenes",
-            resourceOptions: [.additional("Resources/IOSSupport/**")],
+            name: "IOSScene_WordAddition",
+            resourceOptions: [.own],
             dependencies: [
                 .target(name: "IOSSupport"),
             ],
@@ -176,9 +172,8 @@ func targets() -> [Target] {
             appendSchemeTo: &schemes
         )
         + Target.module(
-            name: "UserSettings",
-            sourcesPrefix: "IOSScenes",
-            resourceOptions: [.additional("Resources/IOSSupport/**")],
+            name: "IOSScene_UserSettings",
+            resourceOptions: [.own],
             dependencies: [
                 .target(name: "IOSSupport"),
             ],
@@ -192,20 +187,18 @@ func targets() -> [Target] {
             appendSchemeTo: &schemes
         )
         + Target.module(
-            name: "UserSettingsExample",
+            name: "IOSScene_UserSettingsExample",
             product: .app,
             infoPlist: .file(path: "Resources/InfoPlist/InfoExample.plist"),
-            sourcesPrefix: "IOSScenes",
             dependencies: [
-                .target(name: "UserSettings"),
+                .target(name: "IOSScene_UserSettings"),
                 .target(name: "DomainTesting"),
             ],
             appendSchemeTo: &schemes
         )
         + Target.module(
-            name: "LanguageSetting",
-            sourcesPrefix: "IOSScenes",
-            resourceOptions: [.additional("Resources/IOSSupport/**")],
+            name: "IOSScene_LanguageSetting",
+            resourceOptions: [.own],
             dependencies: [
                 .target(name: "IOSSupport"),
             ],
@@ -218,9 +211,8 @@ func targets() -> [Target] {
             appendSchemeTo: &schemes
         )
         + Target.module(
-            name: "ThemeSetting",
-            sourcesPrefix: "IOSScenes",
-            resourceOptions: [.additional("Resources/IOSSupport/**")],
+            name: "IOSScene_ThemeSetting",
+            resourceOptions: [.own],
             dependencies: [
                 .target(name: "IOSSupport"),
             ],
@@ -232,9 +224,8 @@ func targets() -> [Target] {
             appendSchemeTo: &schemes
         )
         + Target.module(
-            name: "PushNotificationSettings",
-            sourcesPrefix: "IOSScenes",
-            resourceOptions: [.additional("Resources/IOSSupport/**")],
+            name: "IOSScene_PushNotificationSettings",
+            resourceOptions: [.own],
             dependencies: [
                 .target(name: "IOSSupport"),
             ],
@@ -246,20 +237,18 @@ func targets() -> [Target] {
             appendSchemeTo: &schemes
         )
         + Target.module(
-            name: "PushNotificationSettingsExample",
+            name: "IOSScene_PushNotificationSettingsExample",
             product: .app,
             infoPlist: .file(path: "Resources/InfoPlist/InfoExample.plist"),
-            sourcesPrefix: "IOSScenes",
             dependencies: [
-                .target(name: "PushNotificationSettings"),
+                .target(name: "IOSScene_PushNotificationSettings"),
                 .target(name: "DomainTesting"),
             ],
             appendSchemeTo: &schemes
         )
         + Target.module(
-            name: "GeneralSettings",
-            sourcesPrefix: "IOSScenes",
-            resourceOptions: [.additional("Resources/IOSSupport/**")],
+            name: "IOSScene_GeneralSettings",
+            resourceOptions: [.own],
             dependencies: [
                 .target(name: "IOSSupport"),
             ],
@@ -272,18 +261,19 @@ func targets() -> [Target] {
         )
         + Target.module(
             name: "IPhoneDriver",
+            resourceOptions: [.own],
             dependencies: [
                 .target(name: "IOSSupport"),
-                .target(name: "WordChecking"),
-                .target(name: "WordList"),
-                .target(name: "WordAddition"),
-                .target(name: "WordDetail"),
-                .target(name: "UserSettings"),
-                .target(name: "LanguageSetting"),
-                .target(name: "PushNotificationSettings"),
-                .target(name: "GeneralSettings"),
+                .target(name: "IOSScene_WordChecking"),
+                .target(name: "IOSScene_WordList"),
+                .target(name: "IOSScene_WordAddition"),
+                .target(name: "IOSScene_WordDetail"),
+                .target(name: "IOSScene_UserSettings"),
+                .target(name: "IOSScene_LanguageSetting"),
+                .target(name: "IOSScene_PushNotificationSettings"),
+                .target(name: "IOSScene_GeneralSettings"),
                 .target(name: "Infrastructure"),
-                .target(name: "ThemeSetting"),
+                .target(name: "IOSScene_ThemeSetting"),
                 .external(name: ExternalDependencyName.swinjectDIContainer),
             ],
             appendSchemeTo: &disposedSchemes
@@ -294,8 +284,8 @@ func targets() -> [Target] {
             bundleId: BASIC_BUNDLE_ID,
             infoPlist: .file(path: "Resources/InfoPlist/Info.plist"),
             resourceOptions: [
+                .own,
                 .common,
-                .additional("Resources/InfoPlist/Product/**"),
             ],
             dependencies: [
                 .target(name: "IPhoneDriver"),
@@ -309,15 +299,27 @@ func targets() -> [Target] {
             bundleId: "\(BASIC_BUNDLE_ID)Dev",
             infoPlist: .file(path: "Resources/InfoPlist/Info.plist"),
             resourceOptions: [
+                .own,
                 .common,
-                .additional("Resources/InfoPlist/Dev/**"),
             ],
             dependencies: [
                 .target(name: "IPhoneDriver"),
             ],
             settings: .settings(),
             appendSchemeTo: &schemes
         )
+        + Target.module(
+            name: "\(PROJECT_NAME)Mac",
+            platform: .macOS,
+            product: .app,
+            bundleId: "\(BASIC_BUNDLE_ID)Mac",
+            deploymentTarget: .macOS(targetVersion: "14.0.0"),
+            resourceOptions: [.own],
+            entitlements: nil,
+            dependencies: [],
+            settings: .settings(),
+            appendSchemeTo: &schemes
+        )
         + Target.module(
             name: "TestsSupport",
             dependencies: [
@@ -341,6 +343,9 @@ func targets() -> [Target] {
                     .target(name: "IOSSupport"),
                     .target(name: "Utility"),
                     .package(product: "Realm"),
+                    .package(product: ExternalDependencyName.googleAPIClientForRESTCore),
+                    .package(product: ExternalDependencyName.googleAPIClientForREST_Drive),
+                    .package(product: ExternalDependencyName.googleSignIn),
                 ]
             ),
         ],
@@ -361,7 +366,9 @@ let project: Project = .init(
         .package(url: "https://github.com/google/google-api-objectivec-client-for-rest.git", from: "3.0.0"),
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.0.0"),
     ],
-    settings: .settings(),
+    settings: .settings(
+        base: ["SWIFT_EMIT_LOC_STRINGS": true]
+    ),
     targets: targets(),
     schemes: schemes + [
         .init(

diff --git a/Resources/IOSScene/GeneralSettings/en.lproj/Localizable.strings b/Resources/IOSScene/GeneralSettings/en.lproj/Localizable.strings
@@ -0,0 +1,6 @@
+general = "General";
+haptics = "Haptics";
+theme = "Theme";
+
+hapticsSettingsFooterTextWhenHapticsIsOn = "Enable haptics for interactions.";
+hapticsSettingsFooterTextWhenHapticsIsOff = "Disable haptics for interactions.";
diff --git a/Resources/IOSScene/GeneralSettings/ko.lproj/Localizable.strings b/Resources/IOSScene/GeneralSettings/ko.lproj/Localizable.strings
@@ -0,0 +1,6 @@
+general = "일반";
+haptics = "진동";
+theme = "테마";
+
+hapticsSettingsFooterTextWhenHapticsIsOn = "상호 작용에 대한 진동을 사용합니다.";
+hapticsSettingsFooterTextWhenHapticsIsOff = "상호 작용에 대한 진동을 사용하지 않습니다.";
diff --git a/Resources/IOSScene/LanguageSetting/en.lproj/Localizable.strings b/Resources/IOSScene/LanguageSetting/en.lproj/Localizable.strings
@@ -0,0 +1,2 @@
+source_language = "Source language";
+translation_language = "Translation language";
diff --git a/Resources/IOSScene/LanguageSetting/ko.lproj/Localizable.strings b/Resources/IOSScene/LanguageSetting/ko.lproj/Localizable.strings
@@ -0,0 +1,2 @@
+source_language = "원본 언어";
+translation_language = "번역 언어";
diff --git a/Resources/IOSScene/PushNotificationSettings/en.lproj/Localizable.strings b/Resources/IOSScene/PushNotificationSettings/en.lproj/Localizable.strings
@@ -0,0 +1,7 @@
+daily_reminder = "Daily Reminder";
+notifications = "Notifications";
+notice = "Notice";
+time = "Time";
+
+allow_notifications_is_required = "Allow notifications is required.";
+dailyReminderFooter = "Sends a daily push notification at the time you set.";
diff --git a/Resources/IOSScene/PushNotificationSettings/ko.lproj/Localizable.strings b/Resources/IOSScene/PushNotificationSettings/ko.lproj/Localizable.strings
@@ -0,0 +1,7 @@
+daily_reminder = "매일 알림";
+notifications = "알림";
+notice = "알림";
+time = "시간";
+
+allow_notifications_is_required = "알림 허용이 필요합니다.";
+dailyReminderFooter = "설정한 시각에 매일 푸시 알림을 보냅니다.";
diff --git a/Resources/IOSScene/ThemeSetting/en.lproj/Localizable.strings b/Resources/IOSScene/ThemeSetting/en.lproj/Localizable.strings
@@ -0,0 +1,4 @@
+theme = "Theme";
+system_mode = "System mode";
+light_mode = "Light mode";
+dark_mode = "Dark mode";
diff --git a/Resources/IOSScene/ThemeSetting/ko.lproj/Localizable.strings b/Resources/IOSScene/ThemeSetting/ko.lproj/Localizable.strings
@@ -0,0 +1,4 @@
+theme = "테마";
+system_mode = "시스템 설정 모드";
+light_mode = "라이트 모드";
+dark_mode = "다크 모드";
diff --git a/Resources/IOSScene/UserSettings/en.lproj/Localizable.strings b/Resources/IOSScene/UserSettings/en.lproj/Localizable.strings
@@ -0,0 +1,15 @@
+source_language = "Source language";
+translation_language = "Translation language";
+notifications = "Notifications";
+general = "General";
+settings = "Settings";
+notice = "Notice";
+
+google_drive_upload = "Upload data to Google Drive";
+google_drive_upload_successfully = "Successfully uploading to Google Drive";
+
+google_drive_download = "Download data from Google Drive";
+google_drive_download_successfully = "Successfully downloading from Google Drive";
+
+google_drive_logout = "Google Drive Logout";
+signed_out_of_google_drive_successfully = "Signed out of Google Drive successfully";
diff --git a/Resources/IOSScene/UserSettings/ko.lproj/Localizable.strings b/Resources/IOSScene/UserSettings/ko.lproj/Localizable.strings
@@ -0,0 +1,15 @@
+source_language = "원본 언어";
+translation_language = "번역 언어";
+notifications = "알림";
+general = "일반";
+settings = "설정";
+notice = "알림";
+
+google_drive_upload = "구글 드라이브에 데이터 업로드";
+google_drive_upload_successfully = "구글 드라이브에 업로드 성공";
+
+google_drive_download = "구글 드라이브에서 데이터 다운로드";
+google_drive_download_successfully = "구글 드라이브에서 다운로드 성공";
+
+google_drive_logout = "구글 드라이브 로그아웃";
+signed_out_of_google_drive_successfully = "구글 드라이브에서 로그아웃되었습니다.";
diff --git a/Resources/IOSScene/WordAddition/en.lproj/Localizable.strings b/Resources/IOSScene/WordAddition/en.lproj/Localizable.strings
@@ -0,0 +1,3 @@
+word = "Word";
+duplicate_word = "Duplicate word.";
+newWord = "New word";
diff --git a/Resources/IOSScene/WordAddition/ko.lproj/Localizable.strings b/Resources/IOSScene/WordAddition/ko.lproj/Localizable.strings
@@ -0,0 +1,3 @@
+word = "단어";
+duplicate_word = "중복 단어입니다.";
+newWord = "새로운 단어";