Refine URLs and numbers detection (#19)

ExTBH · Dec 4, 2022 · f3f6dfd · f3f6dfd
1 parent 4ac3570
commit f3f6dfd
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 9 deletions.
diff --git a/Theos/Classes/Exts.h b/Theos/Classes/Exts.h
@@ -12,4 +12,8 @@
 
 @interface UIView (FindUIViewController)
 - (UIViewController *) firstAvailableUIViewController;
+@end
+
+@interface NSDataDetector (Shared)
++ (NSDataDetector*)sharedInstance;
 @end
diff --git a/Theos/Classes/Exts.m b/Theos/Classes/Exts.m
@@ -1,7 +1,5 @@
 #import "Exts.h"
 #include <UIKit/UIColor.h>
-#include <Foundation/NSKeyedArchiver.h>
-
 @implementation UIImage (Scale)
 // Resize images by luki120 @ Theos discord
 + (UIImage *)resizeImageFromImage:(UIImage *)image withSize:(CGSize)size {
@@ -57,4 +55,18 @@ - (UIViewController *) firstAvailableUIViewController {
     return nil;
 }
 
+@end
+
+@implementation NSDataDetector (Shared)
++ (NSDataDetector *)sharedInstance {
+    static NSDataDetector *shared = nil;
+    static dispatch_once_t onceToken;
+
+    dispatch_once(&onceToken, ^{
+        shared = [self dataDetectorWithTypes:NSTextCheckingTypeLink|NSTextCheckingTypePhoneNumber error:nil];
+        });
+    return shared;
+
+}
+
 @end
diff --git a/Theos/Tweak.x b/Theos/Tweak.x
@@ -333,8 +333,8 @@
 -(void)setAttributedText:(NSAttributedString *)arg1{
     NSMutableAttributedString *newAttributedString = [[NSMutableAttributedString alloc] initWithAttributedString:arg1];
     if([[JDESettingsManager sharedInstance] featureStateForTag:7]){
-        NSDataDetector *detector = [NSDataDetector dataDetectorWithTypes:NSTextCheckingTypeLink error:nil];
-        [detector enumerateMatchesInString:arg1.string options:0 range:NSMakeRange(0, arg1.string.length) 
+
+        [[NSDataDetector sharedInstance] enumerateMatchesInString:arg1.string options:0 range:NSMakeRange(0, arg1.string.length) 
             usingBlock:^(NSTextCheckingResult *result, NSMatchingFlags flags, BOOL *stop) {
                 NSMutableDictionary *attributes = [NSMutableDictionary dictionary];
                 attributes[ZSWTappableLabelTappableRegionAttributeName] = @YES;
@@ -355,11 +355,33 @@
 - (void)tappableLabel:(ZSWTappableLabel *)tappableLabel tappedAtIndex:(NSInteger)idx withAttributes:(NSDictionary<NSAttributedStringKey, id> *)attributes{
     if([[JDESettingsManager sharedInstance] featureStateForTag:7]){
         NSTextCheckingResult *result = attributes[@"NSTextCheckingResult"];
-        if(result.resultType == NSTextCheckingTypeLink){
-            UIViewController *presentationController = [tappableLabel firstAvailableUIViewController];
-            if (presentationController != nil){
-                SFSafariViewController *inApp = [[SFSafariViewController alloc] initWithURL:result.URL];
-                [presentationController presentViewController:inApp animated:YES completion:nil];
+        UIViewController *presentationController = [tappableLabel firstAvailableUIViewController];
+        if (result){
+            switch(result.resultType){
+                case NSTextCheckingTypeLink:{
+                        SFSafariViewController *inApp = [[SFSafariViewController alloc] initWithURL:result.URL];
+                        [presentationController presentViewController:inApp animated:YES completion:nil];
+                    }
+                    break;
+                case NSTextCheckingTypePhoneNumber:{
+                    UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Open with" 
+                        message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+
+                    UIAlertAction *cancelAlert = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil];
+
+                    UIAlertAction *whatsappAlert = [UIAlertAction actionWithTitle:[NSString stringWithFormat:@"Whatsapp: %@", result.phoneNumber] 
+                        style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                            NSURL *whatsappURL = [NSURL URLWithString:[NSString stringWithFormat:@"https://wa.me/%@", result.phoneNumber]];
+                            [UIApplication.sharedApplication openURL:whatsappURL options:@{} completionHandler:nil];
+                        }];
+
+                    [alert addAction:cancelAlert];
+                    [alert addAction:whatsappAlert];
+                    [presentationController presentViewController:alert animated:YES completion:nil];
+                }
+                    break;
+                default:
+                    break;
             }
         }
     }