diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 34b23e98..00000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 88e76066..8ef4a222 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ iTorrent.xcodeproj/project.xcworkspace/xcuserdata ._.DS_Store **/.DS_Store **/._.DS_Store +.DS_Store diff --git a/Podfile b/Podfile index f3dd6c1c..57e721ec 100644 --- a/Podfile +++ b/Podfile @@ -10,7 +10,7 @@ target 'iTorrent' do pod 'Firebase/Performance' pod 'Fabric', '~> 1.7.7' pod 'Crashlytics', '~> 3.10.2' - pod 'MarqueeLabel/Swift' + pod 'MarqueeLabel' pod 'Google-Mobile-Ads-SDK' end diff --git a/README.md b/README.md index 6e858aa1..57a77d65 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ It is an ordinary torrent client for iOS with Files app support. What can this app do: - Download in the background +- Sequential download (use VLC to watch films while loading) - Add torrent files from Share menu (Safari and other apps) - Add magnet links directly from Safari - Store files in Files app (iOS 11+) @@ -58,7 +59,7 @@ This repo contains iTorrent framework which was compiled only for real devices s ## Donate for donuts -- VISA CARD - 5106 2110 2661 7147 +- VISA CARD - 4817 7602 2222 0562 - [QIWI Moneybox](https://qiwi.me/c5ec30ff-21d6-428b-9a10-29a1d18242db) ## Important information @@ -83,7 +84,7 @@ More information you can find on [Firebase website](https://firebase.google.com) ## License -Copyright (c) 2018 XITRIX (Vinogradov Daniil) +Copyright (c) 2019 XITRIX (Vinogradov Daniil) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/iTorrent.framework/Headers/file_struct.h b/iTorrent.framework/Headers/file_struct.h index 5589dcee..2a24ae0e 100644 --- a/iTorrent.framework/Headers/file_struct.h +++ b/iTorrent.framework/Headers/file_struct.h @@ -9,24 +9,33 @@ #ifndef file_struct_h #define file_struct_h +typedef struct File { + char * _Nonnull file_name; + char * _Nonnull file_path; + long long file_size; + long long file_downloaded; + int file_priority; + long long begin_idx; + long long end_idx; + int num_pieces; + int * _Nonnull pieces; +} File; + typedef struct Files { int error; int size; - char* title; - char** file_name; - char** file_path; - long long* file_size; - long long* file_downloaded; - int* file_priority; + char* _Nonnull title; + File* _Nonnull files; } Files; typedef struct Trackers { int size; - char** tracker_url; - char** messages; - int* seeders; - int* peers; - int* working; - int* verified; + char * _Nonnull * _Nonnull tracker_url; + char * _Nonnull * _Nonnull messages; + int * _Nonnull seeders; + int * _Nonnull peers; + int * _Nonnull leechs; + int * _Nonnull working; + int * _Nonnull verified; } Trackers; #endif /* file_struct_h */ diff --git a/iTorrent.framework/Headers/iTorrent-Bridging-Header.h b/iTorrent.framework/Headers/iTorrent-Bridging-Header.h index 92dce031..d6c6bf24 100644 --- a/iTorrent.framework/Headers/iTorrent-Bridging-Header.h +++ b/iTorrent.framework/Headers/iTorrent-Bridging-Header.h @@ -16,6 +16,7 @@ void remove_torrent(const char* torrent_hash, int remove_files); void save_magnet_to_file(const char* hash); char* get_torrent_file_hash(const char* torrent_path); char* get_magnet_hash(const char* magnet_link); +char* get_torrent_magnet_link(const char* torrent_hash); Files get_files_of_torrent_by_path(const char* torrent_path); Files get_files_of_torrent_by_hash(const char* hash); void set_torrent_files_priority(const char* torrent_hash, int* states); @@ -25,11 +26,16 @@ void save_fast_resume(); void stop_torrent(const char* torrent_hash); void start_torrent(const char* torrent_hash); void rehash_torrent(const char* torrent_hash); +void scrape_tracker(const char* torrent_hash); Trackers get_trackers_by_hash(const char* torrent_hash); int add_tracker_to_torrent(const char* torrent_hash, const char* tracker_url); +int remove_tracker_from_torrent(const char* torrent_hash, char *const tracker_url[], int count); void set_download_limit(int limit_in_bytes); void set_upload_limit(int limit_in_bytes); +void set_torrent_files_sequental(const char* torrent_hash, int sequental); +int get_torrent_files_sequental(const char* torrent_hash); + //FTP void ftp_start(int port, const char* path); void ftp_stop(); diff --git a/iTorrent.framework/Headers/result_struct.h b/iTorrent.framework/Headers/result_struct.h index a90f0ce2..63d78df1 100644 --- a/iTorrent.framework/Headers/result_struct.h +++ b/iTorrent.framework/Headers/result_struct.h @@ -9,29 +9,36 @@ #ifndef result_struct_h #define result_struct_h +typedef struct TorrentInfo { + char * _Nonnull name; + char * _Nonnull state; + char * _Nonnull hash; + char * _Nonnull creator; + char * _Nonnull comment; + float progress; + long long total_wanted; + long long total_wanted_done; + int download_rate; + int upload_rate; + long long total_download; + long long total_upload; + int num_seeds; + int num_peers; + long long total_size; + long long total_done; + time_t creation_date; + int is_paused; + int is_finished; + int is_seed; + int has_metadata; + int sequential_download; + int num_pieces; + int * _Nonnull pieces; +} TorrentInfo; + typedef struct Result { int count; - char * _Nullable * _Nonnull name; - char * _Nullable * _Nonnull state; - char * _Nullable * _Nonnull hash; - char * _Nullable * _Nonnull creator; - char * _Nullable * _Nonnull comment; - float * _Nonnull progress; - long long * _Nonnull total_wanted; - long long * _Nonnull total_wanted_done; - int * _Nonnull download_rate; - int * _Nonnull upload_rate; - long long * _Nonnull total_download; - long long * _Nonnull total_upload; - int * _Nonnull num_seeds; - int * _Nonnull num_peers; - long long * _Nonnull total_size; - long long * _Nonnull total_done; - time_t * _Nonnull creation_date; - int * _Nonnull is_paused; - int * _Nonnull is_finished; - int * _Nonnull is_seed; - int * _Nonnull has_metadata; + TorrentInfo * _Nonnull torrents; } Result; #endif /* result_struct_h */ diff --git a/iTorrent.framework/Info.plist b/iTorrent.framework/Info.plist index 5e80f557..8ba6470a 100644 Binary files a/iTorrent.framework/Info.plist and b/iTorrent.framework/Info.plist differ diff --git a/iTorrent.framework/iTorrent b/iTorrent.framework/iTorrent index dd561957..4300bc1c 100755 Binary files a/iTorrent.framework/iTorrent and b/iTorrent.framework/iTorrent differ diff --git a/iTorrent.xcodeproj/project.pbxproj b/iTorrent.xcodeproj/project.pbxproj index 0fcdb088..36226fd2 100644 --- a/iTorrent.xcodeproj/project.pbxproj +++ b/iTorrent.xcodeproj/project.pbxproj @@ -35,7 +35,9 @@ 7C4B10AF20EA30C500440E74 /* TrackerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4B10AE20EA30C500440E74 /* TrackerCell.swift */; }; 7C4B10B520EAE00C00440E74 /* SeedLimitPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4B10B420EAE00C00440E74 /* SeedLimitPickerView.swift */; }; 7C4B10B720EBF50600440E74 /* SpeedLimitPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4B10B620EBF50500440E74 /* SpeedLimitPickerView.swift */; }; + 7C4DB4E122AD457A00D45494 /* SegmentedProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4DB4E022AD457A00D45494 /* SegmentedProgressView.swift */; }; 7C4FADE620B5D4CC00ED9C84 /* Pods_iTorrent.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65A3AF14FD004AAD8A489528 /* Pods_iTorrent.framework */; }; + 7C5D7684230335A4002E1352 /* FilesBrowserController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C5D7683230335A4002E1352 /* FilesBrowserController.swift */; }; 7C74B8522125BE4700988F1C /* NotificationNamesExtention.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C74B8512125BE4700988F1C /* NotificationNamesExtention.swift */; }; 7C7D0AB220D82AA0001B08E5 /* FolderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D0AB120D82AA0001B08E5 /* FolderCell.swift */; }; 7C7D0AB420D8EA2C001B08E5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D0AB320D8EA2C001B08E5 /* AppDelegate.swift */; }; @@ -46,11 +48,14 @@ 7C80257520A9B17C00673A4F /* TorrentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C80257420A9B17C00673A4F /* TorrentCell.swift */; }; 7C802CFF212B3B630031C19F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7C802D01212B3B630031C19F /* Localizable.strings */; }; 7C802D07212C6D060031C19F /* UpdatesDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C802D06212C6D060031C19F /* UpdatesDialog.swift */; }; + 7CAFB54022DA442C00A4B666 /* ThemedUISplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CAFB53F22DA442C00A4B666 /* ThemedUISplitViewController.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 */; }; 7CB8083720AAFFD200F76931 /* TorrentDetailsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CB8083620AAFFD200F76931 /* TorrentDetailsController.swift */; }; 7CB8083B20AB008700F76931 /* SwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CB8083A20AB008700F76931 /* SwitchCell.swift */; }; + 7CCD494A22A6DC990061FEE5 /* ThemedUINavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CCD494922A6DC990061FEE5 /* ThemedUINavigationController.swift */; }; + 7CCD494C22A85B610061FEE5 /* ThemedUIActivityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CCD494B22A85B610061FEE5 /* ThemedUIActivityViewController.swift */; }; 7CF522E320AE05F200D319E6 /* UserManagerSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CF522E220AE05F200D319E6 /* UserManagerSettings.swift */; }; 7CF522E620AE1F5000D319E6 /* SortingManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CF522E520AE1F5000D319E6 /* SortingManager.swift */; }; 7CF522E820AEF3DB00D319E6 /* FileInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CF522E720AEF3DB00D319E6 /* FileInfo.swift */; }; @@ -107,6 +112,8 @@ 7C4B10AE20EA30C500440E74 /* TrackerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackerCell.swift; sourceTree = ""; }; 7C4B10B420EAE00C00440E74 /* SeedLimitPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedLimitPickerView.swift; sourceTree = ""; }; 7C4B10B620EBF50500440E74 /* SpeedLimitPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpeedLimitPickerView.swift; sourceTree = ""; }; + 7C4DB4E022AD457A00D45494 /* SegmentedProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SegmentedProgressView.swift; sourceTree = ""; }; + 7C5D7683230335A4002E1352 /* FilesBrowserController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilesBrowserController.swift; sourceTree = ""; }; 7C74B8512125BE4700988F1C /* NotificationNamesExtention.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationNamesExtention.swift; sourceTree = ""; }; 7C7D0AB120D82AA0001B08E5 /* FolderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FolderCell.swift; sourceTree = ""; }; 7C7D0AB320D8EA2C001B08E5 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -120,11 +127,14 @@ 7C802D02212B3B860031C19F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; 7C802D03212B3D240031C19F /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = ""; }; 7C802D06212C6D060031C19F /* UpdatesDialog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdatesDialog.swift; sourceTree = ""; }; + 7CAFB53F22DA442C00A4B666 /* ThemedUISplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemedUISplitViewController.swift; sourceTree = ""; }; 7CB8082A20AA28F200F76931 /* TorrentStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TorrentStatus.swift; sourceTree = ""; }; 7CB8083120AADA8300F76931 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = ""; }; 7CB8083420AAF09F00F76931 /* Downloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Downloader.swift; sourceTree = ""; }; 7CB8083620AAFFD200F76931 /* TorrentDetailsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TorrentDetailsController.swift; sourceTree = ""; }; 7CB8083A20AB008700F76931 /* SwitchCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitchCell.swift; sourceTree = ""; }; + 7CCD494922A6DC990061FEE5 /* ThemedUINavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemedUINavigationController.swift; sourceTree = ""; }; + 7CCD494B22A85B610061FEE5 /* ThemedUIActivityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemedUIActivityViewController.swift; sourceTree = ""; }; 7CF522E220AE05F200D319E6 /* UserManagerSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserManagerSettings.swift; sourceTree = ""; }; 7CF522E520AE1F5000D319E6 /* SortingManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortingManager.swift; sourceTree = ""; }; 7CF522E720AEF3DB00D319E6 /* FileInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileInfo.swift; sourceTree = ""; }; @@ -163,6 +173,7 @@ children = ( 7C0D2F1C20F77F7100B7FBC6 /* FileManagerTitleView.xib */, 7C0D2F1E20F77F9B00B7FBC6 /* FileManagerTitleView.swift */, + 7C4DB4E022AD457A00D45494 /* SegmentedProgressView.swift */, ); path = CustomViews; sourceTree = ""; @@ -226,13 +237,16 @@ isa = PBXGroup; children = ( 7C4B109820DFDEEC00440E74 /* ColorPalett.swift */, + 7CCD494922A6DC990061FEE5 /* ThemedUINavigationController.swift */, 7C4B109C20DFF12300440E74 /* ThemedUIViewController.swift */, - 7C4B109E20DFF32B00440E74 /* ThemedUITableView.swift */, 7C4B10A020E0019100440E74 /* ThemedUITableViewController.swift */, + 7C4B109E20DFF32B00440E74 /* ThemedUITableView.swift */, 7C4B10A220E0099300440E74 /* ThemedUILabel.swift */, 7C4B10A420E00CA600440E74 /* ThemedUITableViewCell.swift */, 7C4B10A620E02A4900440E74 /* ThemedUIAlertController.swift */, + 7CCD494B22A85B610061FEE5 /* ThemedUIActivityViewController.swift */, 7C4B10A820E1565100440E74 /* Themed.swift */, + 7CAFB53F22DA442C00A4B666 /* ThemedUISplitViewController.swift */, ); path = Theme; sourceTree = ""; @@ -284,6 +298,7 @@ 7CF5F59120AC325100A18C3E /* TorrentFilesController.swift */, 7C7D0AB920D911EB001B08E5 /* SettingsSortingController.swift */, 7C4B10AC20EA278800440E74 /* TrackersListController.swift */, + 7C5D7683230335A4002E1352 /* FilesBrowserController.swift */, ); path = ViewControllers; sourceTree = ""; @@ -350,7 +365,7 @@ TargetAttributes = { 7C3C692E20A754FB0023396C = { CreatedOnToolsVersion = 9.3; - LastSwiftMigration = 0930; + LastSwiftMigration = 1100; SystemCapabilities = { com.apple.BackgroundModes = { enabled = 1; @@ -407,6 +422,7 @@ "${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}/GoogleUtilities/GoogleUtilities.framework", "${BUILT_PRODUCTS_DIR}/MarqueeLabel/MarqueeLabel.framework", "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", @@ -415,6 +431,7 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MarqueeLabel.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", @@ -462,6 +479,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 7CAFB54022DA442C00A4B666 /* ThemedUISplitViewController.swift in Sources */, 7C3E842120AB6BB400577282 /* FileCell.swift in Sources */, 7CF5F59420AC86F600A18C3E /* MainController.swift in Sources */, 7C7D0ABE20D98923001B08E5 /* FolderCellActionDelegate.swift in Sources */, @@ -473,10 +491,13 @@ 7CF522EC20AF78B100D319E6 /* BackgroundTask.swift in Sources */, 7CF522F020AF85AB00D319E6 /* UserDefaultsKeys.swift in Sources */, 7C4B10A720E02A4900440E74 /* ThemedUIAlertController.swift in Sources */, + 7C5D7684230335A4002E1352 /* FilesBrowserController.swift in Sources */, 7C4B109F20DFF32B00440E74 /* ThemedUITableView.swift in Sources */, 7C4B10A520E00CA600440E74 /* ThemedUITableViewCell.swift in Sources */, 7C4B10AB20E18B8500440E74 /* ButtonCell.swift in Sources */, 7CB8082B20AA28F200F76931 /* TorrentStatus.swift in Sources */, + 7CCD494A22A6DC990061FEE5 /* ThemedUINavigationController.swift in Sources */, + 7CCD494C22A85B610061FEE5 /* ThemedUIActivityViewController.swift in Sources */, 7CF522E620AE1F5000D319E6 /* SortingManager.swift in Sources */, 7CF522E820AEF3DB00D319E6 /* FileInfo.swift in Sources */, 7C4B10AD20EA278900440E74 /* TrackersListController.swift in Sources */, @@ -495,6 +516,7 @@ 7C4B10AF20EA30C500440E74 /* TrackerCell.swift in Sources */, 7C7D0AB620D8EA50001B08E5 /* Manager.swift in Sources */, 7C4B10A320E0099300440E74 /* ThemedUILabel.swift in Sources */, + 7C4DB4E122AD457A00D45494 /* SegmentedProgressView.swift in Sources */, 7C4B10A920E1565100440E74 /* Themed.swift in Sources */, 7C3E841B20AB054C00577282 /* DetailCell.swift in Sources */, 7CB8083520AAF09F00F76931 /* Downloader.swift in Sources */, @@ -591,7 +613,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.3; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -647,7 +669,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.3; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; @@ -663,9 +685,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 13.0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = D59DHVRS87; + DEVELOPMENT_TEAM = D5UQ7XT49T; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -691,15 +714,16 @@ "$(inherited)", "$(PROJECT_DIR)", ); + MARKETING_VERSION = 1.7.2; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = ru.nonamedude.iTorrent; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = "VS: WildCard Development"; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/iTorrent.framework/Headers/iTorrent-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; SYSTEM_HEADER_SEARCH_PATHS = ""; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ""; @@ -714,8 +738,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = D59DHVRS87; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 13.0; + DEVELOPMENT_TEAM = D5UQ7XT49T; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(PROJECT_DIR)", @@ -741,13 +766,14 @@ "$(inherited)", "$(PROJECT_DIR)", ); + MARKETING_VERSION = 1.7.2; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = ru.nonamedude.iTorrent; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = "VS: WildCard Development"; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/iTorrent.framework/Headers/iTorrent-Bridging-Header.h"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; SYSTEM_HEADER_SEARCH_PATHS = ""; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ""; diff --git a/iTorrent.xcworkspace/xcuserdata/xitrix.xcuserdatad/UserInterfaceState.xcuserstate b/iTorrent.xcworkspace/xcuserdata/xitrix.xcuserdatad/UserInterfaceState.xcuserstate index a2b7b9cf..d6502f85 100644 Binary files a/iTorrent.xcworkspace/xcuserdata/xitrix.xcuserdatad/UserInterfaceState.xcuserstate and b/iTorrent.xcworkspace/xcuserdata/xitrix.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/iTorrent.xcworkspace/xcuserdata/xitrix.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/iTorrent.xcworkspace/xcuserdata/xitrix.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index ed9a9b4d..ded2d269 100644 --- a/iTorrent.xcworkspace/xcuserdata/xitrix.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/iTorrent.xcworkspace/xcuserdata/xitrix.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -1,5 +1,56 @@ + + + + + + + + + + + + + + diff --git a/iTorrent/Assets.xcassets/AppIcon.appiconset/Contents.json b/iTorrent/Assets.xcassets/AppIcon.appiconset/Contents.json index 6270ac69..e7ceb57e 100644 --- a/iTorrent/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/iTorrent/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -147,8 +147,15 @@ "size" : "44x44", "idiom" : "watch", "scale" : "2x", - "role" : "longLook", - "subtype" : "42mm" + "role" : "appLauncher", + "subtype" : "40mm" + }, + { + "size" : "50x50", + "idiom" : "watch", + "scale" : "2x", + "role" : "appLauncher", + "subtype" : "44mm" }, { "size" : "86x86", @@ -164,6 +171,13 @@ "role" : "quickLook", "subtype" : "42mm" }, + { + "size" : "108x108", + "idiom" : "watch", + "scale" : "2x", + "role" : "quickLook", + "subtype" : "44mm" + }, { "idiom" : "watch-marketing", "size" : "1024x1024", @@ -218,6 +232,13 @@ "idiom" : "mac", "size" : "512x512", "scale" : "2x" + }, + { + "size" : "44x44", + "idiom" : "watch", + "scale" : "2x", + "role" : "longLook", + "subtype" : "42mm" } ], "info" : { diff --git a/iTorrent/Assets.xcassets/Settings.imageset/Contents.json b/iTorrent/Assets.xcassets/Settings.imageset/Contents.json index ceff2891..1312fece 100644 --- a/iTorrent/Assets.xcassets/Settings.imageset/Contents.json +++ b/iTorrent/Assets.xcassets/Settings.imageset/Contents.json @@ -27,21 +27,21 @@ }, { "idiom" : "iphone", - "subtype" : "retina4", - "scale" : "1x" + "scale" : "2x" }, { "idiom" : "iphone", - "scale" : "2x" + "scale" : "3x" }, { "idiom" : "iphone", "subtype" : "retina4", - "scale" : "2x" + "scale" : "1x" }, { "idiom" : "iphone", - "scale" : "3x" + "subtype" : "retina4", + "scale" : "2x" }, { "idiom" : "iphone", @@ -66,10 +66,18 @@ "idiom" : "watch", "screen-width" : "<=145" }, + { + "idiom" : "watch", + "screen-width" : ">161" + }, { "idiom" : "watch", "screen-width" : ">145" }, + { + "idiom" : "watch", + "screen-width" : ">183" + }, { "idiom" : "watch", "scale" : "2x" @@ -79,11 +87,21 @@ "scale" : "2x", "screen-width" : "<=145" }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">161" + }, { "idiom" : "watch", "scale" : "2x", "screen-width" : ">145" }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">183" + }, { "idiom" : "mac" }, diff --git a/iTorrent/Assets.xcassets/Share.imageset/Contents.json b/iTorrent/Assets.xcassets/Share.imageset/Contents.json index 674e7926..ba25a7fd 100644 --- a/iTorrent/Assets.xcassets/Share.imageset/Contents.json +++ b/iTorrent/Assets.xcassets/Share.imageset/Contents.json @@ -27,21 +27,21 @@ }, { "idiom" : "iphone", - "subtype" : "retina4", - "scale" : "1x" + "scale" : "2x" }, { "idiom" : "iphone", - "scale" : "2x" + "scale" : "3x" }, { "idiom" : "iphone", "subtype" : "retina4", - "scale" : "2x" + "scale" : "1x" }, { "idiom" : "iphone", - "scale" : "3x" + "subtype" : "retina4", + "scale" : "2x" }, { "idiom" : "iphone", @@ -66,10 +66,18 @@ "idiom" : "watch", "screen-width" : "<=145" }, + { + "idiom" : "watch", + "screen-width" : ">161" + }, { "idiom" : "watch", "screen-width" : ">145" }, + { + "idiom" : "watch", + "screen-width" : ">183" + }, { "idiom" : "watch", "scale" : "2x" @@ -79,11 +87,21 @@ "scale" : "2x", "screen-width" : "<=145" }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">161" + }, { "idiom" : "watch", "scale" : "2x", "screen-width" : ">145" }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">183" + }, { "idiom" : "mac" }, diff --git a/iTorrent/Assets.xcassets/Sort.imageset/Contents.json b/iTorrent/Assets.xcassets/Sort.imageset/Contents.json index 77573eec..eb4b643a 100644 --- a/iTorrent/Assets.xcassets/Sort.imageset/Contents.json +++ b/iTorrent/Assets.xcassets/Sort.imageset/Contents.json @@ -27,21 +27,21 @@ }, { "idiom" : "iphone", - "subtype" : "retina4", - "scale" : "1x" + "scale" : "2x" }, { "idiom" : "iphone", - "scale" : "2x" + "scale" : "3x" }, { "idiom" : "iphone", "subtype" : "retina4", - "scale" : "2x" + "scale" : "1x" }, { "idiom" : "iphone", - "scale" : "3x" + "subtype" : "retina4", + "scale" : "2x" }, { "idiom" : "iphone", @@ -66,10 +66,18 @@ "idiom" : "watch", "screen-width" : "<=145" }, + { + "idiom" : "watch", + "screen-width" : ">161" + }, { "idiom" : "watch", "screen-width" : ">145" }, + { + "idiom" : "watch", + "screen-width" : ">183" + }, { "idiom" : "watch", "scale" : "2x" @@ -79,11 +87,21 @@ "scale" : "2x", "screen-width" : "<=145" }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">161" + }, { "idiom" : "watch", "scale" : "2x", "screen-width" : ">145" }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">183" + }, { "idiom" : "mac" }, diff --git a/iTorrent/Base.lproj/Main.storyboard b/iTorrent/Base.lproj/Main.storyboard index 6a45669c..b88bb0db 100644 --- a/iTorrent/Base.lproj/Main.storyboard +++ b/iTorrent/Base.lproj/Main.storyboard @@ -1,11 +1,9 @@ - - - - + + - + @@ -18,7 +16,7 @@ - + @@ -27,11 +25,11 @@ - + - - + + + + + + + @@ -72,9 +75,9 @@ - + - + @@ -87,7 +90,7 @@ + + @@ -1563,7 +1628,7 @@ - + @@ -1600,14 +1665,14 @@ - + - + - + @@ -1635,7 +1700,7 @@ - + @@ -1645,13 +1710,13 @@ - + - + - + - + @@ -1697,17 +1762,17 @@ - + - + - + + - + - - + + - + + + + + @@ -1877,21 +1959,21 @@ - - + + - + - +