From 197ecbd2b29728b9362d7cc66c37a454faf4250d Mon Sep 17 00:00:00 2001 From: Vinh Nguyen Date: Wed, 9 Mar 2022 18:29:41 +0700 Subject: [PATCH] Update whats new kit --- Clendar.xcodeproj/project.pbxproj | 4 +-- .../Extensions/ClendarApp+WhatsNew.swift | 35 ++++++++++++++----- Clendar/Resources/Info.plist | 2 +- .../Localization/de.lproj/Localizable.strings | 1 + .../Localization/en.lproj/Localizable.strings | 1 + .../Localization/es.lproj/Localizable.strings | 1 + .../Localization/fr.lproj/Localizable.strings | 1 + .../Localization/ja.lproj/Localizable.strings | 1 + .../Localization/ko.lproj/Localizable.strings | 1 + .../Localization/th.lproj/Localizable.strings | 1 + .../Localization/vi.lproj/Localizable.strings | 1 + .../zh-hans.lproj/Localizable.strings | 1 + .../zh-hant.lproj/Localizable.strings | 1 + ClendarTests/Info.plist | 2 +- ClendarUITests/Info.plist | 2 +- ClendarWatchApp Extension/Info.plist | 2 +- ClendarWatchApp/Info.plist | 2 +- ClendarWidget/Info.plist | 2 +- R.generated.swift | 21 ++++++++++- 19 files changed, 64 insertions(+), 18 deletions(-) diff --git a/Clendar.xcodeproj/project.pbxproj b/Clendar.xcodeproj/project.pbxproj index 530dc775..421182ea 100644 --- a/Clendar.xcodeproj/project.pbxproj +++ b/Clendar.xcodeproj/project.pbxproj @@ -2092,7 +2092,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 94; + CURRENT_PROJECT_VERSION = 95; "DEBUG_INFORMATION_FORMAT[sdk=iphoneos*]" = "dwarf-with-dsym"; "DEBUG_INFORMATION_FORMAT[sdk=iphonesimulator*]" = dwarf; DEVELOPMENT_TEAM = 6TWWD47PW9; @@ -2125,7 +2125,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 94; + CURRENT_PROJECT_VERSION = 95; DEVELOPMENT_TEAM = 6TWWD47PW9; INFOPLIST_FILE = Clendar/Resources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.0; diff --git a/Clendar/Helper/Extensions/ClendarApp+WhatsNew.swift b/Clendar/Helper/Extensions/ClendarApp+WhatsNew.swift index 49f33262..11769ccf 100644 --- a/Clendar/Helper/Extensions/ClendarApp+WhatsNew.swift +++ b/Clendar/Helper/Extensions/ClendarApp+WhatsNew.swift @@ -16,7 +16,7 @@ extension ClendarApp: WhatsNewCollectionProvider { WhatsNew( version: WhatsNew.Version( major: 3, - minor: 2, + minor: 4, patch: 0 ), // specify version here title: WhatsNew.Title( @@ -26,23 +26,39 @@ extension ClendarApp: WhatsNewCollectionProvider { features: [ .init( image: .init( - systemName: "clock", + systemName: "wand.and.stars.inverse", foregroundColor: .orange ), - title: WhatsNew.Text(NSLocalizedString("12 or 24 hour date setting", comment: "")), - subtitle: WhatsNew.Text(NSLocalizedString("You can now choose 12 or 24 hour format, from the settings menu.", comment: "")) + title: WhatsNew.Text(""), + subtitle: WhatsNew.Text(NSLocalizedString("Fix wrong widget theme when changing different languages", comment: "")) ), .init( image: .init( - systemName: "arrow.left.arrow.right", - foregroundColor: .cyan + systemName: "wand.and.stars.inverse", + foregroundColor: .indigo ), - title: WhatsNew.Text(NSLocalizedString("Quick date switcher button", comment: "")), - subtitle: WhatsNew.Text(NSLocalizedString("Quickly toggle between dates.", comment: "")) + title: WhatsNew.Text(""), + subtitle: WhatsNew.Text(NSLocalizedString("Fix localization", comment: "")) ), .init( image: .init( - systemName: "heart", + systemName: "wand.and.stars.inverse", + foregroundColor: .green + ), + title: WhatsNew.Text(""), + subtitle: WhatsNew.Text(NSLocalizedString("Fix action sheet crash", comment: "")) + ), + .init( + image: .init( + systemName: "rectangle.portrait.inset.filled", + foregroundColor: .teal + ), + title: WhatsNew.Text(""), + subtitle: WhatsNew.Text(NSLocalizedString("Support portrait mode on iPad", comment: "")) + ), + .init( + image: .init( + systemName: "heart.fill", foregroundColor: .red ), title: WhatsNew.Text(NSLocalizedString("Thanks for using Clendar!", comment: "")), @@ -51,6 +67,7 @@ extension ClendarApp: WhatsNewCollectionProvider { ], primaryAction: .init( title: WhatsNew.Text(NSLocalizedString("Continue", comment: "")), + backgroundColor: .appRed, hapticFeedback: { #if os(iOS) .notification(.success) diff --git a/Clendar/Resources/Info.plist b/Clendar/Resources/Info.plist index bbbc6b8a..d3d739c5 100644 --- a/Clendar/Resources/Info.plist +++ b/Clendar/Resources/Info.plist @@ -71,7 +71,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.3.4 + 3.4.0 CFBundleVersion 94 ITSAppUsesNonExemptEncryption diff --git a/Clendar/Resources/Localization/de.lproj/Localizable.strings b/Clendar/Resources/Localization/de.lproj/Localizable.strings index cf9c0eca..c2b7bd17 100644 --- a/Clendar/Resources/Localization/de.lproj/Localizable.strings +++ b/Clendar/Resources/Localization/de.lproj/Localizable.strings @@ -253,3 +253,4 @@ "12 or 24 hour date setting" = "12- oder 24-Stunden-Datumseinstellung"; "Have a nice day!" = "Einen schönen Tag noch!"; "Start Week On" = "Beginnen Sie die Woche am"; +"NEW" = "NEU"; diff --git a/Clendar/Resources/Localization/en.lproj/Localizable.strings b/Clendar/Resources/Localization/en.lproj/Localizable.strings index 490434f8..13770ecd 100644 --- a/Clendar/Resources/Localization/en.lproj/Localizable.strings +++ b/Clendar/Resources/Localization/en.lproj/Localizable.strings @@ -253,3 +253,4 @@ "12 or 24 hour date setting" = "12 or 24 hour date setting"; "Have a nice day!" = "Have a nice day!"; "Start Week On" = "Start Week On"; +"NEW" = "NEW"; diff --git a/Clendar/Resources/Localization/es.lproj/Localizable.strings b/Clendar/Resources/Localization/es.lproj/Localizable.strings index 898d478c..ef3d562d 100644 --- a/Clendar/Resources/Localization/es.lproj/Localizable.strings +++ b/Clendar/Resources/Localization/es.lproj/Localizable.strings @@ -253,3 +253,4 @@ "12 or 24 hour date setting" = "Ajuste de fecha de 12 o 24 horas"; "Have a nice day!" = "¡Que tenga un lindo día!"; "Start Week On" = "Empezar la semana el"; +"NEW" = "NUEVA"; diff --git a/Clendar/Resources/Localization/fr.lproj/Localizable.strings b/Clendar/Resources/Localization/fr.lproj/Localizable.strings index c360055e..cb1c8bd0 100644 --- a/Clendar/Resources/Localization/fr.lproj/Localizable.strings +++ b/Clendar/Resources/Localization/fr.lproj/Localizable.strings @@ -253,3 +253,4 @@ "12 or 24 hour date setting" = "Réglage de la date sur 12 ou 24 heures"; "Have a nice day!" = "Bonne journée!"; "Start Week On" = "Commencer la semaine le"; +"NEW" = "NOUVELLE"; diff --git a/Clendar/Resources/Localization/ja.lproj/Localizable.strings b/Clendar/Resources/Localization/ja.lproj/Localizable.strings index 3daa281f..8863bd8c 100644 --- a/Clendar/Resources/Localization/ja.lproj/Localizable.strings +++ b/Clendar/Resources/Localization/ja.lproj/Localizable.strings @@ -253,3 +253,4 @@ "12 or 24 hour date setting" = "12時間または24時間の日付設定"; "Have a nice day!" = "良い1日を！"; "Start Week On" = "週を開始"; +"NEW" = "新着"; diff --git a/Clendar/Resources/Localization/ko.lproj/Localizable.strings b/Clendar/Resources/Localization/ko.lproj/Localizable.strings index 04282d7f..a2b6026c 100644 --- a/Clendar/Resources/Localization/ko.lproj/Localizable.strings +++ b/Clendar/Resources/Localization/ko.lproj/Localizable.strings @@ -253,3 +253,4 @@ "12 or 24 hour date setting" = "12시간 또는 24시간 날짜 설정"; "Have a nice day!" = "좋은 하루 되세요!"; "Start Week On" = "시작 주"; +"NEW" = "새로운"; diff --git a/Clendar/Resources/Localization/th.lproj/Localizable.strings b/Clendar/Resources/Localization/th.lproj/Localizable.strings index 9200a0aa..b06383a8 100644 --- a/Clendar/Resources/Localization/th.lproj/Localizable.strings +++ b/Clendar/Resources/Localization/th.lproj/Localizable.strings @@ -253,3 +253,4 @@ "12 or 24 hour date setting" = "การตั้งค่าวันที่ 12 หรือ 24 ชั่วโมง"; "Have a nice day!" = "ขอให้เป็นวันที่ดี!"; "Start Week On" = "เริ่มสัปดาห์ที่"; +"NEW" = "ใหม่"; diff --git a/Clendar/Resources/Localization/vi.lproj/Localizable.strings b/Clendar/Resources/Localization/vi.lproj/Localizable.strings index a2e4d5cb..ddf7ebb7 100644 --- a/Clendar/Resources/Localization/vi.lproj/Localizable.strings +++ b/Clendar/Resources/Localization/vi.lproj/Localizable.strings @@ -253,3 +253,4 @@ "12 or 24 hour date setting" = "Cài đặt ngày 12 hoặc 24 giờ"; "Have a nice day!" = "Chúc một ngày tốt lành!"; "Start Week On" = "Bắt đầu tuần vào"; +"NEW" = "MỚI"; diff --git a/Clendar/Resources/Localization/zh-hans.lproj/Localizable.strings b/Clendar/Resources/Localization/zh-hans.lproj/Localizable.strings index 4321cc17..36d022c9 100644 --- a/Clendar/Resources/Localization/zh-hans.lproj/Localizable.strings +++ b/Clendar/Resources/Localization/zh-hans.lproj/Localizable.strings @@ -253,3 +253,4 @@ "12 or 24 hour date setting" = "12 或 24 小时日期设置"; "Have a nice day!" = "祝你今天过得愉快！"; "Start Week On" = "开始一周"; +"NEW" = "新的"; diff --git a/Clendar/Resources/Localization/zh-hant.lproj/Localizable.strings b/Clendar/Resources/Localization/zh-hant.lproj/Localizable.strings index b4faa1fd..999a46b0 100644 --- a/Clendar/Resources/Localization/zh-hant.lproj/Localizable.strings +++ b/Clendar/Resources/Localization/zh-hant.lproj/Localizable.strings @@ -253,3 +253,4 @@ "12 or 24 hour date setting" = "12 或 24 小時日期設置"; "Have a nice day!" = "祝你今天過得愉快！"; "Start Week On" = "開始一周"; +"NEW" = "新的"; diff --git a/ClendarTests/Info.plist b/ClendarTests/Info.plist index 4796be79..7337885c 100644 --- a/ClendarTests/Info.plist +++ b/ClendarTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.3.4 + 3.4.0 CFBundleVersion 94 diff --git a/ClendarUITests/Info.plist b/ClendarUITests/Info.plist index 4796be79..7337885c 100644 --- a/ClendarUITests/Info.plist +++ b/ClendarUITests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.3.4 + 3.4.0 CFBundleVersion 94 diff --git a/ClendarWatchApp Extension/Info.plist b/ClendarWatchApp Extension/Info.plist index ac6e9625..56225b5c 100644 --- a/ClendarWatchApp Extension/Info.plist +++ b/ClendarWatchApp Extension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.3.4 + 3.4.0 CFBundleVersion 94 CLKComplicationPrincipalClass diff --git a/ClendarWatchApp/Info.plist b/ClendarWatchApp/Info.plist index 36c9634f..0c572b77 100644 --- a/ClendarWatchApp/Info.plist +++ b/ClendarWatchApp/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.3.4 + 3.4.0 CFBundleVersion 94 UISupportedInterfaceOrientations diff --git a/ClendarWidget/Info.plist b/ClendarWidget/Info.plist index d3bba9cc..061e227c 100644 --- a/ClendarWidget/Info.plist +++ b/ClendarWidget/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.3.4 + 3.4.0 CFBundleVersion 94 NSExtension diff --git a/R.generated.swift b/R.generated.swift index 42436a89..42788741 100644 --- a/R.generated.swift +++ b/R.generated.swift @@ -470,7 +470,7 @@ struct R: Rswift.Validatable { fileprivate init() {} } - /// This `R.string.localizable` struct is generated, and contains static references to 160 localization keys. + /// This `R.string.localizable` struct is generated, and contains static references to 161 localization keys. struct localizable { /// en translation: ... and many more features to come in the future! /// @@ -800,6 +800,10 @@ struct R: Rswift.Validatable { /// /// Locales: en, vi, ja, zh-hans, es, ko, zh-hant, th, de, fr static let moreCalendarIdentifiersSuchAs = Rswift.StringResource(key: "More calendar identifiers, such as:", tableName: "Localizable", bundle: R.hostingBundle, locales: ["en", "vi", "ja", "zh-hans", "es", "ko", "zh-hant", "th", "de", "fr"], comment: nil) + /// en translation: NEW + /// + /// Locales: en, vi, ja, zh-hans, es, ko, zh-hant, th, de, fr + static let neW = Rswift.StringResource(key: "NEW", tableName: "Localizable", bundle: R.hostingBundle, locales: ["en", "vi", "ja", "zh-hans", "es", "ko", "zh-hant", "th", "de", "fr"], comment: nil) /// en translation: Name /// /// Locales: en, vi, ja, zh-hans, es, ko, zh-hant, th, de, fr @@ -2343,6 +2347,21 @@ struct R: Rswift.Validatable { return NSLocalizedString("More calendar identifiers, such as:", bundle: bundle, comment: "") } + /// en translation: NEW + /// + /// Locales: en, vi, ja, zh-hans, es, ko, zh-hant, th, de, fr + static func neW(preferredLanguages: [String]? = nil) -> String { + guard let preferredLanguages = preferredLanguages else { + return NSLocalizedString("NEW", bundle: hostingBundle, comment: "") + } + + guard let (_, bundle) = localeBundle(tableName: "Localizable", preferredLanguages: preferredLanguages) else { + return "NEW" + } + + return NSLocalizedString("NEW", bundle: bundle, comment: "") + } + /// en translation: Name /// /// Locales: en, vi, ja, zh-hans, es, ko, zh-hant, th, de, fr