Skip to content

Commit c20bbad

Browse files
RudyBRudyB
committed
Make Detail Torrent View Swipeable
1 parent 9235df5 commit c20bbad

File tree

4 files changed

+69
-42
lines changed

4 files changed

+69
-42
lines changed

‎Deluge Remote.xcodeproj/project.pbxproj

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
477D7ADB21D3299300F78CE1 /* ClientConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 477D7ADA21D3299300F78CE1 /* ClientConfig.swift */; };
4646
477D7B3221D3EFE000F78CE1 /* ClientManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 477D7B3121D3EFE000F78CE1 /* ClientManager.swift */; };
4747
477D7B3621D605C200F78CE1 /* SessionStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 477D7B3521D605C200F78CE1 /* SessionStatus.swift */; };
48+
478B6F3A2645AA0B00A6CE7B /* SwipeableTabBarController in Frameworks */ = {isa = PBXBuildFile; productRef = 478B6F392645AA0B00A6CE7B /* SwipeableTabBarController */; };
4849
47A3018D24954EF100AC5EED /* FileManagerHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47A3018C24954EF100AC5EED /* FileManagerHelper.swift */; };
4950
47A4EEAC1E07913500568D33 /* ClientsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47A4EEAB1E07913500568D33 /* ClientsTableViewController.swift */; };
5051
47A716B221DEB7E200C7650C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 47A716B121DEB7E200C7650C /* [email protected] */; };
@@ -153,6 +154,7 @@
153154
47E68797259088AA008C2969 /* Houston in Frameworks */,
154155
473CB8BD2595C9B700A4B3EF /* NotificationBannerSwift in Frameworks */,
155156
47E685DF25907925008C2969 /* PromiseKit in Frameworks */,
157+
478B6F3A2645AA0B00A6CE7B /* SwipeableTabBarController in Frameworks */,
156158
47E685EB259079D0008C2969 /* IQKeyboardManagerSwift in Frameworks */,
157159
47E685CF25907874008C2969 /* Alamofire in Frameworks */,
158160
47E685E7259079B5008C2969 /* MBProgressHUD in Frameworks */,
@@ -402,6 +404,7 @@
402404
470F5CFD2594A0E700B7155D /* FirebaseCrashlytics */,
403405
470F5D012594A14600B7155D /* FirebaseAnalytics */,
404406
473CB8BC2595C9B700A4B3EF /* NotificationBannerSwift */,
407+
478B6F392645AA0B00A6CE7B /* SwipeableTabBarController */,
405408
);
406409
productName = "Deluge Remote";
407410
productReference = 4716022E1DD4305800727CBD /* Deluge Remote.app */;
@@ -452,6 +455,7 @@
452455
47C801252592D09100A01831 /* XCRemoteSwiftPackageReference "ActiveLabel.swift" */,
453456
470F5CFC2594A0E700B7155D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
454457
473CB8BB2595C9B700A4B3EF /* XCRemoteSwiftPackageReference "NotificationBanner" */,
458+
478B6F382645AA0B00A6CE7B /* XCRemoteSwiftPackageReference "SwipeableTabBarController" */,
455459
);
456460
productRefGroup = 4716022F1DD4305800727CBD /* Products */;
457461
projectDirPath = "";
@@ -724,7 +728,7 @@
724728
"@executable_path/Frameworks",
725729
);
726730
LIBRARY_SEARCH_PATHS = "";
727-
MARKETING_VERSION = 1.5.7;
731+
MARKETING_VERSION = 1.5.8;
728732
OTHER_LDFLAGS = "-ObjC";
729733
PRODUCT_BUNDLE_IDENTIFIER = "io.rudybermudez.Deluge-Remote";
730734
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -756,7 +760,7 @@
756760
"@executable_path/Frameworks",
757761
);
758762
LIBRARY_SEARCH_PATHS = "";
759-
MARKETING_VERSION = 1.5.7;
763+
MARKETING_VERSION = 1.5.8;
760764
OTHER_LDFLAGS = "-ObjC";
761765
PRODUCT_BUNDLE_IDENTIFIER = "io.rudybermudez.Deluge-Remote";
762766
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -807,6 +811,14 @@
807811
minimumVersion = 3.0.6;
808812
};
809813
};
814+
478B6F382645AA0B00A6CE7B /* XCRemoteSwiftPackageReference "SwipeableTabBarController" */ = {
815+
isa = XCRemoteSwiftPackageReference;
816+
repositoryURL = "[email protected]:marcosgriselli/SwipeableTabBarController.git";
817+
requirement = {
818+
branch = master;
819+
kind = branch;
820+
};
821+
};
810822
47C8011A259280F000A01831 /* XCRemoteSwiftPackageReference "expandable-collection-view-kit" */ = {
811823
isa = XCRemoteSwiftPackageReference;
812824
repositoryURL = "https://github.com/RudyB/expandable-collection-view-kit.git";
@@ -897,6 +909,11 @@
897909
package = 473CB8BB2595C9B700A4B3EF /* XCRemoteSwiftPackageReference "NotificationBanner" */;
898910
productName = NotificationBannerSwift;
899911
};
912+
478B6F392645AA0B00A6CE7B /* SwipeableTabBarController */ = {
913+
isa = XCSwiftPackageProductDependency;
914+
package = 478B6F382645AA0B00A6CE7B /* XCRemoteSwiftPackageReference "SwipeableTabBarController" */;
915+
productName = SwipeableTabBarController;
916+
};
900917
47C8011B259280F000A01831 /* ExpandableCollectionViewKit */ = {
901918
isa = XCSwiftPackageProductDependency;
902919
package = 47C8011A259280F000A01831 /* XCRemoteSwiftPackageReference "expandable-collection-view-kit" */;

‎Deluge Remote.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Deluge Remote/Sources/View Controllers/AcknowledgementsTableViewController.swift

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -44,39 +44,45 @@ fileprivate class MainSection: TableViewSection {
4444

4545
init() {
4646
super.init()
47-
cells.append(MenuCell(label: "Alamofire", icon: UIImage(named: "menu/github")) {
48-
UIApplication.shared.open(URL(string: "https://github.com/Alamofire/Alamofire")!)
49-
})
50-
cells.append(MenuCell(label: "ActiveLabel", icon: UIImage(named: "menu/github")){
51-
UIApplication.shared.open(URL(string: "https://github.com/optonaut/ActiveLabel.swift")!)
52-
})
53-
cells.append(MenuCell(label: "BarMagnet", icon: UIImage(named: "menu/github")){
54-
UIApplication.shared.open(URL(string: "https://github.com/Qata/BarMagnet")!)
55-
})
56-
cells.append(MenuCell(label: "Eureka", icon: UIImage(named: "menu/github")){
57-
UIApplication.shared.open(URL(string: "https://github.com/xmartlabs/Eureka")!)
58-
})
59-
cells.append(MenuCell(label: "ExpandableCollectionViewKit", icon: UIImage(named: "menu/github")){
60-
UIApplication.shared.open(URL(string: "https://github.com/jVirus/expandable-collection-view-kit")!)
61-
})
62-
cells.append(MenuCell(label: "Houston", icon: UIImage(named: "menu/github")){
63-
UIApplication.shared.open(URL(string: "https://github.com/RudyB/Houston")!)
64-
})
65-
cells.append(MenuCell(label: "IQKeyboardManager", icon: UIImage(named: "menu/github")){
66-
UIApplication.shared.open(URL(string: "https://github.com/hackiftekhar/IQKeyboardManager")!)
67-
})
68-
cells.append(MenuCell(label: "MBProgressHUD", icon: UIImage(named: "menu/github")){
69-
UIApplication.shared.open(URL(string: "https://github.com/jdg/MBProgressHUD")!)
70-
})
71-
cells.append(MenuCell(label: "NotificationBanner", icon: UIImage(named: "menu/github")){
72-
UIApplication.shared.open(URL(string: "https://github.com/Daltron/NotificationBanner")!)
73-
})
74-
cells.append(MenuCell(label: "PromiseKit", icon: UIImage(named: "menu/github")){
75-
UIApplication.shared.open(URL(string: "https://github.com/mxcl/PromiseKit")!)
76-
})
77-
cells.append(MenuCell(label: "Valet", icon: UIImage(named: "menu/github")){
78-
UIApplication.shared.open(URL(string: "https://github.com/square/Valet")!)
79-
})
47+
48+
cells = [
49+
MenuCell(label: "Alamofire", icon: UIImage(named: "menu/github"))
50+
{ UIApplication.shared.open(URL(string: "https://github.com/Alamofire/Alamofire")!)},
51+
52+
MenuCell(label: "ActiveLabel", icon: UIImage(named: "menu/github"))
53+
{ UIApplication.shared.open(URL(string: "https://github.com/optonaut/ActiveLabel.swift")!)},
54+
55+
MenuCell(label: "BarMagnet", icon: UIImage(named: "menu/github"))
56+
{ UIApplication.shared.open(URL(string: "https://github.com/Qata/BarMagnet")!)},
57+
58+
MenuCell(label: "Eureka", icon: UIImage(named: "menu/github"))
59+
{ UIApplication.shared.open(URL(string: "https://github.com/xmartlabs/Eureka")!)},
60+
61+
MenuCell(label: "ExpandableCollectionViewKit", icon: UIImage(named: "menu/github"))
62+
{ UIApplication.shared.open(URL(string: "https://github.com/jVirus/expandable-collection-view-kit")!)},
63+
64+
MenuCell(label: "Houston", icon: UIImage(named: "menu/github"))
65+
{ UIApplication.shared.open(URL(string: "https://github.com/RudyB/Houston")!)},
66+
67+
MenuCell(label: "IQKeyboardManager", icon: UIImage(named: "menu/github"))
68+
{ UIApplication.shared.open(URL(string: "https://github.com/hackiftekhar/IQKeyboardManager")!)},
69+
70+
MenuCell(label: "MBProgressHUD", icon: UIImage(named: "menu/github"))
71+
{ UIApplication.shared.open(URL(string: "https://github.com/jdg/MBProgressHUD")!)},
72+
73+
MenuCell(label: "NotificationBanner", icon: UIImage(named: "menu/github"))
74+
{ UIApplication.shared.open(URL(string: "https://github.com/Daltron/NotificationBanner")!)},
75+
76+
MenuCell(label: "PromiseKit", icon: UIImage(named: "menu/github"))
77+
{ UIApplication.shared.open(URL(string: "https://github.com/mxcl/PromiseKit")!)},
78+
79+
MenuCell(label: "SwipeableTabBarController", icon: UIImage(named: "menu/github"))
80+
{ UIApplication.shared.open(URL(string: "https://github.com/marcosgriselli/SwipeableTabBarController")!)},
81+
82+
MenuCell(label: "Valet", icon: UIImage(named: "menu/github"))
83+
{ UIApplication.shared.open(URL(string: "https://github.com/square/Valet")!)}
84+
85+
].sorted {$0.label < $1.label}
8086
}
8187

8288
override func didSelectRow(in tableView: UITableView, at indexPath: IndexPath) {

‎Deluge Remote/Sources/View Controllers/TorrentDetailViewTabController.swift

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
import UIKit
1010
import Houston
1111
import NotificationBannerSwift
12+
import SwipeableTabBarController
1213

1314
protocol TorrentDetailViewDelegate: AnyObject
1415
{
1516
func removeTorrent(with hash: String, removeData: Bool, onCompletion: ((_ onServerComplete: Result<Void, Error>, _ onClientComplete: @escaping ()->())->())?)
1617
}
1718

18-
class TorrentDetailViewTabController: UITabBarController, Storyboarded {
19+
class TorrentDetailViewTabController: SwipeableTabBarController, Storyboarded {
1920

2021
// MARK: - Lazy Computed Properties
2122
lazy fileprivate var infoVC: TorrentInfoTableViewController = {
@@ -140,10 +141,4 @@ class TorrentDetailViewTabController: UITabBarController, Storyboarded {
140141
}
141142
}
142143
}
143-
144-
}
145-
146-
// MARK: - UITabBarControllerDelegate
147-
extension TorrentDetailViewTabController: UITabBarControllerDelegate {
148-
149144
}

0 commit comments

Comments
 (0)