xbmc · wutschel · Feb 15, 2022 · Oct 10, 2025 · Nov 14, 2025 · Oct 10, 2025
diff --git a/Config.xcconfig b/Config.xcconfig
@@ -0,0 +1,9 @@
+LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=arm64] = $(SRCROOT)/libs/fmt/ios-arm64
+LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=arm64] = $(SRCROOT)/libs/fmt/sim-arm64
+LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=x86_64] = $(SRCROOT)/libs/fmt/sim-x86_64
+
+GCC_PREPROCESSOR_DEFINITIONS = FMT_LOCALE FMT_SHARED $(inherited)
+HEADER_SEARCH_PATHS = libs/fmt/include
+LD_RUNPATH_SEARCH_PATHS[sdk=iphoneos*] = @loader_path/Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*] = $(LIBRARY_SEARCH_PATHS)
+OTHER_LDFLAGS = -lfmt $(inherited)
diff --git a/Kodi Remote.xcodeproj/project.pbxproj b/Kodi Remote.xcodeproj/project.pbxproj
@@ -100,6 +100,7 @@
 		C76594B52C5E883A00B93A2A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1A9786C21683D87800B4F3F8 /* Localizable.strings */; };
 		C76594B62C5E885B00B93A2A /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0FE6087E164B3094009CA3A9 /* Roboto-Regular.ttf */; };
 		C76594B72C5E8A5B00B93A2A /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = C70F41D02BA4D98E00847C75 /* PrivacyInfo.xcprivacy */; };
+		C771C7292EC7879300581D44 /* fmt_convert.mm in Sources */ = {isa = PBXBuildFile; fileRef = C771C7282EC7879300581D44 /* fmt_convert.mm */; };
 		C78C30F528F877870055CD95 /* VersionCheck.m in Sources */ = {isa = PBXBuildFile; fileRef = C78C30F428F877870055CD95 /* VersionCheck.m */; };
 		C78C30FA28F8AADA0055CD95 /* SharingActivityItemSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C78C30F928F89A3E0055CD95 /* SharingActivityItemSource.m */; };
 		C795123F2DC95A7E00A8CEE5 /* LinkPresentation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C795123E2DC95A7E00A8CEE5 /* LinkPresentation.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
@@ -263,6 +264,7 @@
 		1A9786C31683D8E900B4F3F8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		8ED18E7A16B572D700CA03F4 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		8ED18E7B16B572D700CA03F4 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
+		ACCBC14627BBB259000A16E1 /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
 		B1FF37DE1709D1EB005473FF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		B1FF37DF1709D1ED005473FF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		C703692827148CEF0049F9BF /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
@@ -325,6 +327,8 @@
 		C76451CB29C51221000AE949 /* UIButton+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIButton+WebCache.m"; path = "SDWebImage/UIButton+WebCache.m"; sourceTree = "<group>"; };
 		C76451CC29C51221000AE949 /* SDWebImageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDWebImageManager.h; path = SDWebImage/SDWebImageManager.h; sourceTree = "<group>"; };
 		C76451CD29C51221000AE949 /* UIImage+MultiFormat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImage+MultiFormat.m"; path = "SDWebImage/UIImage+MultiFormat.m"; sourceTree = "<group>"; };
+		C771C7282EC7879300581D44 /* fmt_convert.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = fmt_convert.mm; sourceTree = "<group>"; };
+		C771C72A2EC787B500581D44 /* fmt_convert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fmt_convert.h; sourceTree = "<group>"; };
 		C772AD2A2E675D8300435181 /* bs-BA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "bs-BA"; path = "bs-BA.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		C772AD2B2E675D8300435181 /* bs-BA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "bs-BA"; path = "bs-BA.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		C78204462E3930FC00B3F1E9 /* uk-UA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "uk-UA"; path = "uk-UA.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
@@ -524,6 +528,7 @@
 			isa = PBXGroup;
 			children = (
 				C70F41D02BA4D98E00847C75 /* PrivacyInfo.xcprivacy */,
+				ACCBC14627BBB259000A16E1 /* Config.xcconfig */,
 				0F59E2661564796B00184AE8 /* CONTRIBUTING.md */,
 				0F59E26315646FB800184AE8 /* LICENSE */,
 				0F8717911564566300AE2D48 /* README.md */,
