Skip to content

Commit 8a71352

Browse files
XITRIXXITRIX
committed
Version changed, update logs added
1 parent 4420ba9 commit 8a71352

File tree

11 files changed

+52
-27
lines changed

11 files changed

+52
-27
lines changed

‎README.md‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
1+
<img align="left" width="100" height="100" src="https://user-images.githubusercontent.com/9553519/80646366-3d271680-8a75-11ea-8b60-9c5edd4ffd60.png">
2+
13
# iTorrent - iOS Torrent client App
24

35
![](https://img.shields.io/badge/iOS-9.3+-blue.svg)
46
![](https://app.bitrise.io/app/26ce0756a727335c/status.svg?token=BLhjBICoPvmOtO1nzIVMYQ&branch=master)
57

68
## Screenshots
9+
<details>
10+
<summary>iPhone Screenshots</summary>
11+
12+
![iPhone screenshots](https://user-images.githubusercontent.com/9553519/80644526-7316cb80-8a72-11ea-95b5-e63531d81f35.png)
13+
14+
</details>
15+
<details>
16+
<summary>iPad Screenshots</summary>
17+
18+
![iPad screenshots](https://user-images.githubusercontent.com/9553519/80646848-27feb780-8a76-11ea-8c91-f76d25c0b862.png)
719

8-
![itorrent](https://user-images.githubusercontent.com/9553519/42249216-da6f6190-7f32-11e8-9126-e559be69ebf5.png)
20+
</details>
921

1022
## Download
1123

@@ -27,7 +39,7 @@ What can this app do:
2739
- Download torrent by link
2840
- Download torrent by magnet
2941
- Send notification on torrent downloaded
30-
- FTP Server (unstable)
42+
- WebDav Server
3143
- Select files to download or not
3244
- Change UI to dark theme
3345
- ???
@@ -58,16 +70,12 @@ This repo contains iTorrent framework which was compiled only for real devices s
5870

5971
- [LibTorrent](https://github.com/arvidn/libtorrent)
6072
- [BackgroundTask](https://github.com/yarodevuci/backgroundTask)
61-
- [Orianne-FTP-Server (My fork)](https://github.com/XITRIX/Orianne-FTP-Server)
6273
- [MarqueeLabel](https://github.com/cbpowell/MarqueeLabel)
6374

6475
## Donate for donuts
6576

66-
- [PayPal](https://paypal.me/xitrix)
6777
- [Patreon](https://www.patreon.com/xitrix)
68-
- [Liberapay](https://liberapay.com/XITRIX)
69-
- [Ko-fi](https://ko-fi.com/xitrix)
70-
- [QIWI Moneybox](https://qiwi.me/c5ec30ff-21d6-428b-9a10-29a1d18242db)
78+
- [PayPal](https://paypal.me/xitrix)
7179
- VISA CARD - 4817 7601 3631 7520
7280

7381
## Important information

‎iTorrent.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
7C7D0ABE20D98923001B08E5 /* FolderCellActionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D0ABD20D98923001B08E5 /* FolderCellActionDelegate.swift */; };
6565
7C80257520A9B17C00673A4F /* TorrentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C80257420A9B17C00673A4F /* TorrentCell.swift */; };
6666
7C802CFF212B3B630031C19F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7C802D01212B3B630031C19F /* Localizable.strings */; };
67-
7C802D07212C6D060031C19F /* Dialogs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C802D06212C6D060031C19F /* Dialogs.swift */; };
67+
7C802D07212C6D060031C19F /* Dialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C802D06212C6D060031C19F /* Dialog.swift */; };
6868
7C80F74524334AC2005C4050 /* FileCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C80F74324334AC2005C4050 /* FileCell.swift */; };
6969
7C80F74624334AC2005C4050 /* FileCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7C80F74424334AC2005C4050 /* FileCell.xib */; };
7070
7C80F748243356B9005C4050 /* AddTorrentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C80F747243356B9005C4050 /* AddTorrentController.swift */; };
@@ -215,7 +215,7 @@
215215
7C802CFB212B328D0031C19F /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Main.strings; sourceTree = "<group>"; };
216216
7C802D02212B3B860031C19F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
217217
7C802D03212B3D240031C19F /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
218-
7C802D06212C6D060031C19F /* Dialogs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dialogs.swift; sourceTree = "<group>"; };
218+
7C802D06212C6D060031C19F /* Dialog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dialog.swift; sourceTree = "<group>"; };
219219
7C80F74324334AC2005C4050 /* FileCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileCell.swift; sourceTree = "<group>"; };
220220
7C80F74424334AC2005C4050 /* FileCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FileCell.xib; sourceTree = "<group>"; };
221221
7C80F747243356B9005C4050 /* AddTorrentController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddTorrentController.swift; sourceTree = "<group>"; };
@@ -662,7 +662,7 @@
662662
7CB8083120AADA8300F76931 /* Utils.swift */,
663663
7CF522E520AE1F5000D319E6 /* SortingManager.swift */,
664664
7CF522E720AEF3DB00D319E6 /* FileInfo.swift */,
665-
7C802D06212C6D060031C19F /* Dialogs.swift */,
665+
7C802D06212C6D060031C19F /* Dialog.swift */,
666666
7CBB17DE2324FE650043A9F6 /* CircularAnimation.swift */,
667667
7CC7662623F93F690072338B /* NotificationHelper.swift */,
668668
7CE61CB22426D0370038717C /* MemorySpaceManager.swift */,
@@ -961,7 +961,7 @@
961961
7CCD02D3243B849600B1669F /* TorrentListController+EditMode.swift in Sources */,
962962
7CF75F20244B42EE00F5C089 /* Tier.swift in Sources */,
963963
7C26E344243263C80012D455 /* TrackerModel.swift in Sources */,
964-
7C802D07212C6D060031C19F /* Dialogs.swift in Sources */,
964+
7C802D07212C6D060031C19F /* Dialog.swift in Sources */,
965965
7CB8083B20AB008700F76931 /* SwitchCell.swift in Sources */,
966966
7CE1604B235B970B00E3F1D9 /* StaticTableView.swift in Sources */,
967967
7CBD074A244CFACA00F0BCC8 /* PatronNameCell.swift in Sources */,
@@ -1173,7 +1173,7 @@
11731173
CODE_SIGN_IDENTITY = "iPhone Developer";
11741174
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
11751175
CODE_SIGN_STYLE = Manual;
1176-
CURRENT_PROJECT_VERSION = 16.0;
1176+
CURRENT_PROJECT_VERSION = 17.0;
11771177
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
11781178
DEVELOPMENT_TEAM = D5UQ7XT49T;
11791179
ENABLE_BITCODE = NO;
@@ -1201,7 +1201,7 @@
12011201
"$(inherited)",
12021202
"$(PROJECT_DIR)",
12031203
);
1204-
MARKETING_VERSION = 1.7.5;
1204+
MARKETING_VERSION = 1.8;
12051205
ONLY_ACTIVE_ARCH = YES;
12061206
OTHER_CFLAGS = "";
12071207
OTHER_LDFLAGS = "$(inherited)";
@@ -1230,7 +1230,7 @@
12301230
CODE_SIGN_IDENTITY = "iPhone Developer";
12311231
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
12321232
CODE_SIGN_STYLE = Manual;
1233-
CURRENT_PROJECT_VERSION = 16.0;
1233+
CURRENT_PROJECT_VERSION = 17.0;
12341234
DEVELOPMENT_TEAM = D5UQ7XT49T;
12351235
ENABLE_BITCODE = NO;
12361236
FRAMEWORK_SEARCH_PATHS = (
@@ -1257,7 +1257,7 @@
12571257
"$(inherited)",
12581258
"$(PROJECT_DIR)",
12591259
);
1260-
MARKETING_VERSION = 1.7.5;
1260+
MARKETING_VERSION = 1.8;
12611261
OTHER_CFLAGS = "";
12621262
OTHER_LDFLAGS = "$(inherited)";
12631263
PRODUCT_BUNDLE_IDENTIFIER = ru.nonamedude.iTorrent;

‎iTorrent/System/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
9999
}
100100
UIApplication.shared.applicationIconBadgeNumber = 0
101101
BackgroundTask.stopBackgroundTask()
102-
resume_to_app()
102+
TorrentSdk.resumeToApp()
103103
AppDelegate.backgrounded = false
104104
}
105105

‎iTorrent/Utils/Dialogs.swift‎ renamed to ‎iTorrent/Utils/Dialog.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import Foundation
1010
import UIKit
1111

12-
class Dialogs {
12+
class Dialog {
1313
static func withTimer(_ presenter: UIViewController,title: String?, message: String?) {
1414
let alert = ThemedUIAlertController(title:title, message: message, preferredStyle: .alert)
1515
presenter.present(alert, animated: true, completion: nil)
@@ -20,7 +20,7 @@ class Dialogs {
2020
}
2121
}
2222

23-
static func crateUpdateDialog(forced: Bool = false, finishAction: (() -> ())? = nil) -> ThemedUIAlertController? {
23+
static func createUpdateLogs(forced: Bool = false, finishAction: (() -> ())? = nil) -> ThemedUIAlertController? {
2424
let localUrl = Bundle.main.url(forResource: "Version", withExtension: "ver")
2525
if let localVersion = try? String(contentsOf: localUrl!) {
2626
if !UserPreferences.versionNews || forced {
@@ -38,7 +38,7 @@ class Dialogs {
3838
return nil
3939
}
4040

41-
static func createNewsDialog() -> ThemedUIAlertController? {
41+
static func createNewsAlert() -> ThemedUIAlertController? {
4242
if #available(iOS 13, *) {
4343
let code = "1"
4444
if !UserPreferences.alertDialog(code: code).value {

‎iTorrent/Version.ver‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7.5
1+
1.8

‎iTorrent/ViewControllers/Preferences/Patreon/PatreonViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class PatreonViewController: ThemedUIViewController {
7474
@objc func iconTapRecognizer() {
7575
if let account = UserPreferences.patreonAccount {
7676
UIPasteboard.general.string = account.identifier
77-
Dialogs.withTimer(self, title: nil, message: Localize.get("Settings.Patreon.CopiedID"))
77+
Dialog.withTimer(self, title: nil, message: Localize.get("Settings.Patreon.CopiedID"))
7878
}
7979
}
8080

‎iTorrent/ViewControllers/Preferences/PreferencesController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class PreferencesController: StaticTableViewController {
204204
Utils.openUrl("https://github.com/XITRIX/iTorrent")
205205
})
206206
updates.append(UpdateInfoCell.Model {
207-
self.present(Dialogs.crateUpdateDialog(forced: true)!, animated: true)
207+
self.present(Dialog.createUpdateLogs(forced: true)!, animated: true)
208208
})
209209
let version = try? String(contentsOf: Bundle.main.url(forResource: "Version", withExtension: "ver")!)
210210
data.append(Section(rowModels: updates, header: "Settings.UpdateHeader", footer: NSLocalizedString("Current app version: ", comment: "") + (version ?? "Unknown")))
@@ -226,7 +226,7 @@ class PreferencesController: StaticTableViewController {
226226

227227
DispatchQueue.main.async {
228228
UIPasteboard.general.string = card
229-
Dialogs.withTimer(self, title: nil, message: Localize.get("Copied CC # to clipboard!"))
229+
Dialog.withTimer(self, title: nil, message: Localize.get("Copied CC # to clipboard!"))
230230
}
231231
}
232232
}

‎iTorrent/ViewControllers/TorrentListController/TorrentListController.swift‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,18 @@ class TorrentListController: ThemedUIViewController {
3333
tableviewPlaceholderText.text = Localize.get("MainController.Table.Placeholder.Text")
3434
}
3535

36+
func showUpdateLog() {
37+
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 2) {
38+
if let updateDialog = Dialog.createUpdateLogs(finishAction: {
39+
if let newsDialog = Dialog.createNewsAlert() {
40+
self.present(newsDialog, animated: true)
41+
}
42+
}) {
43+
self.present(updateDialog, animated: true)
44+
}
45+
}
46+
}
47+
3648
override func themeUpdate() {
3749
super.themeUpdate()
3850

@@ -51,6 +63,7 @@ class TorrentListController: ThemedUIViewController {
5163
initializeAds()
5264
initializeSearchView()
5365
initializeEditMode()
66+
showUpdateLog()
5467
}
5568

5669
override func viewWillAppear(_ animated: Bool) {

‎iTorrent/ViewControllers/TrackersListController.swift‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ class TrackersListController: ThemedUIViewController {
3434
tableView.endUpdates()
3535
}
3636

37-
diff.updates.reloads.forEach { (tableView.cellForRow(at: $0) as! TrackerCell).setModel(tracker: new.value[$0.row].value) }
37+
diff.updates.reloads.forEach { indexPath in
38+
if let cell = tableView.cellForRow(at: indexPath) as? TrackerCell {
39+
cell.setModel(tracker: new.value[indexPath.row].value)
40+
}
41+
}
3842
}
3943

4044
override func themeUpdate() {
@@ -73,7 +77,7 @@ class TrackersListController: ThemedUIViewController {
7377
let touchPoint = longPressGestureRecognizer.location(in: tableView)
7478
if let index = tableView.indexPathForRow(at: touchPoint) {
7579
UIPasteboard.general.string = trackers.value[index.row].value.url
76-
Dialogs.withTimer(self, title: nil, message: Localize.get("Tracker URL copied to clipboard!"))
80+
Dialog.withTimer(self, title: nil, message: Localize.get("Tracker URL copied to clipboard!"))
7781
}
7882
}
7983
}

‎iTorrent/en.lproj/Localizable.strings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,4 @@
239239

240240
//Version Info
241241
"info" = " Update info";
242-
"UpdateText" = "- Most of the application was rewritten from scratch, no more memory leaks\n- Significantly improved stability of the app\n- allocate memory for loading in advance to avoid problems while downloading\n- UI improvements, noticeable and not so\n- Added integration with Patreon";
242+
"UpdateText" = "- Most of the application was rewritten from scratch, no more memory leaks\n- Significantly improved stability of the app\n- Memory management implemented\n- Memory allocation for files before downloading\n- Libtorrent updated to 1.2.6\n- UI improvements, noticeable and not so much\n- Added integration with Patreon";

0 commit comments

Comments
 (0)