3.2.2beta1

JohnCoates · Jan 7, 2023 · 839602e · 839602e
1 parent 405bc24
commit 839602e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Aerial.xcodeproj/project.pbxproj b/Aerial.xcodeproj/project.pbxproj
@@ -3265,15 +3265,15 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3.2.2;
+				CURRENT_PROJECT_VERSION = 3.2.2beta1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3L54M5L5KK;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/Resources/Old stuff/Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Screen Savers";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 3.2.2;
+				MARKETING_VERSION = 3.2.2beta1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3294,15 +3294,15 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3.2.2;
+				CURRENT_PROJECT_VERSION = 3.2.2beta1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3L54M5L5KK;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/Resources/Old stuff/Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Screen Savers";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 3.2.2;
+				MARKETING_VERSION = 3.2.2beta1;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/Aerial/Source/Models/Cache/PoiStringProvider.swift b/Aerial/Source/Models/Cache/PoiStringProvider.swift
@@ -83,7 +83,7 @@ final class PoiStringProvider {
         }
 
         if let sb = Bundle.init(path: bundlePath) {
-            let dictPath = Cache.supportPath.appending("/tvOS 13/TVIdleScreenStrings.bundle/en.lproj/Localizable.nocache.strings")
+            let dictPath = Cache.supportPath.appending("/tvOS 16/TVIdleScreenStrings.bundle/en.lproj/Localizable.nocache.strings")
 
             // We could probably only work with that...
             if let sd = NSDictionary(contentsOfFile: dictPath) as? [String: String] {

diff --git a/Aerial/Source/Views/Layers/TimerLayer.swift b/Aerial/Source/Views/Layers/TimerLayer.swift
@@ -92,12 +92,18 @@ class TimerLayer: AnimationTextLayer {
             if Date() > endTime! && PrefsInfo.timer.disableWhenElapsed {
                 // Disabling for next launch
                 PrefsInfo.timer.isEnabled = false
+            }
 
+
+            if Date() > endTime! {
                 // We may show a message when the timer is elapsed
                 if PrefsInfo.timer.replaceWithMessage {
                     return PrefsInfo.timer.customMessage
                 }
             }
+
+
+
 
             return dateComponentsFormatter.string(from: Date(), to: endTime!) ?? ""
         } else {