@@ -586,6 +591,8 @@
 				0F4019B218F415A50064E4DC /* MessagesView.m */,
 				0F4AB8181903DDCE005DEC5C /* RemoteControllerGestureZoneView.h */,
 				0F4AB8191903DDCE005DEC5C /* RemoteControllerGestureZoneView.m */,
+				C771C72A2EC787B500581D44 /* fmt_convert.h */,
+				C771C7282EC7879300581D44 /* fmt_convert.mm */,
 				0F747736151DD98600EF78AD /* classes */,
 				0F554901151D1187007E633F /* Supporting Files */,
 				0F554C21151D197F007E633F /* nib */,
@@ -934,6 +941,7 @@
 				C76451CF29C51221000AE949 /* UIImage+WebP.m in Sources */,
 				0F7F3DA5164A6D730080A14A /* ECSlidingViewController.m in Sources */,
 				C7B7D03A2F76D36E00689B5A /* UILabel+Extensions.m in Sources */,
+				C771C7292EC7879300581D44 /* fmt_convert.mm in Sources */,
 				C79B0EA52DF0CF6900046334 /* BaseMasterViewController.m in Sources */,
 				0F7F3DA6164A6D730080A14A /* UIImage+ImageWithUIView.m in Sources */,
 				0F7F3DAB164AAD0F0080A14A /* InitialSlidingViewController.m in Sources */,
@@ -1044,6 +1052,8 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_FRAMEWORKS = UIKit;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
+				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -1078,7 +1088,6 @@
 					"$(inherited)",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1102,6 +1111,8 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_FRAMEWORKS = UIKit;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
