Improved Alerts actions readability

XITRIX · XITRIX · commit 33c92c7f04af · 2025-11-25T16:07:23.000+01:00
diff --git a/Submodules/LibTorrent-Swift b/Submodules/LibTorrent-Swift
@@ -1 +1 @@
-Subproject commit b22f2a386d86fbb31a5f60af62153e9ce77390a5
+Subproject commit 3aed8a0c8c9ee84133bd6b046cc77f3e8d594c6f
diff --git a/Submodules/MVVMFoundation b/Submodules/MVVMFoundation
@@ -1 +1 @@
-Subproject commit f19068f2c01d2883fde3f7a52419199f6be18e71
+Subproject commit 3d38b43e1ecd41e352e52dc69532658b1cf60b9e
diff --git a/iTorrent.xcodeproj/project.pbxproj b/iTorrent.xcodeproj/project.pbxproj
@@ -82,6 +82,7 @@
 		7CCDB3342ED3469B001E857B /* cacert.pem in Resources */ = {isa = PBXBuildFile; fileRef = 7CCDB3322ED34680001E857B /* cacert.pem */; };
 		7CCDB3372ED5B4B6001E857B /* UIImage+IOSRelatedIcons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CCDB3362ED5B4A8001E857B /* UIImage+IOSRelatedIcons.swift */; };
 		7CCDB3392ED5DF56001E857B /* DocumentPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CCDB3382ED5DF55001E857B /* DocumentPickerViewController.swift */; };
+		7CCDB33B2ED5F4B4001E857B /* UIAlertController+PrimaryAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CCDB33A2ED5F4AC001E857B /* UIAlertController+PrimaryAction.swift */; };
 		7CDC7BBE2C516ADD00B51EFB /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 7CDC7BBD2C516ADD00B51EFB /* FirebaseCrashlytics */; };
 		7CE25BA72C24A848007B2FD7 /* CircularAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CE25BA62C24A848007B2FD7 /* CircularAnimation.swift */; };
 		7CF6DA332C0F112B0033D03F /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = 7CF6DA322C0F112B0033D03F /* OpenSSL */; };
