Merge branch 'dev'

SaveMyEyes.xcodeproj/project.pbxproj

@@ -227,7 +227,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1250;
-				LastUpgradeCheck = 1250;
+				LastUpgradeCheck = 1340;
 				ORGANIZATIONNAME = "Max Omelchenko";
 				TargetAttributes = {
 					B62BCDC82689ECB90009EC6A = {
@@ -327,8 +327,10 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = SaveMyEyesLauncher/SaveMyEyesLauncher.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 5PYHR2J538;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = SaveMyEyesLauncher/Info.plist;
@@ -337,6 +339,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.masich.SaveMyEyesLauncher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -350,8 +353,10 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = SaveMyEyesLauncher/SaveMyEyesLauncher.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 5PYHR2J538;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = SaveMyEyesLauncher/Info.plist;
@@ -360,6 +365,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.masich.SaveMyEyesLauncher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -493,7 +499,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 32;
+				CURRENT_PROJECT_VERSION = 33;
 				DEVELOPMENT_ASSET_PATHS = "\"SaveMyEyes/Preview Content\"";
 				DEVELOPMENT_TEAM = 5PYHR2J538;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -504,7 +510,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 0.62;
+				MARKETING_VERSION = 0.63;
 				PRODUCT_BUNDLE_IDENTIFIER = com.masich.SaveMyEyes;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -519,7 +525,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 32;
+				CURRENT_PROJECT_VERSION = 33;
 				DEVELOPMENT_ASSET_PATHS = "\"SaveMyEyes/Preview Content\"";
 				DEVELOPMENT_TEAM = 5PYHR2J538;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -530,7 +536,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 0.62;
+				MARKETING_VERSION = 0.63;
 				PRODUCT_BUNDLE_IDENTIFIER = com.masich.SaveMyEyes;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

SaveMyEyes/Info.plist

@@ -29,7 +29,7 @@
 	<key>LSUIElement</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2021 Max Omelchenko. All rights reserved.</string>
+	<string>Copyright © 2022 Max Omelchenko. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>

SaveMyEyes/Source/Main/MainViewModel.swift

@@ -157,7 +157,7 @@ class MainViewModel: ObservableObject {
         let notification: AppNotification
         let notificationSound = isSoundEnabled.value ? AppNotification.defaultSound : AppNotification.withoutSound
         if isBreakTimeNow {
-            notification = AppNotification(title: "It's time for break".localized, subtitle: String(format: "Relax from your computer for %d minutes.".localized, breakInterval.value), sound: notificationSound)
+            notification = AppNotification(title: "It's time for break".localized, subtitle: String(format: "Relax from your computer for %d min.".localized, breakInterval.value), sound: notificationSound)
         } else {
             notification = AppNotification(title: "It's time to work".localized, subtitle: "Let's continue to do amazing things!".localized, sound: notificationSound)
         }

SaveMyEyes/en.lproj/Localizable.strings

@@ -15,7 +15,7 @@
 "Quit" = "Quit";
 "It's time for break" = "It's time for break";
 "It's time to work" = "It's time for work";
-"Relax from your computer for %d minutes." = "Relax from your computer for %d minutes.";
+"Relax from your computer for %d min." = "Relax from your computer for %d min.";
 "Let's continue to do amazing things!" = "Let's continue to do amazing things!";
 "Pause" = "Pause";
 "Enable sound" = "Enable sound";

SaveMyEyes/ru-RU.lproj/Localizable.strings

@@ -13,10 +13,10 @@
 "Work interval" = "Интервал работы";
 "Break interval" = "Интервал перерыва";
 "Quit" = "Выход";
-"It's time for break" = "Время для перерыва";
-"It's time to work" = "Время работать";
-"Relax from your computer for %d minutes." = "Отдохни от компьютера %d минут.";
-"Let's continue to do amazing things!" = "Давай продолжим делать крутые вещи!";
+"It's time for break" = "Пора сделать перерыв";
+"It's time to work" = "Пора возвращаться работать";
+"Relax from your computer for %d min." = "Отдохни от компьютера %d мин.";
+"Let's continue to do amazing things!" = "Ну что, продолжаем делать крутые вещи!";
 "Pause" = "Пауза";
 "Enable sound" = "Включить звук";
 "Reset" = "Сбросить";

SaveMyEyes/uk.lproj/Localizable.strings

@@ -13,10 +13,10 @@
 "Work interval" = "Інтервал роботи";
 "Break interval" = "Інтервал перерви";
 "Quit" = "Вихід";
-"It's time for break" = "Час на перерву";
-"It's time to work" = "Час для роботи";
-"Relax from your computer for %d minutes." = "Відпочинь від компьютера %d хвилин.";
-"Let's continue to do amazing things!" = "Давай продовжимо робити круті речі!";
+"It's time for break" = "Час зробити перерву";
+"It's time to work" = "Час повертатися до роботи";
+"Relax from your computer for %d min." = "Відпочинь від комп'ютера %d хв.";
+"Let's continue to do amazing things!" = "Ну що, продовжуємо робити круті речі!";
 "Pause" = "Пауза";
 "Enable sound" = "Увімкнути звук";
 "Reset" = "Скинути";

SaveMyEyesLauncher/Info.plist

@@ -17,17 +17,17 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSBackgroundOnly</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2021 Max Omelchenko. All rights reserved.</string>
+	<string>Copyright © 2022 Max Omelchenko. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSSupportsAutomaticTermination</key>