Skip to content

Commit b983463

Browse files
XITRIXXITRIX
committed
Initial iOS 26 support
1 parent 45d6849 commit b983463

9 files changed

Lines changed: 131 additions & 104 deletions

File tree

‎Submodules/MVVMFoundation‎

‎iTorrent.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
7C519C882C427E9A00E353A9 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 7C519C872C427E9A00E353A9 /* FirebaseAnalytics */; };
3232
7C519C8C2C427F4C00E353A9 /* FirebaseRemoteConfigSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 7C519C8B2C427F4C00E353A9 /* FirebaseRemoteConfigSwift */; };
3333
7C5FBE0F2BBB227D0069E5A0 /* UISegmentedProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C5FBE0E2BBB227D0069E5A0 /* UISegmentedProgressView.swift */; };
34-
7C5FBE122BBB63C80069E5A0 /* MarqueeLabel in Frameworks */ = {isa = PBXBuildFile; productRef = 7C5FBE112BBB63C80069E5A0 /* MarqueeLabel */; };
3534
7C5FBE192BBC91E70069E5A0 /* NetworkMonitoringService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C5FBE182BBC91E70069E5A0 /* NetworkMonitoringService.swift */; };
3635
7C5FBE232BBDD1B60069E5A0 /* NSUserDefaultItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C5FBE222BBDD1B60069E5A0 /* NSUserDefaultItem.swift */; };
3736
7C5FBE282BBDD4030069E5A0 /* PRColorPickerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C5FBE252BBDD4030069E5A0 /* PRColorPickerCell.swift */; };
@@ -79,6 +78,7 @@
7978
7CBDBAAE2C31EF52008C986B /* UserDefaults+AppGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CBDBAAC2C31EF0C008C986B /* UserDefaults+AppGroup.swift */; };
8079
7CC411622BD319AE00CA8B13 /* AppDelegate+RemoteConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CC411612BD319AE00CA8B13 /* AppDelegate+RemoteConfig.swift */; };
8180
7CC411642BD326C300CA8B13 /* AppDelegate+Firebase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CC411632BD326C300CA8B13 /* AppDelegate+Firebase.swift */; };
81+
7CC634772E09ED88007E3EED /* UILabel+Marquee.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CC634762E09ED83007E3EED /* UILabel+Marquee.swift */; };
8282
7CDC7BBE2C516ADD00B51EFB /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 7CDC7BBD2C516ADD00B51EFB /* FirebaseCrashlytics */; };
8383
7CE25BA72C24A848007B2FD7 /* CircularAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CE25BA62C24A848007B2FD7 /* CircularAnimation.swift */; };
8484
7CF6DA332C0F112B0033D03F /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = 7CF6DA322C0F112B0033D03F /* OpenSSL */; };
@@ -328,6 +328,7 @@
328328
7CBDBAAC2C31EF0C008C986B /* UserDefaults+AppGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserDefaults+AppGroup.swift"; sourceTree = "<group>"; };
329329
7CC411612BD319AE00CA8B13 /* AppDelegate+RemoteConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+RemoteConfig.swift"; sourceTree = "<group>"; };
330330
7CC411632BD326C300CA8B13 /* AppDelegate+Firebase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Firebase.swift"; sourceTree = "<group>"; };
331+
7CC634762E09ED83007E3EED /* UILabel+Marquee.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+Marquee.swift"; sourceTree = "<group>"; };
331332
7CE25BA62C24A848007B2FD7 /* CircularAnimation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircularAnimation.swift; sourceTree = "<group>"; };
332333
7CF6DA342C0F3DB90033D03F /* BCHostingConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BCHostingConfiguration.swift; sourceTree = "<group>"; };
333334
7CF6DA362C0F6D150033D03F /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = "<group>"; };
@@ -492,7 +493,6 @@
492493
D1A226F42AEF01B700669D6D /* LibTorrent.framework in Frameworks */,
493494
7CF6DA332C0F112B0033D03F /* OpenSSL in Frameworks */,
494495
7C4ED08B2BE642A50034B62C /* AppTrackingTransparency.framework in Frameworks */,
495-
7C5FBE122BBB63C80069E5A0 /* MarqueeLabel in Frameworks */,
496496
7C519C882C427E9A00E353A9 /* FirebaseAnalytics in Frameworks */,
497497
7CF9C2C72AF7F235009BBFA0 /* MvvmFoundation in Frameworks */,
498498
D1DB71832BD80318007F9267 /* GCDWebServers in Frameworks */,
@@ -671,6 +671,7 @@
671671
7C95B7B52C385B8E000EC50F /* UIKit */ = {
672672
isa = PBXGroup;
673673
children = (
674+
7CC634762E09ED83007E3EED /* UILabel+Marquee.swift */,
674675
7CB831182D194840005F3F42 /* UIApplication+KeySceneWindow.swift */,
675676
7CB58D852CE6AC6F00929205 /* NavigationItemPalette */,
676677
D173D9DF2BC0285800E4F9EB /* UIMenu */,
@@ -1485,7 +1486,6 @@
14851486
D135C58B2AEF158000440680 /* CombineCocoa */,
14861487
D1ACFDD92AF7D55F0098FF56 /* MvvmFoundation */,
14871488
7CF9C2C62AF7F235009BBFA0 /* MvvmFoundation */,
1488-
7C5FBE112BBB63C80069E5A0 /* MarqueeLabel */,
14891489
7CAD30182BC3455800592990 /* SWXMLHash */,
14901490
D1DB71822BD80318007F9267 /* GCDWebServers */,
14911491
7CF6DA322C0F112B0033D03F /* OpenSSL */,
@@ -1531,7 +1531,6 @@
15311531
packageReferences = (
15321532
7CF9C2B72AF7EF54009BBFA0 /* XCRemoteSwiftPackageReference "CombineCocoa" */,
15331533
7CF9C2C52AF7F235009BBFA0 /* XCLocalSwiftPackageReference "Submodules/MVVMFoundation" */,
1534-
7C5FBE102BBB63C80069E5A0 /* XCRemoteSwiftPackageReference "MarqueeLabel" */,
15351534
7CAD30172BC3455800592990 /* XCRemoteSwiftPackageReference "SWXMLHash" */,
15361535
D1DB71812BD80318007F9267 /* XCLocalSwiftPackageReference "Submodules/GCDWebServer" */,
15371536
7CF6DA312C0F112A0033D03F /* XCRemoteSwiftPackageReference "OpenSSL" */,
@@ -1730,6 +1729,7 @@
17301729
D1352D3C2BBD7F8800104E7B /* TorrentMonitoringService.swift in Sources */,
17311730
D1B538592AF1172000694AFD /* TorrentDetailProgressCellViewModel.swift in Sources */,
17321731
7C4ED0892BE6423D0034B62C /* MetaAdsManager.swift in Sources */,
1732+
7CC634772E09ED88007E3EED /* UILabel+Marquee.swift in Sources */,
17331733
7CFEBEAD2BC88F4C0013233F /* AppDelegate+BackgroundRefresh.swift in Sources */,
17341734
D1DB71912BD92238007F9267 /* PatreonPreferencesViewController.swift in Sources */,
17351735
D135C5992AEFB96100440680 /* TorrentDetailsViewController.swift in Sources */,
@@ -1843,10 +1843,8 @@
18431843
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
18441844
CODE_SIGN_ENTITLEMENTS = ProgressWidget/ProgressWidgetExtension.entitlements;
18451845
CODE_SIGN_IDENTITY = "Apple Development";
1846-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1847-
CODE_SIGN_STYLE = Manual;
1848-
DEVELOPMENT_TEAM = "";
1849-
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = D59DHVRS87;
1846+
CODE_SIGN_STYLE = Automatic;
1847+
DEVELOPMENT_TEAM = D59DHVRS87;
18501848
GENERATE_INFOPLIST_FILE = YES;
18511849
INFOPLIST_FILE = ProgressWidget/Info.plist;
18521850
INFOPLIST_KEY_CFBundleDisplayName = ProgressWidget;
@@ -1860,7 +1858,6 @@
18601858
PRODUCT_BUNDLE_IDENTIFIER = "$(APPLICATION_ID).ProgressWidget";
18611859
PRODUCT_NAME = "$(TARGET_NAME)";
18621860
PROVISIONING_PROFILE_SPECIFIER = "";
1863-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "iTorrent2 ProgressWidget Dev";
18641861
SKIP_INSTALL = YES;
18651862
SUPPORTS_MACCATALYST = YES;
18661863
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$inherited XCODE16";
@@ -1958,11 +1955,8 @@
19581955
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
19591956
CODE_SIGN_ENTITLEMENTS = iTorrent/Core/Assets/iTorrent.entitlements;
19601957
CODE_SIGN_IDENTITY = "Apple Development";
1961-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1962-
CODE_SIGN_STYLE = Manual;
1963-
DEVELOPMENT_TEAM = "";
1964-
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = D59DHVRS87;
1965-
"DEVELOPMENT_TEAM[sdk=xros*]" = D59DHVRS87;
1958+
CODE_SIGN_STYLE = Automatic;
1959+
DEVELOPMENT_TEAM = D59DHVRS87;
19661960
GENERATE_INFOPLIST_FILE = YES;
19671961
INFOPLIST_FILE = iTorrent/Core/Assets/Info.plist;
19681962
INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
@@ -1982,8 +1976,6 @@
19821976
PRODUCT_BUNDLE_IDENTIFIER = "$(APPLICATION_ID)";
19831977
PRODUCT_NAME = "$(TARGET_NAME)";
19841978
PROVISIONING_PROFILE_SPECIFIER = "";
1985-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "iTorrent2 Dev";
1986-
"PROVISIONING_PROFILE_SPECIFIER[sdk=xros*]" = "iTorrent2 Dev";
19871979
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
19881980
SUPPORTS_MACCATALYST = YES;
19891981
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -2001,10 +1993,8 @@
20011993
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
20021994
CODE_SIGN_ENTITLEMENTS = ProgressWidget/ProgressWidgetExtension.entitlements;
20031995
CODE_SIGN_IDENTITY = "Apple Development";
2004-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
2005-
CODE_SIGN_STYLE = Manual;
2006-
DEVELOPMENT_TEAM = "";
2007-
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = D59DHVRS87;
1996+
CODE_SIGN_STYLE = Automatic;
1997+
DEVELOPMENT_TEAM = D59DHVRS87;
20081998
GENERATE_INFOPLIST_FILE = YES;
20091999
INFOPLIST_FILE = ProgressWidget/Info.plist;
20102000
INFOPLIST_KEY_CFBundleDisplayName = ProgressWidget;
@@ -2018,7 +2008,6 @@
20182008
PRODUCT_BUNDLE_IDENTIFIER = "$(APPLICATION_ID).ProgressWidget";
20192009
PRODUCT_NAME = "$(TARGET_NAME)";
20202010
PROVISIONING_PROFILE_SPECIFIER = "";
2021-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "iTorrent2 ProgressWidget Dev";
20222011
SKIP_INSTALL = YES;
20232012
SUPPORTS_MACCATALYST = YES;
20242013
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$inherited XCODE16";
@@ -2154,10 +2143,8 @@
21542143
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
21552144
CODE_SIGN_ENTITLEMENTS = ProgressWidget/ProgressWidgetExtension.entitlements;
21562145
CODE_SIGN_IDENTITY = "Apple Development";
2157-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
2158-
CODE_SIGN_STYLE = Manual;
2159-
DEVELOPMENT_TEAM = "";
2160-
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = D59DHVRS87;
2146+
CODE_SIGN_STYLE = Automatic;
2147+
DEVELOPMENT_TEAM = D59DHVRS87;
21612148
GENERATE_INFOPLIST_FILE = YES;
21622149
INFOPLIST_FILE = ProgressWidget/Info.plist;
21632150
INFOPLIST_KEY_CFBundleDisplayName = ProgressWidget;
@@ -2171,7 +2158,6 @@
21712158
PRODUCT_BUNDLE_IDENTIFIER = "$(APPLICATION_ID).ProgressWidget";
21722159
PRODUCT_NAME = "$(TARGET_NAME)";
21732160
PROVISIONING_PROFILE_SPECIFIER = "";
2174-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "iTorrent2 ProgressWidget Distrib";
21752161
SKIP_INSTALL = YES;
21762162
SUPPORTS_MACCATALYST = YES;
21772163
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$inherited XCODE16";
@@ -2269,11 +2255,8 @@
22692255
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
22702256
CODE_SIGN_ENTITLEMENTS = iTorrent/Core/Assets/iTorrent.entitlements;
22712257
CODE_SIGN_IDENTITY = "Apple Development";
2272-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
2273-
CODE_SIGN_STYLE = Manual;
2274-
DEVELOPMENT_TEAM = "";
2275-
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = D59DHVRS87;
2276-
"DEVELOPMENT_TEAM[sdk=xros*]" = D59DHVRS87;
2258+
CODE_SIGN_STYLE = Automatic;
2259+
DEVELOPMENT_TEAM = D59DHVRS87;
22772260
GENERATE_INFOPLIST_FILE = YES;
22782261
INFOPLIST_FILE = iTorrent/Core/Assets/Info.plist;
22792262
INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
@@ -2293,8 +2276,6 @@
22932276
PRODUCT_BUNDLE_IDENTIFIER = "$(APPLICATION_ID)";
22942277
PRODUCT_NAME = "$(TARGET_NAME)";
22952278
PROVISIONING_PROFILE_SPECIFIER = "";
2296-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "iTorrent2 Dev";
2297-
"PROVISIONING_PROFILE_SPECIFIER[sdk=xros*]" = "iTorrent2 Dev";
22982279
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
22992280
SUPPORTS_MACCATALYST = YES;
23002281
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -2368,14 +2349,6 @@
23682349
minimumVersion = 10.29.0;
23692350
};
23702351
};
2371-
7C5FBE102BBB63C80069E5A0 /* XCRemoteSwiftPackageReference "MarqueeLabel" */ = {
2372-
isa = XCRemoteSwiftPackageReference;
2373-
repositoryURL = "https://github.com/cbpowell/MarqueeLabel.git";
2374-
requirement = {
2375-
kind = upToNextMajorVersion;
2376-
minimumVersion = 4.5.0;
2377-
};
2378-
};
23792352
7CAD30172BC3455800592990 /* XCRemoteSwiftPackageReference "SWXMLHash" */ = {
23802353
isa = XCRemoteSwiftPackageReference;
23812354
repositoryURL = "https://github.com/drmohundro/SWXMLHash.git";
@@ -2418,11 +2391,6 @@
24182391
package = 7C519C862C427E9A00E353A9 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
24192392
productName = FirebaseRemoteConfigSwift;
24202393
};
2421-
7C5FBE112BBB63C80069E5A0 /* MarqueeLabel */ = {
2422-
isa = XCSwiftPackageProductDependency;
2423-
package = 7C5FBE102BBB63C80069E5A0 /* XCRemoteSwiftPackageReference "MarqueeLabel" */;
2424-
productName = MarqueeLabel;
2425-
};
24262394
7CAD30182BC3455800592990 /* SWXMLHash */ = {
24272395
isa = XCSwiftPackageProductDependency;
24282396
package = 7CAD30172BC3455800592990 /* XCRemoteSwiftPackageReference "SWXMLHash" */;

‎iTorrent.xcodeproj/xcshareddata/xcschemes/iTorrent.xcscheme‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
</BuildableProductRunnable>
5353
<AdditionalOptions>
5454
<AdditionalOption
55-
key = "MallocStackLogging"
55+
key = "PrefersMallocStackLoggingLite"
5656
value = ""
5757
isEnabled = "YES">
5858
</AdditionalOption>
5959
<AdditionalOption
60-
key = "PrefersMallocStackLoggingLite"
60+
key = "MallocStackLogging"
6161
value = ""
6262
isEnabled = "YES">
6363
</AdditionalOption>

‎iTorrent.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 1 addition & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎iTorrent/Base/BaseViewController.swift‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
// Created by Daniil Vinogradov on 29/10/2023.
66
//
77

8-
import MarqueeLabel
98
import MvvmFoundation
109
import UIKit
1110

@@ -45,16 +44,16 @@ class BaseViewController<ViewModel: MvvmViewModelProtocol>: SAViewController<Vie
4544
navigationController?.setToolbarHidden(isToolbarItemsHidden, animated: false)
4645
}
4746

48-
private let titleLabel: MarqueeLabel = {
49-
let titleLabel = MarqueeLabel()
47+
private let titleLabel: UILabel = {
48+
let titleLabel = UILabel()
5049
#if !os(visionOS)
5150
titleLabel.font = .preferredFont(forTextStyle: .headline)
5251
#else
5352
titleLabel.font = .preferredFont(forTextStyle: .title1)
5453
#endif
55-
titleLabel.fadeLength = 16
5654
titleLabel.adjustsFontForContentSizeCategory = true
5755
titleLabel.textAlignment = .center
56+
titleLabel.enableMarquee()
5857
return titleLabel
5958
}()
6059
}
@@ -101,16 +100,16 @@ class BaseHostingViewController<View: MvvmSwiftUIViewProtocol>: SAHostingViewCon
101100
}
102101
}
103102

104-
private let titleLabel: MarqueeLabel = {
105-
let titleLabel = MarqueeLabel()
103+
private let titleLabel: UILabel = {
104+
let titleLabel = UILabel()
106105
#if !os(visionOS)
107106
titleLabel.font = .preferredFont(forTextStyle: .headline)
108107
#else
109108
titleLabel.font = .preferredFont(forTextStyle: .title1)
110109
#endif
111-
titleLabel.fadeLength = 16
112110
titleLabel.adjustsFontForContentSizeCategory = true
113111
titleLabel.textAlignment = .center
112+
titleLabel.enableMarquee()
114113
return titleLabel
115114
}()
116115
}

0 commit comments

Comments
 (0)