@@ -335,6 +336,7 @@
 		7CCDB3322ED34680001E857B /* cacert.pem */ = {isa = PBXFileReference; lastKnownFileType = text; path = cacert.pem; sourceTree = "<group>"; };
 		7CCDB3362ED5B4A8001E857B /* UIImage+IOSRelatedIcons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+IOSRelatedIcons.swift"; sourceTree = "<group>"; };
 		7CCDB3382ED5DF55001E857B /* DocumentPickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentPickerViewController.swift; sourceTree = "<group>"; };
+		7CCDB33A2ED5F4AC001E857B /* UIAlertController+PrimaryAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+PrimaryAction.swift"; sourceTree = "<group>"; };
 		7CE25BA62C24A848007B2FD7 /* CircularAnimation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircularAnimation.swift; sourceTree = "<group>"; };
 		7CF6DA342C0F3DB90033D03F /* BCHostingConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BCHostingConfiguration.swift; sourceTree = "<group>"; };
 		7CF6DA362C0F6D150033D03F /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = "<group>"; };
@@ -677,6 +679,7 @@
 		7C95B7B52C385B8E000EC50F /* UIKit */ = {
 			isa = PBXGroup;
 			children = (
+				7CCDB33A2ED5F4AC001E857B /* UIAlertController+PrimaryAction.swift */,
 				7CCDB3382ED5DF55001E857B /* DocumentPickerViewController.swift */,
 				7CC634762E09ED83007E3EED /* UILabel+Marquee.swift */,
 				7CB831182D194840005F3F42 /* UIApplication+KeySceneWindow.swift */,
@@ -1818,6 +1821,7 @@
 				D1B99D942BEE631B00F51514 /* Tier.swift in Sources */,
 				D1A226A02AEEEFCC00669D6D /* SceneDelegate.swift in Sources */,
 				D11BE5442AFB901E00780C1B /* PRSwitchView.swift in Sources */,
+				7CCDB33B2ED5F4B4001E857B /* UIAlertController+PrimaryAction.swift in Sources */,
 				D173D9E32BC0327D00E4F9EB /* BackgroundService.swift in Sources */,
 				7CB58D842CE662BB00929205 /* TagsView.swift in Sources */,
 				D1352D382BBD73CD00104E7B /* ColoredProgressBarView.swift in Sources */,
diff --git a/iTorrent/Screens/Preferences/InitialSetup/CellularToggle/CellularToggleSetupViewModel.swift b/iTorrent/Screens/Preferences/InitialSetup/CellularToggle/CellularToggleSetupViewModel.swift
@@ -26,7 +26,7 @@ class CellularToggleSetupViewModel: BaseViewModelWith<CellularToggleSetupViewMod
 
     func allowCellularAction() {
         alert(title: %"initialSetup.cellular.allowCheck.title", style: .actionSheet, actions: [
-            .init(title: %"common.cancel", style: .cancel),
+            .init(title: %"common.cancel", style: .cancel, isPrimary: true),
             .init(title: %"initialSetup.cellular.allowCheck.confirm", style: .destructive, action: { [unowned self] in
                 PreferencesStorage.shared.isCellularEnabled = true
                 completion()
diff --git a/iTorrent/Screens/Preferences/Patreon/PatreonPreferencesViewModel.swift b/iTorrent/Screens/Preferences/Patreon/PatreonPreferencesViewModel.swift
@@ -87,7 +87,7 @@ extension PatreonPreferencesViewModel {
             }
         } else {
             alert(title: %"patreon.action.unlink.title",style: .actionSheet, actions: [
-                .init(title: %"common.cancel", style: .cancel),
+                .init(title: %"common.cancel", style: .cancel, isPrimary: true),
                 .init(title: %"patreon.action.unlink.button", style: .destructive) { [unowned self] in
                     try? patreonService.signOut()
                     accountState.value = .none
diff --git a/iTorrent/Screens/Preferences/Storage/StoragePreferencesView.swift b/iTorrent/Screens/Preferences/Storage/StoragePreferencesView.swift
@@ -121,7 +121,7 @@ struct StoragePreferencesView<VM: StoragePreferencesViewModel>: MvvmSwiftUIViewP
                     }.swipeActions {
                         Button {
                             viewModel.alert(title: %"preferences.storage.remove.title", message: %"preferences.storage.remove.message", actions: [
-                                .init(title: %"common.cancel", style: .cancel),
+                                .init(title: %"common.cancel", style: .cancel, isPrimary: true),
                                 .init(title: %"common.remove", style: .destructive, action: {
                                     withAnimation {
                                         viewModel.preferences.storageScopes[scope.uuid] = nil
@@ -153,7 +153,7 @@ struct StoragePreferencesView<VM: StoragePreferencesViewModel>: MvvmSwiftUIViewP
 
             guard url.isDirectory else {
                 return viewModel.alert(title: %"common.error", message: %"preferences.storage.add.error.notDirectory", actions: [
-                    .init(title: %"common.close", style: .cancel)
+                    .init(title: %"common.close", style: .cancel, isPrimary: true)
                 ])
             }
 
diff --git a/iTorrent/Screens/Preferences/TrackersList/TrackersListPreferencesView.swift b/iTorrent/Screens/Preferences/TrackersList/TrackersListPreferencesView.swift
@@ -42,7 +42,7 @@ class TrackersListPreferencesViewModel: BaseViewModel, ObservableObject, @unchec
 
             Task {
                 guard !self.trackersListService.trackerSources.value.keys.contains(where: { $0 == .remote(url) }) else {
-                    self.alert(title: %"preferences.trackers.exists.title", actions: [.init(title: %"common.ok", style: .cancel)])
+                    self.alert(title: %"preferences.trackers.exists.title", actions: [.init(title: %"common.ok", style: .cancel, isPrimary: true)])
                     return
                 }
                 try await self.trackersListService.addTrackersSource(url, title: results[0])
@@ -102,7 +102,7 @@ struct TrackersListPreferencesView<VM: TrackersListPreferencesViewModel>: MvvmSw
                         .swipeActions {
                             Button {
                                 viewModel.alert(title: %"preferences.trackers.remove.title", message: %"preferences.trackers.remove.message", actions: [
-                                    .init(title: %"common.cancel", style: .cancel),
+                                    .init(title: %"common.cancel", style: .cancel, isPrimary: true),
                                     .init(title: %"common.remove", style: .destructive, action: {
                                         withAnimation {
                                             viewModel.trackersListService.trackerSources.value[state.source] = nil
diff --git a/iTorrent/Screens/Rss/List/RssListViewModel.swift b/iTorrent/Screens/Rss/List/RssListViewModel.swift
@@ -42,7 +42,7 @@ extension RssListViewModel {
         }
 
         alert(title: %"rsslist.remove.title", message: %"rsslist.remove.message", actions: [
-            .init(title: %"common.cancel", style: .cancel),
+            .init(title: %"common.cancel", style: .cancel, isPrimary: true),
             .init(title: %"common.delete", style: .destructive, action: { [rssProvider] in
                 rssProvider.removeFeeds(items)
             })
diff --git a/iTorrent/Screens/TorrentAdd/TorrentAddViewModel.swift b/iTorrent/Screens/TorrentAdd/TorrentAddViewModel.swift
@@ -173,7 +173,7 @@ extension TorrentAddViewModel {
         else { return false }
 
         let alert = UIAlertController(title: %"addTorrent.exists", message: %"addTorrent.\(torrentFile.infoHashes.best.hex)_exists", preferredStyle: .alert)
-        alert.addAction(.init(title: %"common.close", style: .cancel))
+        alert.addAction(.init(title: %"common.close", style: .cancel), isPrimary: true)
         navigationContext.present(alert, animated: true)
         return true
     }
diff --git a/iTorrent/Screens/TorrentDetails/TorrentDetailsViewModel.swift b/iTorrent/Screens/TorrentDetails/TorrentDetailsViewModel.swift
@@ -153,7 +153,7 @@ extension TorrentDetailsViewModel {
 
         alert(title: %"details.rehash.title", message: %"details.rehash.message", actions: [
             .init(title: %"common.cancel", style: .cancel),
-            .init(title: %"details.rehash.action", style: .destructive, action: { [unowned self] in
+            .init(title: %"details.rehash.action", style: .destructive, isPrimary: true, action: { [unowned self] in
                 torrentHandle.rehash()
             }),
         ])
@@ -163,11 +163,11 @@ extension TorrentDetailsViewModel {
         guard let storage = torrentHandle.storage else { return }
         alert(title: %"details.refreshStorage.title", message: %"details.refreshStorage.message", actions: [
             .init(title: %"common.cancel", style: .cancel),
-            .init(title: %"common.continue", style: .default, action: { [self] in
+            .init(title: %"common.continue", style: .default, isPrimary: true, action: { [self] in
                 DispatchQueue.global(qos: .userInitiated).async { [self] in
                     guard !torrentService.refreshStorage(storage) else { return }
                     alert(title: %"common.error", message: %"details.refreshStorage.fail.message", actions: [
-                        .init(title: %"common.close", style: .cancel)
+                        .init(title: %"common.close", style: .cancel, isPrimary: true)
                     ])
                 }
             })
@@ -182,7 +182,7 @@ extension TorrentDetailsViewModel {
             .init(title: %"torrent.remove.action.keepData", style: .default, action: { [unowned self] in
                 TorrentService.shared.removeTorrent(by: torrentHandle.snapshot.infoHashes, deleteFiles: false)
             }),
-            .init(title: %"common.cancel", style: .cancel),
+            .init(title: %"common.cancel", style: .cancel, isPrimary: true),
         ])
     }
 
diff --git a/iTorrent/Screens/TorrentList/Cells/TorrentListItemViewModel.swift b/iTorrent/Screens/TorrentList/Cells/TorrentListItemViewModel.swift
@@ -49,7 +49,7 @@ class TorrentListItemViewModel: BaseViewModelWith<TorrentHandle>, MvvmSelectable
             .init(title: %"torrent.remove.action.keepData", style: .default, action: { [unowned self] in
                 TorrentService.shared.removeTorrent(by: torrentHandle.snapshot.infoHashes, deleteFiles: false)
             }),
-            .init(title: %"common.cancel", style: .cancel)
+            .init(title: %"common.cancel", style: .cancel, isPrimary: true)
         ])
     }
 }
diff --git a/iTorrent/Screens/TorrentList/TorrentListViewController.swift b/iTorrent/Screens/TorrentList/TorrentListViewController.swift
@@ -382,20 +382,20 @@ private extension TorrentListViewController {
                   let magnet = MagnetURI(with: url)
             else {
                 let alert = UIAlertController(title: %"common.error", message: %"list.add.magnet.error", preferredStyle: .alert)
-                alert.addAction(.init(title: %"common.close", style: .cancel))
+                alert.addAction(.init(title: %"common.close", style: .cancel), isPrimary: true)
                 present(alert, animated: true)
                 return
             }
 
             guard !TorrentService.shared.checkTorrentExists(with: magnet.infoHashes) else {
                 let alert = UIAlertController(title: %"addTorrent.exists", message: %"addTorrent.\(magnet.infoHashes.best.hex)_exists", preferredStyle: .alert)
-                alert.addAction(.init(title: %"common.close", style: .cancel))
+                alert.addAction(.init(title: %"common.close", style: .cancel), isPrimary: true)
                 present(alert, animated: true)
                 return
             }
 
             TorrentService.shared.addTorrent(by: magnet)
-        })
+        }, isPrimary: true)
         return alert
     }
 
@@ -421,7 +421,7 @@ private extension TorrentListViewController {
 
                 TorrentAddViewModel.present(with: torrentFile, from: self)
             }
-        })
+        }, isPrimary: true)
         return alert
     }
 
diff --git a/iTorrent/Screens/TorrentList/TorrentListViewModel.swift b/iTorrent/Screens/TorrentList/TorrentListViewModel.swift
@@ -150,7 +150,7 @@ extension TorrentListViewModel {
 
         alert(title: %"details.rehash.title", message: %"details.rehash.message", actions: [
             .init(title: %"common.cancel", style: .cancel),
-            .init(title: %"details.rehash.action", style: .destructive, action: {
+            .init(title: %"details.rehash.action", style: .destructive, isPrimary: true, action: {
                 torrentModels.forEach { $0.torrentHandle.rehash() }
             })
         ])
@@ -171,7 +171,7 @@ extension TorrentListViewModel {
                     TorrentService.shared.removeTorrent(by: torrentModel.torrentHandle.snapshot.infoHashes, deleteFiles: false)
                 }
             }),
-            .init(title: %"common.cancel", style: .cancel)
+            .init(title: %"common.cancel", style: .cancel, isPrimary: true)
         ])
     }
 
@@ -183,7 +183,7 @@ extension TorrentListViewModel {
             .init(title: %"torrent.remove.action.keepData", style: .default, action: {
                 TorrentService.shared.removeTorrent(by: torrentHandle.snapshot.infoHashes, deleteFiles: false)
             }),
-            .init(title: %"common.cancel", style: .cancel)
+            .init(title: %"common.cancel", style: .cancel, isPrimary: true)
         ])
     }
 
diff --git a/iTorrent/Screens/TorrentTrackers/TorrentTrackersViewModel.swift b/iTorrent/Screens/TorrentTrackers/TorrentTrackersViewModel.swift
@@ -79,7 +79,7 @@ extension TorrentTrackersViewModel {
                 torrentHandle.removeTrackers(urls)
                 reload()
             }),
-            .init(title: %"common.cancel", style: .cancel)
+            .init(title: %"common.cancel", style: .cancel, isPrimary: true)
         ])
     }
 
diff --git a/iTorrent/Utils/Extensions/MvvmFoundation/MvvmViewModelProtocol+Alert.swift b/iTorrent/Utils/Extensions/MvvmFoundation/MvvmViewModelProtocol+Alert.swift
@@ -42,7 +42,7 @@ extension MvvmViewModelProtocol {
         }
 
         dialog.addAction(cancel)
-        dialog.addAction(ok)
+        dialog.addAction(ok, isPrimary: true)
 
         DispatchQueue.main.async {
             editTextView.becomeFirstResponder()
diff --git a/iTorrent/Utils/Extensions/UIKit/UIAlertController+PrimaryAction.swift b/iTorrent/Utils/Extensions/UIKit/UIAlertController+PrimaryAction.swift
@@ -0,0 +1,17 @@
+//
+//  UIAlertController+PrimaryAction.swift
+//  iTorrent
+//
+//  Created by Даниил Виноградов on 25.11.2025.
+//
+
+import UIKit
+
+extension UIAlertController {
+    func addAction(_ action: UIAlertAction, isPrimary: Bool) {
+        addAction(action)
+        if isPrimary {
+            self.preferredAction = action
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ extension PatreonPreferencesViewModel {`
`87`	`87`	`}`
`88`	`88`	`} else {`
`89`	`89`	`alert(title: %"patreon.action.unlink.title",style: .actionSheet, actions: [`
`90`		`- .init(title: %"common.cancel", style: .cancel),`
	`90`	`+ .init(title: %"common.cancel", style: .cancel, isPrimary: true),`
`91`	`91`	`.init(title: %"patreon.action.unlink.button", style: .destructive) { [unowned self] in`
`92`	`92`	`try? patreonService.signOut()`
`93`	`93`	`accountState.value = .none`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ extension RssListViewModel {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`alert(title: %"rsslist.remove.title", message: %"rsslist.remove.message", actions: [`
`45`		`- .init(title: %"common.cancel", style: .cancel),`
	`45`	`+ .init(title: %"common.cancel", style: .cancel, isPrimary: true),`
`46`	`46`	`.init(title: %"common.delete", style: .destructive, action: { [rssProvider] in`
`47`	`47`	`rssProvider.removeFeeds(items)`
`48`	`48`	`})`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ extension TorrentAddViewModel {`
`173`	`173`	`else { return false }`
`174`	`174`
`175`	`175`	`let alert = UIAlertController(title: %"addTorrent.exists", message: %"addTorrent.\(torrentFile.infoHashes.best.hex)_exists", preferredStyle: .alert)`
`176`		`- alert.addAction(.init(title: %"common.close", style: .cancel))`
	`176`	`+ alert.addAction(.init(title: %"common.close", style: .cancel), isPrimary: true)`
`177`	`177`	`navigationContext.present(alert, animated: true)`
`178`	`178`	`return true`
`179`	`179`	`}`