+				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -1130,7 +1141,6 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1150,6 +1160,7 @@
 		};
 		0F55491B151D1187007E633F /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = ACCBC14627BBB259000A16E1 /* Config.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1158,6 +1169,7 @@
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-w",
+					"$(inherited)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "it.joethefox.XBMC-Remote";
 				PRODUCT_NAME = "Kodi Remote";
@@ -1168,12 +1180,16 @@
 		};
 		0F55491C151D1187007E633F /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = ACCBC14627BBB259000A16E1 /* Config.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "XBMC Remote/Kodi Remote-Prefix.pch";
 				INFOPLIST_FILE = "XBMC Remote/Kodi Remote-Info.plist";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"$(inherited)",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "it.joethefox.XBMC-Remote";
 				PRODUCT_NAME = "Kodi Remote";
 				PROVISIONING_PROFILE_SPECIFIER = "Kodi Remote AppStore";

diff --git a/XBMC Remote/Kodi Remote-Prefix.pch b/XBMC Remote/Kodi Remote-Prefix.pch
@@ -1,4 +1,6 @@
 #import "ConvenienceMacros.h"
 
-@import UIKit;
-@import Foundation;
+#ifdef __OBJC__
+#include <UIKit/UIKit.h>
+#include <Foundation/Foundation.h>
+#endif
diff --git a/XBMC Remote/SettingsValuesViewController.m b/XBMC Remote/SettingsValuesViewController.m
@@ -15,6 +15,7 @@
 #import "StackScrollViewController.h"
 #import "Utilities.h"
 #import "UIBarButtonItem+Extensions.h"
+#import "fmt_convert.h"
 
 #define SETTINGS_CELL_LABEL 1
 #define SETTINGS_CELL_DESCRIPTION 2
@@ -371,43 +372,37 @@ - (void)setSettingValue:(id)value sender:(id)sender {
 
 #pragma mark - Helper
 
-- (NSString*)getFormatString:(NSString*)format {
-    // Default format does not provide any units
-    NSString *defaultFormat = settingValueType == SettingValueTypeNumber ? @"%.2f" : @"%i";
-
-    // Identify fmt-like format string
+- (BOOL)fmtLikeFormat:(NSString*)format {
     NSInteger openBraceLoc = [format rangeOfString:@"{"].location;
     NSInteger closeBraceLoc = [format rangeOfString:@"}" options:NSBackwardsSearch].location;
     if (format.length && openBraceLoc != NSNotFound && closeBraceLoc != NSNotFound && openBraceLoc < closeBraceLoc) {
-        // Gather range for unit which is added after last "}"
-        NSRange range;
-        range.location = closeBraceLoc + 1;
-        range.length = format.length - range.location;
-
-        // Extract unit and make percent character is formatted correctly
-        NSString *unit = [format substringWithRange:range];
-        unit = [unit stringByReplacingOccurrencesOfString:@"%" withString:@"%%"];
-
-        // Build std format string, appending the fmt format string's unit
-        format = [defaultFormat stringByAppendingString:unit];
-    }
-    // Fallback to default in case no format is defined or we missed to identify fmt-style format (which is used for Kodi 18 and later)
-    else if (!format.length || AppDelegate.instance.serverVersion >= 18) {
-        format = defaultFormat;
+        return YES;
     }
-    return format;
+    return NO;
 }
 
 - (NSString*)getStringForSliderItem:(id)item value:(float)value {
-    NSString *format = [self getFormatString:item[@"formatlabel"]];
+    NSString *defaultFormat = settingValueType == SettingValueTypeNumber ? @"%.2f" : @"%i";
+    NSString *format = item[@"formatlabel"] ?: defaultFormat;
+    BOOL fmtLike = [self fmtLikeFormat:format];
     NSString *stringResult;
     switch (settingValueType) {
         case SettingValueTypeNumber:
-            stringResult = [NSString stringWithFormat:format, value];
+            if (fmtLike) {
+                stringResult = [NSString fmtFormatted:format defaultFormat:defaultFormat floatValue:value];
+            }
+            else {
+                stringResult = [NSString stringWithFormat:format, value];
+            }
             break;
         case SettingValueTypeInteger:
         default:
-            stringResult = [NSString stringWithFormat:format, (int)value];
+            if (fmtLike) {
+                stringResult = [NSString fmtFormatted:format defaultFormat:defaultFormat intValue:(int)value];
+            }
+            else {
+                stringResult = [NSString stringWithFormat:format, (int)value];
+            }
             break;
     }
     return stringResult;

diff --git a/XBMC Remote/fmt_convert.h b/XBMC Remote/fmt_convert.h
@@ -0,0 +1,15 @@
+//
+//  fmt_convert.h
+//  Kodi Remote
+//
+//  Created by Buschmann on 14.11.25.
+//  Copyright © 2025 Team Kodi. All rights reserved.
+//
+
+@interface NSString (fmt)
+
++ (NSString*)fmtFormatted:(NSString*)format defaultFormat:(NSString*)defaultFormat intValue:(int)value;
++ (NSString*)fmtFormatted:(NSString*)format defaultFormat:(NSString*)defaultFormat floatValue:(float)value;
+
+@end
+
diff --git a/XBMC Remote/fmt_convert.mm b/XBMC Remote/fmt_convert.mm
@@ -0,0 +1,40 @@
+//
+//  fmt_convert.m
+//  Kodi Remote
+//
+//  Created by Buschmann on 14.11.25.
+//  Copyright © 2025 Team Kodi. All rights reserved.
+//
+
+#import "fmt_convert.h"
+
+#include <fmt/core.h>
+#include <string>
+
+@implementation NSString (fmt)
+
++ (NSString*)fmtFormatted:(NSString*)format defaultFormat:(NSString*)defaultFormat intValue:(int)value {
+    try {
+        const std::string formatted = fmt::format(format.UTF8String, value);
+        // not sure if `length` param should be +1 to account for the terminating 0-character
+        return [[NSString alloc] initWithBytes:formatted.data() length:formatted.size() encoding:NSUTF8StringEncoding];
+    }
+    catch (const std::exception &exc) {
+        NSLog(@"generic format error: %s", exc.what());
+    }
+    return [NSString stringWithFormat:defaultFormat, value];
+}
+
++ (NSString*)fmtFormatted:(NSString*)format defaultFormat:(NSString*)defaultFormat floatValue:(float)value {
+    try {
+        const std::string formatted = fmt::format(format.UTF8String, value);
+        // not sure if `length` param should be +1 to account for the terminating 0-character
+        return [[NSString alloc] initWithBytes:formatted.data() length:formatted.size() encoding:NSUTF8StringEncoding];
+    }
+    catch (const std::exception &exc) {
+        NSLog(@"generic format error: %s", exc.what());
+    }
+    return [NSString stringWithFormat:defaultFormat, value];
+}
+
+@end