Update 3.3

- Fix downloading videos from multiple media tweet - Translate Custom tab bar ViewController - Translate Theme ViewController - Update FLEX
BandarHL · Nov 25, 2022 · 3607ba0 · 3607ba0
1 parent 7df9ae2
commit 3607ba0
Show file tree

Hide file tree

Showing 458 changed files with 356 additions and 54,970 deletions.
diff --git a/BHTwitter.xcodeproj/project.pbxproj b/BHTwitter.xcodeproj/project.pbxproj
diff --git a/BHTwitter.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/BHTwitter.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/BHTwitter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/BHTwitter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,23 @@
+{
+  "pins" : [
+    {
+      "identity" : "flex",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/FLEXTool/FLEX",
+      "state" : {
+        "revision" : "e0acf59d06d498041f65bbea1e5914b6e4b39733",
+        "version" : "5.22.10"
+      }
+    },
+    {
+      "identity" : "jgprogresshud",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/JonasGessner/JGProgressHUD",
+      "state" : {
+        "branch" : "master",
+        "revision" : "103d67f308b8c0c18926061025549af98cdfd6fc"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/BHTwitter/BHDownloadInlineButton.m b/BHTwitter/BHDownloadInlineButton.m
@@ -50,21 +50,83 @@ - (void)DownloadHandler:(UIButton *)sender {
 
     NSMutableArray *actions = [[NSMutableArray alloc] init];
     [actions addObject:title];
+    NSMutableArray *innerActions = [[NSMutableArray alloc] init];
+    [innerActions addObject:title];
+
 
-    for (TFSTwitterEntityMedia *i in self.delegate.viewModel.entities.media) {
-        for (TFSTwitterEntityMediaVideoVariant *k in i.videoInfo.variants) {
-            if ([k.contentType isEqualToString:@"video/mp4"]) {
-                TFNActionItem *download = [objc_getClass("TFNActionItem") actionItemWithTitle:[BHTManager getVideoQuality:k.url] imageName:@"arrow_down_circle_stroke" action:^{
-                    BHDownload *DownloadManager = [[BHDownload alloc] init];
-                    [DownloadManager downloadFileWithURL:[NSURL URLWithString:k.url]];
-                    [DownloadManager setDelegate:self];
-                    if (!([BHTManager DirectSave])) {
+    if ([self.delegate.delegate isKindOfClass:objc_getClass("T1SlideshowStatusView")]) {
+        T1SlideshowStatusView *selectedMedia = self.delegate.delegate;
+
+        for (TFSTwitterEntityMediaVideoVariant *video in selectedMedia.media.videoInfo.variants) {
+            if ([video.contentType isEqualToString:@"video/mp4"]) {
+
+                TFNActionItem *option = [objc_getClass("TFNActionItem") actionItemWithTitle:[BHTManager getVideoQuality:video.url] imageName:@"arrow_down_circle_stroke" action:^{
+                    BHDownload *dwManager = [[BHDownload alloc] init];
+                    [dwManager downloadFileWithURL:[NSURL URLWithString:video.url]];
+                    [dwManager setDelegate:self];
+
+                    if (![BHTManager DirectSave]) {
                         self.hud = [JGProgressHUD progressHUDWithStyle:JGProgressHUDStyleDark];
                         self.hud.textLabel.text = [[BHTBundle sharedBundle] localizedStringForKey:@"PROGRESS_DOWNLOADING_STATUS_TITLE"];
                         [self.hud showInView:topMostController().view];
                     }
                 }];
-                [actions addObject:download];
+
+                [actions addObject:option];
+            }
+        }
+    } else {
+        if (self.delegate.viewModel.representedMediaEntities.count > 1) {
+            [self.delegate.viewModel.representedMediaEntities enumerateObjectsUsingBlock:^(TFSTwitterEntityMedia * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+
+                if (obj.mediaType == 2 || obj.mediaType == 3) {
+                    TFNActionItem *option = [objc_getClass("TFNActionItem") actionItemWithTitle:[NSString stringWithFormat:@"Video %lu", (unsigned long)idx+1] imageName:@"arrow_down_circle_stroke" action:^{
+
+                        for (TFSTwitterEntityMediaVideoVariant *video in obj.videoInfo.variants) {
+                            if ([video.contentType isEqualToString:@"video/mp4"]) {
+                                TFNActionItem *innerOption = [objc_getClass("TFNActionItem") actionItemWithTitle:[BHTManager getVideoQuality:video.url] imageName:@"arrow_down_circle_stroke" action:^{
+
+                                    BHDownload *dwManager = [[BHDownload alloc] init];
+                                    [dwManager downloadFileWithURL:[NSURL URLWithString:video.url]];
+                                    [dwManager setDelegate:self];
+
+                                    if (![BHTManager DirectSave]) {
+                                        self.hud = [JGProgressHUD progressHUDWithStyle:JGProgressHUDStyleDark];
+                                        self.hud.textLabel.text = [[BHTBundle sharedBundle] localizedStringForKey:@"PROGRESS_DOWNLOADING_STATUS_TITLE"];
+                                        [self.hud showInView:topMostController().view];
+                                    }
+
+                                }];
+
+                                [innerActions addObject:innerOption];
+                            }
+                        }
+
+                        TFNMenuSheetViewController *innerAlert = [[objc_getClass("TFNMenuSheetViewController") alloc] initWithActionItems:[NSArray arrayWithArray:innerActions]];
+                        [innerAlert tfnPresentedCustomPresentFromViewController:topMostController() animated:YES completion:nil];
+                    }];
+
+                    [actions addObject:option];
+                }
+            }];
+        } else {
+            for (TFSTwitterEntityMediaVideoVariant *video in self.delegate.viewModel.representedMediaEntities.firstObject.videoInfo.variants) {
+                if ([video.contentType isEqualToString:@"video/mp4"]) {
+
+                    TFNActionItem *option = [objc_getClass("TFNActionItem") actionItemWithTitle:[BHTManager getVideoQuality:video.url] imageName:@"arrow_down_circle_stroke" action:^{
+                        BHDownload *dwManager = [[BHDownload alloc] init];
+                        [dwManager downloadFileWithURL:[NSURL URLWithString:video.url]];
+                        [dwManager setDelegate:self];
+
+                        if (![BHTManager DirectSave]) {
+                            self.hud = [JGProgressHUD progressHUDWithStyle:JGProgressHUDStyleDark];
+                            self.hud.textLabel.text = [[BHTBundle sharedBundle] localizedStringForKey:@"PROGRESS_DOWNLOADING_STATUS_TITLE"];
+                            [self.hud showInView:topMostController().view];
+                        }
+                    }];
+
+                    [actions addObject:option];
+                }
             }
         }
     }

diff --git a/BHTwitter/BHTManager.m b/BHTwitter/BHTManager.m
@@ -83,12 +83,7 @@ + (NSString *)getVideoQuality:(NSString *)url {
     return [NSString stringWithFormat:@"%@x%@", q.firstObject, q.lastObject];
 }
 + (BOOL)isVideoCell:(id <T1StatusViewModel>)model {
-    TFSTwitterEntityMedia *i = model.entities.media.firstObject;
-    if (i.videoInfo == nil) {
-        return false;
-    } else {
-        return true;
-    }
+    return model.isMediaEntityVideo || model.isGIF;
 }
 + (void)save:(NSURL *)url {
     [[PHPhotoLibrary sharedPhotoLibrary] performChangesAndWait:^{

diff --git a/BHTwitter/BHTwitter-Bridging-Header.h b/BHTwitter/BHTwitter-Bridging-Header.h
@@ -3,3 +3,4 @@
 //
 
 #import "TWHeaders.h"
+#import "BHTBundle.h"
diff --git a/BHTwitter/BHTwitter.xm b/BHTwitter/BHTwitter.xm
@@ -758,7 +758,7 @@
 %hook T1TweetComposeViewController
 - (void)_t1_didTapSendButton:(UIButton *)tweetButton {
     if ([BHTManager TweetConfirm]) {
-        [FLEXAlert makeAlert:^(FLEXAlert *make) {
+        [%c(FLEXAlert) makeAlert:^(FLEXAlert *make) {
             make.message([[BHTBundle sharedBundle] localizedStringForKey:@"CONFIRM_ALERT_MESSAGE"]);
             make.button([[BHTBundle sharedBundle] localizedStringForKey:@"YES_BUTTON_TITLE"]).handler(^(NSArray<NSString *> *strings) {
                 %orig;
@@ -771,7 +771,7 @@
 }
 - (void)_t1_handleTweet {
     if ([BHTManager TweetConfirm]) {
-        [FLEXAlert makeAlert:^(FLEXAlert *make) {
+        [%c(FLEXAlert) makeAlert:^(FLEXAlert *make) {
             make.message([[BHTBundle sharedBundle] localizedStringForKey:@"CONFIRM_ALERT_MESSAGE"]);
             make.button([[BHTBundle sharedBundle] localizedStringForKey:@"YES_BUTTON_TITLE"]).handler(^(NSArray<NSString *> *strings) {
                 %orig;
@@ -800,7 +800,7 @@
 %hook TUIFollowControl
 - (void)_followUser:(id)arg1 event:(id)arg2 {
     if ([BHTManager FollowConfirm]) {
-        [FLEXAlert makeAlert:^(FLEXAlert *make) {
+        [%c(FLEXAlert) makeAlert:^(FLEXAlert *make) {
             make.message([[BHTBundle sharedBundle] localizedStringForKey:@"CONFIRM_ALERT_MESSAGE"]);
             make.button([[BHTBundle sharedBundle] localizedStringForKey:@"YES_BUTTON_TITLE"]).handler(^(NSArray<NSString *> *strings) {
                 %orig;
@@ -817,7 +817,7 @@
 %hook TTAStatusInlineFavoriteButton
 - (void)didTap {
     if ([BHTManager LikeConfirm]) {
-        [FLEXAlert makeAlert:^(FLEXAlert *make) {
+        [%c(FLEXAlert) makeAlert:^(FLEXAlert *make) {
             make.message([[BHTBundle sharedBundle] localizedStringForKey:@"CONFIRM_ALERT_MESSAGE"]);
             make.button([[BHTBundle sharedBundle] localizedStringForKey:@"YES_BUTTON_TITLE"]).handler(^(NSArray<NSString *> *strings) {
                 %orig;
@@ -833,7 +833,7 @@
 %hook T1StatusInlineFavoriteButton
 - (void)didTap {
     if ([BHTManager LikeConfirm]) {
-        [FLEXAlert makeAlert:^(FLEXAlert *make) {
+        [%c(FLEXAlert) makeAlert:^(FLEXAlert *make) {
             make.message([[BHTBundle sharedBundle] localizedStringForKey:@"CONFIRM_ALERT_MESSAGE"]);
             make.button([[BHTBundle sharedBundle] localizedStringForKey:@"YES_BUTTON_TITLE"]).handler(^(NSArray<NSString *> *strings) {
                 %orig;
@@ -849,7 +849,7 @@
 %hook T1ImmersiveExploreCardView
 - (void)handleDoubleTap:(id)arg1 {
     if ([BHTManager LikeConfirm]) {
-        [FLEXAlert makeAlert:^(FLEXAlert *make) {
+        [%c(FLEXAlert) makeAlert:^(FLEXAlert *make) {
             make.message([[BHTBundle sharedBundle] localizedStringForKey:@"CONFIRM_ALERT_MESSAGE"]);
             make.button([[BHTBundle sharedBundle] localizedStringForKey:@"YES_BUTTON_TITLE"]).handler(^(NSArray<NSString *> *strings) {
                 %orig;
@@ -865,7 +865,7 @@
 %hook T1TweetDetailsViewController
 - (void)_t1_toggleFavoriteOnCurrentStatus {
     if ([BHTManager LikeConfirm]) {
-        [FLEXAlert makeAlert:^(FLEXAlert *make) {
+        [%c(FLEXAlert) makeAlert:^(FLEXAlert *make) {
             make.message([[BHTBundle sharedBundle] localizedStringForKey:@"CONFIRM_ALERT_MESSAGE"]);
             make.button([[BHTBundle sharedBundle] localizedStringForKey:@"YES_BUTTON_TITLE"]).handler(^(NSArray<NSString *> *strings) {
                 %orig;

diff --git a/BHTwitter/Classes/Core/Controllers/FLEXFilteringTableViewController.h b/BHTwitter/Classes/Core/Controllers/FLEXFilteringTableViewController.h