Skip to content

Commit

Permalink
Release 1.3
Browse files Browse the repository at this point in the history 
Added folders sorting in files view controllers
Added ability to change sections order on main screen
Fixed memory drain of TorrentFilesController
More minor bugs fixed
  • Loading branch information
@XITRIX
XITRIX committed Jun 19, 2018
1 parent a382da2 commit e620e63
Show file tree
Hide file tree
Showing 28 changed files with 803 additions and 224 deletions.
Binary file modified iTorrent.framework/iTorrent
View file
Binary file not shown.
42 changes: 24 additions & 18 deletions iTorrent.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
7C06249920BD676F00C7466C /* iTorrent.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C06249620BD676500C7466C /* iTorrent.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
7C27A16820B0B9040065238C /* Version.ver in Resources */ = {isa = PBXBuildFile; fileRef = 7C27A16720B0B9040065238C /* Version.ver */; };
7C27A1A420B223630065238C /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7C27A1A320B223630065238C /* GoogleService-Info.plist */; };
7C3C693320A754FB0023396C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C3C693220A754FB0023396C /* AppDelegate.swift */; };
7C3C693820A754FB0023396C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7C3C693620A754FB0023396C /* Main.storyboard */; };
7C3C693A20A754FD0023396C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7C3C693920A754FD0023396C /* Assets.xcassets */; };
7C3C693D20A754FD0023396C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7C3C693B20A754FD0023396C /* LaunchScreen.storyboard */; };
Expand All @@ -21,8 +20,13 @@
7C3E842120AB6BB400577282 /* FileCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C3E842020AB6BB400577282 /* FileCell.swift */; };
7C4FADE620B5D4CC00ED9C84 /* Pods_iTorrent.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65A3AF14FD004AAD8A489528 /* Pods_iTorrent.framework */; };
7C7D0AB220D82AA0001B08E5 /* FolderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D0AB120D82AA0001B08E5 /* FolderCell.swift */; };
7C7D0AB420D8EA2C001B08E5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D0AB320D8EA2C001B08E5 /* AppDelegate.swift */; };
7C7D0AB620D8EA50001B08E5 /* Manager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D0AB520D8EA50001B08E5 /* Manager.swift */; };
7C7D0AB820D8EA5B001B08E5 /* ManagerStateChangedDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D0AB720D8EA5B001B08E5 /* ManagerStateChangedDelegate.swift */; };
7C7D0ABA20D911EB001B08E5 /* SettingsSortingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D0AB920D911EB001B08E5 /* SettingsSortingController.swift */; };
7C7D0ABC20D97B3A001B08E5 /* FileCellActionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D0ABB20D97B3A001B08E5 /* FileCellActionDelegate.swift */; };
7C7D0ABE20D98923001B08E5 /* FolderCellActionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D0ABD20D98923001B08E5 /* FolderCellActionDelegate.swift */; };
7C80257520A9B17C00673A4F /* TorrentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C80257420A9B17C00673A4F /* TorrentCell.swift */; };
7CB8082920AA26DD00F76931 /* Manager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CB8082820AA26DD00F76931 /* Manager.swift */; };
7CB8082B20AA28F200F76931 /* TorrentStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CB8082A20AA28F200F76931 /* TorrentStatus.swift */; };
7CB8083220AADA8300F76931 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CB8083120AADA8300F76931 /* Utils.swift */; };
7CB8083520AAF09F00F76931 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CB8083420AAF09F00F76931 /* Downloader.swift */; };
Expand All @@ -37,7 +41,6 @@
7CF5F59220AC325100A18C3E /* TorrentFilesController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CF5F59120AC325100A18C3E /* TorrentFilesController.swift */; };
7CF5F59420AC86F600A18C3E /* MainController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CF5F59320AC86F500A18C3E /* MainController.swift */; };
7CF5F59620AC870400A18C3E /* ManagersUpdatedDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CF5F59520AC870300A18C3E /* ManagersUpdatedDelegate.swift */; };
7CF5F59820AC871A00A18C3E /* ManagerStateChangedDelegade.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CF5F59720AC871A00A18C3E /* ManagerStateChangedDelegade.swift */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand All @@ -61,7 +64,6 @@
7C27A16720B0B9040065238C /* Version.ver */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Version.ver; sourceTree = "<group>"; };
7C27A1A320B223630065238C /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
7C3C692F20A754FB0023396C /* iTorrent.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iTorrent.app; sourceTree = BUILT_PRODUCTS_DIR; };
7C3C693220A754FB0023396C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7C3C693720A754FB0023396C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
7C3C693920A754FD0023396C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
7C3C693C20A754FD0023396C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
Expand All @@ -71,8 +73,13 @@
7C3E841E20AB695800577282 /* AddTorrentController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddTorrentController.swift; sourceTree = "<group>"; };
7C3E842020AB6BB400577282 /* FileCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileCell.swift; sourceTree = "<group>"; };
7C7D0AB120D82AA0001B08E5 /* FolderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FolderCell.swift; sourceTree = "<group>"; };
7C7D0AB320D8EA2C001B08E5 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7C7D0AB520D8EA50001B08E5 /* Manager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Manager.swift; sourceTree = "<group>"; };
7C7D0AB720D8EA5B001B08E5 /* ManagerStateChangedDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManagerStateChangedDelegate.swift; sourceTree = "<group>"; };
7C7D0AB920D911EB001B08E5 /* SettingsSortingController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsSortingController.swift; sourceTree = "<group>"; };
7C7D0ABB20D97B3A001B08E5 /* FileCellActionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileCellActionDelegate.swift; sourceTree = "<group>"; };
7C7D0ABD20D98923001B08E5 /* FolderCellActionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FolderCellActionDelegate.swift; sourceTree = "<group>"; };
7C80257420A9B17C00673A4F /* TorrentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TorrentCell.swift; sourceTree = "<group>"; };
7CB8082820AA26DD00F76931 /* Manager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Manager.swift; path = iTorrent/Manager.swift; sourceTree = SOURCE_ROOT; };
7CB8082A20AA28F200F76931 /* TorrentStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TorrentStatus.swift; sourceTree = "<group>"; };
7CB8083120AADA8300F76931 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
7CB8083420AAF09F00F76931 /* Downloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Downloader.swift; sourceTree = "<group>"; };
Expand All @@ -87,7 +94,6 @@
7CF5F59120AC325100A18C3E /* TorrentFilesController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TorrentFilesController.swift; sourceTree = "<group>"; };
7CF5F59320AC86F500A18C3E /* MainController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainController.swift; sourceTree = "<group>"; };
7CF5F59520AC870300A18C3E /* ManagersUpdatedDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManagersUpdatedDelegate.swift; sourceTree = "<group>"; };
7CF5F59720AC871A00A18C3E /* ManagerStateChangedDelegade.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManagerStateChangedDelegade.swift; sourceTree = "<group>"; };
F5512C13E413E5718899B92C /* Pods-iTorrent.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iTorrent.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iTorrent/Pods-iTorrent.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -140,7 +146,6 @@
7CB8082E20AA380400F76931 /* Delegates */,
7CB8082720AA26CE00F76931 /* System */,
7C80257320A9B15300673A4F /* Cells */,
7C3C693220A754FB0023396C /* AppDelegate.swift */,
7C3C693620A754FB0023396C /* Main.storyboard */,
7C3C693920A754FD0023396C /* Assets.xcassets */,
7C3C693B20A754FD0023396C /* LaunchScreen.storyboard */,
Expand Down Expand Up @@ -173,7 +178,8 @@
7CB8082720AA26CE00F76931 /* System */ = {
isa = PBXGroup;
children = (
7CB8082820AA26DD00F76931 /* Manager.swift */,
7C7D0AB520D8EA50001B08E5 /* Manager.swift */,
7C7D0AB320D8EA2C001B08E5 /* AppDelegate.swift */,
7CB8083420AAF09F00F76931 /* Downloader.swift */,
7CF522EB20AF78B100D319E6 /* BackgroundTask.swift */,
);
Expand All @@ -183,8 +189,10 @@
7CB8082E20AA380400F76931 /* Delegates */ = {
isa = PBXGroup;
children = (
7CF5F59720AC871A00A18C3E /* ManagerStateChangedDelegade.swift */,
7C7D0AB720D8EA5B001B08E5 /* ManagerStateChangedDelegate.swift */,
7CF5F59520AC870300A18C3E /* ManagersUpdatedDelegate.swift */,
7C7D0ABB20D97B3A001B08E5 /* FileCellActionDelegate.swift */,
7C7D0ABD20D98923001B08E5 /* FolderCellActionDelegate.swift */,
);
path = Delegates;
sourceTree = "<group>";
Expand All @@ -197,6 +205,7 @@
7C3E841C20AB10FE00577282 /* SettingsController.swift */,
7C3E841E20AB695800577282 /* AddTorrentController.swift */,
7CF5F59120AC325100A18C3E /* TorrentFilesController.swift */,
7C7D0AB920D911EB001B08E5 /* SettingsSortingController.swift */,
);
path = ViewControllers;
sourceTree = "<group>";
Expand Down Expand Up @@ -313,19 +322,13 @@
"${SRCROOT}/Pods/Target Support Files/Pods-iTorrent/Pods-iTorrent-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
"${BUILT_PRODUCTS_DIR}/MDFInternationalization/MDFInternationalization.framework",
"${BUILT_PRODUCTS_DIR}/MDFTextAccessibility/MDFTextAccessibility.framework",
"${BUILT_PRODUCTS_DIR}/MaterialComponents/MaterialComponents.framework",
"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MDFInternationalization.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MDFTextAccessibility.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MaterialComponents.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
);
Expand Down Expand Up @@ -374,6 +377,8 @@
files = (
7C3E842120AB6BB400577282 /* FileCell.swift in Sources */,
7CF5F59420AC86F600A18C3E /* MainController.swift in Sources */,
7C7D0ABE20D98923001B08E5 /* FolderCellActionDelegate.swift in Sources */,
7C7D0ABC20D97B3A001B08E5 /* FileCellActionDelegate.swift in Sources */,
7CB8083220AADA8300F76931 /* Utils.swift in Sources */,
7C80257520A9B17C00673A4F /* TorrentCell.swift in Sources */,
7CB8083720AAFFD200F76931 /* TorrentDetailsController.swift in Sources */,
Expand All @@ -382,18 +387,19 @@
7CF5F59620AC870400A18C3E /* ManagersUpdatedDelegate.swift in Sources */,
7CB8082B20AA28F200F76931 /* TorrentStatus.swift in Sources */,
7CF522E620AE1F5000D319E6 /* SortingManager.swift in Sources */,
7CF5F59820AC871A00A18C3E /* ManagerStateChangedDelegade.swift in Sources */,
7C3C693320A754FB0023396C /* AppDelegate.swift in Sources */,
7CF522E820AEF3DB00D319E6 /* FileInfo.swift in Sources */,
7C7D0AB220D82AA0001B08E5 /* FolderCell.swift in Sources */,
7CF522E320AE05F200D319E6 /* UserManagerSettings.swift in Sources */,
7C7D0AB820D8EA5B001B08E5 /* ManagerStateChangedDelegate.swift in Sources */,
7CB8083B20AB008700F76931 /* SwitchCell.swift in Sources */,
7CB8082920AA26DD00F76931 /* Manager.swift in Sources */,
7C3E841D20AB10FE00577282 /* SettingsController.swift in Sources */,
7C3E841F20AB695800577282 /* AddTorrentController.swift in Sources */,
7C7D0ABA20D911EB001B08E5 /* SettingsSortingController.swift in Sources */,
7C7D0AB620D8EA50001B08E5 /* Manager.swift in Sources */,
7C3E841B20AB054C00577282 /* DetailCell.swift in Sources */,
7CB8083520AAF09F00F76931 /* Downloader.swift in Sources */,
7CF5F59220AC325100A18C3E /* TorrentFilesController.swift in Sources */,
7C7D0AB420D8EA2C001B08E5 /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file modified iTorrent.xcworkspace/xcuserdata/xitrix.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
23 changes: 23 additions & 0 deletions iTorrent/Assets.xcassets/More2.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "more_25.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "more_50.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "more_75.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added iTorrent/Assets.xcassets/More2.imageset/more_25.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added iTorrent/Assets.xcassets/More2.imageset/more_50.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added iTorrent/Assets.xcassets/More2.imageset/more_75.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e620e63

Please sign in to comment.