Merge branch 'dev'

Author: henry9610

seafile/SeafActionsManager.h

@@ -65,7 +65,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (void)entryAction:(SeafBase *)entry inEncryptedRepo:(BOOL)encrypted inTargetVC:(UIViewController *)targetVC fromView:(UIView *)view actionBlock:(ActionType)block;
 
-+ (void)exportByActivityView:(NSArray <NSURL *> *)urls item:(UIBarButtonItem * _Nullable)barButtonItem targerVC:(UIViewController *)targetVC;
++ (void)exportByActivityView:(NSArray <NSURL *> *)urls item:(id _Nullable)item targerVC:(UIViewController *)targetVC;
 
 @end
 

seafile/SeafActionsManager.m

@@ -6,13 +6,15 @@
 //  Copyright © 2018 Seafile. All rights reserved.
 //
 
+#import <UIKit/UIKit.h>
 #import "SeafActionsManager.h"
 #import "SeafRepos.h"
 #import "SeafFile.h"
 #import "SeafWechatHelper.h"
 #import "SeafActionSheet.h"
 #import "Debug.h"
 #import "SVProgressHUD.h"
+#import "SeafGlobal.h"
 
 @implementation SeafActionsManager
 
@@ -86,18 +88,27 @@ + (void)directoryAction:(SeafDir*)directory photos:(NSArray *)photos inTargetVC:
     [actionSheet showFromView:item];
 }
 
-+ (void)exportByActivityView:(NSArray <NSURL *> *)urls item:(UIBarButtonItem *)barButtonItem targerVC:(UIViewController *)targetVC {
++ (void)exportByActivityView:(NSArray <NSURL *> *)urls item:(id)item targerVC:(UIViewController *)targetVC {
     UIActivityViewController *controller = [[UIActivityViewController alloc] initWithActivityItems:urls applicationActivities:nil];
     controller.completionWithItemsHandler = ^(UIActivityType __nullable activityType, BOOL completed, NSArray * __nullable returnedItems, NSError * __nullable activityError) {
         Debug("activityType=%@ completed=%d, returnedItems=%@, activityError=%@", activityType, completed, returnedItems, activityError);
         if ([UIActivityTypeSaveToCameraRoll isEqualToString:activityType]) {
             [self savedToPhotoAlbumWithError:activityError];
         }
     };
-    if (barButtonItem) {
-        controller.popoverPresentationController.barButtonItem = barButtonItem;
+
+    if (IsIpad()) {
+        UIPopoverPresentationController *popover = controller.popoverPresentationController;
+        if (targetVC.view.window) {
+            popover.sourceView = targetVC.view.window;
+            popover.sourceRect = CGRectMake(CGRectGetMidX(targetVC.view.window.bounds), CGRectGetMidY(targetVC.view.window.bounds), 0, 0);
+        } else {
+            popover.sourceView = targetVC.view;
+            popover.sourceRect = CGRectMake(CGRectGetMidX(targetVC.view.bounds), CGRectGetMidY(targetVC.view.bounds), 0, 0);
+        }
+        popover.permittedArrowDirections = 0;
     }
-    
+
     [targetVC presentViewController:controller animated:true completion:nil];
 }
 

seafile/SeafCustomInputAlertViewController.m

@@ -17,6 +17,7 @@ @interface SeafCustomInputAlertViewController () <UITextFieldDelegate>
 
 // For keyboard-aware animation
 @property (nonatomic, strong) NSLayoutConstraint *alertViewBottomConstraint;
+@property (nonatomic, strong) NSLayoutConstraint *alertViewCenterYConstraint; // Center Y constraint for iPad keyboard adjustments
 @property (nonatomic, assign) BOOL isBeingDismissedProgrammatically;
 @property (nonatomic, strong) id finalCompletionHandler; // To store either confirm or cancel block
 
@@ -155,12 +156,15 @@ - (void)viewDidLoad {
 
     if (IsIpad()) {
         self.view.backgroundColor = [UIColor clearColor]; // The form sheet content is alertView
-        self.preferredContentSize = CGSizeMake(450, 240); // Set preferredContentSize BEFORE setupViews/setupConstraints
+        self.preferredContentSize = CGSizeMake(450, 800); // Increase default height to avoid clipping
 
         [self setupViews]; // alertView needs to be created
         [self setupConstraints]; // alertView needs to be constrained
         self.alertView.alpha = 1.0; // Visible by default for form sheet
         // Estimate height: title(20) + space(20) + field(40) + space(25) + button(44) + padding(30+30) = 209. Let's use 240.
+
+        // Register for keyboard notifications so we can move the alert if it would be covered.
+        [self registerForKeyboardNotifications];
     } else {
         [self setupViews];
         [self setupConstraints]; // Constraints are set up here
@@ -189,15 +193,11 @@ - (void)viewWillAppear:(BOOL)animated {
 
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
-    if (!IsIpad()) {
-        [self unregisterForKeyboardNotifications];
-    }
+    [self unregisterForKeyboardNotifications];
 }
 
 - (void)dealloc {
-    if (!IsIpad()) {
-        [self unregisterForKeyboardNotifications]; // Just in case
-    }
+    [self unregisterForKeyboardNotifications]; // Ensure removed for all device types
 }
 
 - (void)setupViews {
@@ -222,13 +222,13 @@ - (void)setupViews {
 - (void)setupConstraints {
     // alertView constraints (leading/trailing for full width, bottom constraint for vertical positioning)
     if (IsIpad()) {
-        // Center alertView and set its size based on preferredContentSize
+        // Keep a reference to the center-Y constraint so we can move the alert when the keyboard shows up.
+        self.alertViewCenterYConstraint = [self.alertView.centerYAnchor constraintEqualToAnchor:self.view.centerYAnchor];
         [NSLayoutConstraint activateConstraints:@[
             [self.alertView.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor],
-            [self.alertView.centerYAnchor constraintEqualToAnchor:self.view.centerYAnchor],
-            [self.alertView.widthAnchor constraintEqualToConstant:self.preferredContentSize.width],
-            [self.alertView.heightAnchor constraintEqualToConstant:self.preferredContentSize.height]
-        ]];
+            self.alertViewCenterYConstraint,
+            [self.alertView.widthAnchor constraintEqualToConstant:self.preferredContentSize.width]
+        ]]; // Do not fix height so it can expand with content
     } else {
         self.alertViewBottomConstraint = [self.alertView.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor constant:kInitialOffScreenBottomConstant];
         [NSLayoutConstraint activateConstraints:@[ // Full width, bottom constraint set above for iPhone
@@ -292,55 +292,70 @@ - (void)unregisterForKeyboardNotifications {
 }
 
 - (void)keyboardWillShow:(NSNotification *)notification {
-    if (IsIpad()) return; // Only for iPhone
     NSDictionary *userInfo = notification.userInfo;
-    CGRect keyboardFrame = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+    CGRect keyboardFrameInScreen = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+    CGRect keyboardFrame = [self.view convertRect:keyboardFrameInScreen fromView:nil];
     NSTimeInterval animationDuration = [userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue];
-    UIViewAnimationCurve animationCurve = [userInfo[UIKeyboardAnimationCurveUserInfoKey] unsignedIntegerValue];
-    
-    self.alertViewBottomConstraint.constant = -keyboardFrame.size.height;
-    
-    [UIView animateWithDuration:animationDuration
-                          delay:0.0
-                        options:(animationCurve << 16) | UIViewAnimationOptionBeginFromCurrentState
-                     animations:^{
-                         self.alertView.alpha = 1.0;
-                         self.backgroundDimmingView.alpha = 1.0; 
-                         [self.view layoutIfNeeded];
-                     } completion:nil];
+    UIViewAnimationOptions options = (([userInfo[UIKeyboardAnimationCurveUserInfoKey] unsignedIntegerValue]) << 16) | UIViewAnimationOptionBeginFromCurrentState;
+
+    if (IsIpad()) {
+        // Move the alert view up by 30% of the keyboard height so it stays visible
+        CGFloat keyboardHeight = keyboardFrame.size.height;
+        self.alertViewCenterYConstraint.constant = -keyboardHeight * 0.3; // leave smaller gap
+
+        [UIView animateWithDuration:animationDuration delay:0.0 options:options animations:^{
+            [self.view layoutIfNeeded];
+        } completion:nil];
+    } else {
+        self.alertViewBottomConstraint.constant = -keyboardFrame.size.height;
+        [UIView animateWithDuration:animationDuration
+                              delay:0.0
+                            options:options
+                         animations:^{
+                             self.alertView.alpha = 1.0;
+                             self.backgroundDimmingView.alpha = 1.0;
+                             [self.view layoutIfNeeded];
+                         } completion:nil];
+    }
 }
 
 - (void)keyboardWillHide:(NSNotification *)notification {
-    if (IsIpad()) return; // Only for iPhone
     NSDictionary *userInfo = notification.userInfo;
     NSTimeInterval animationDuration = [userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue];
-    UIViewAnimationCurve animationCurve = [userInfo[UIKeyboardAnimationCurveUserInfoKey] unsignedIntegerValue];
-    
-    self.alertViewBottomConstraint.constant = kInitialOffScreenBottomConstant;
-    
-    [UIView animateWithDuration:animationDuration
-                          delay:0.0
-                        options:(animationCurve << 16) | UIViewAnimationOptionBeginFromCurrentState
-                     animations:^{
-                         self.alertView.alpha = 0.0;
-                         self.backgroundDimmingView.alpha = 0.0;
-                         [self.view layoutIfNeeded];
-                     } completion:^(BOOL finished) {
-                         if (self.isBeingDismissedProgrammatically) {
-                             [self dismissViewControllerAnimated:NO completion:^{
-                                 if (self.finalCompletionHandler) {
-                                     // Check which handler it is (void vs void(^)(NSString*))
-                                     if (self.cancelHandler == self.finalCompletionHandler && [self.finalCompletionHandler respondsToSelector:@selector(description)]) { // crude check for block type
-                                         ((void(^)(void))self.finalCompletionHandler)();
-                                     } else if (self.completionHandler == self.finalCompletionHandler && [self.finalCompletionHandler respondsToSelector:@selector(description)]) {
-                                         ((void(^)(NSString *))self.finalCompletionHandler)(self.inputTextField.text);
+    UIViewAnimationOptions options = (([userInfo[UIKeyboardAnimationCurveUserInfoKey] unsignedIntegerValue]) << 16) | UIViewAnimationOptionBeginFromCurrentState;
+
+    if (IsIpad()) {
+        self.alertViewCenterYConstraint.constant = 0; // Reset back to center
+        [UIView animateWithDuration:animationDuration delay:0.0 options:options animations:^{
+            [self.view layoutIfNeeded];
+        } completion:nil];
+    } else {
+        self.alertViewBottomConstraint.constant = kInitialOffScreenBottomConstant;
+
+        [UIView animateWithDuration:animationDuration
+                              delay:0.0
+                            options:options
+                         animations:^{
+                             self.alertView.alpha = 0.0;
+                             self.backgroundDimmingView.alpha = 0.0;
+                             [self.view layoutIfNeeded];
+                         } completion:^(BOOL finished) {
+                             if (self.isBeingDismissedProgrammatically) {
+                                 [self dismissViewControllerAnimated:NO completion:^{
+                                     if (self.finalCompletionHandler) {
+                                         // Determine which handler to call
+                                         if (self.cancelHandler == self.finalCompletionHandler) {
+                                             ((void(^)(void))self.finalCompletionHandler)();
+                                         } else if (self.completionHandler == self.finalCompletionHandler) {
+                                             ((void(^)(NSString *))self.finalCompletionHandler)(self.inputTextField.text);
+                                         }
                                      }
-                                 }
-                                 self.isBeingDismissedProgrammatically = NO;
-                                 self.finalCompletionHandler = nil;
-                             }];
-                         }
-                     }];
+                                     self.isBeingDismissedProgrammatically = NO;
+                                     self.finalCompletionHandler = nil;
+                                 }];
+                             }
+                         }];
+    }
 }
 
 #pragma mark - Actions

seafile/SeafDetailViewController.m

@@ -477,6 +477,9 @@ - (void)viewWillLayoutSubviews
                                       toolbarHeight + safeAreaBottom); // Include safe area in height
         self.toolbarView.frame = toolbarFrame;
 
+        // Recalculate buttons layout for new width
+        [self layoutToolbarButtons];
+        
         // Ensure toolbar always stays on top layer
         [self.view bringSubviewToFront:self.toolbarView];
     }
@@ -1088,8 +1091,9 @@ - (void)setupToolbar {
             // Set icon to gray
             UIImage *grayImage = [self imageWithTintColor:[UIColor colorWithRed:0.5 green:0.5 blue:0.5 alpha:1.0] image:resizedImage];
             [btn setImage:grayImage forState:UIControlStateNormal];
-            // Slightly adjust icon position in button
-            btn.imageEdgeInsets = UIEdgeInsetsMake(3.0, 0, -3.0, 0); // Adjust margins to fit smaller height
+            // Vertically center icon inside the button
+            CGFloat verticalOffset = (toolbarH - iconSize)/2.0;
+            btn.imageEdgeInsets = UIEdgeInsetsMake(verticalOffset, 0, verticalOffset, 0);
         }
 
         // Set button label and event
@@ -1098,6 +1102,9 @@ - (void)setupToolbar {
         [self.toolbarView addSubview:btn];
     }
 
+    // Initial layout calculation
+    [self layoutToolbarButtons];
+    
     // Ensure toolbar stays on top layer
     [self.view bringSubviewToFront:self.toolbarView];
 }
@@ -1177,12 +1184,48 @@ - (void)updateToolbarButtons {
                     }
 
                     [btn setImage:finalImage forState:UIControlStateNormal];
+                    // Vertically center icon again in case of state change
+                    CGFloat toolbarH = 36.0f;
+                    CGFloat verticalOffset = (toolbarH - iconSize)/2.0f;
+                    btn.imageEdgeInsets = UIEdgeInsetsMake(verticalOffset, 0, verticalOffset, 0);
                 }
             }
         }
     }
 }
 
+// New helper method: layout toolbar buttons to fit current width
+- (void)layoutToolbarButtons {
+    if (!self.toolbarView) return;
+    // Determine the design height we used when creating buttons
+    CGFloat toolbarHeight = 36.0f; // Must be in sync with setupToolbar
+
+    // Safe-area bottom is already included in toolbarView height, but the buttons themselves
+    // should stay in the top part (outside the safe-area region).
+    // Therefore, keep button height equal to toolbarHeight, starting at y = 0.
+    NSUInteger buttonCount = 0;
+    for (UIView *v in self.toolbarView.subviews) {
+        if ([v isKindOfClass:[UIButton class]]) buttonCount += 1;
+    }
+    if (buttonCount == 0) return;
+
+    CGFloat totalWidth = self.toolbarView.bounds.size.width;
+    CGFloat itemWidth  = totalWidth / buttonCount;
+
+    // Re-position each button according to its tag order (tags were assigned 0,1,2 when created).
+    for (UIView *v in self.toolbarView.subviews) {
+        if (![v isKindOfClass:[UIButton class]]) continue;
+        UIButton *btn = (UIButton *)v;
+        NSInteger index = btn.tag; // 0,1,2
+        CGRect frame = CGRectMake(index * itemWidth, 0, itemWidth, toolbarHeight);
+        btn.frame = frame;
+        // Ensure icon remains vertically centered after layout change
+        CGFloat iconSize = 20.0f;
+        CGFloat verticalOffset = (toolbarHeight - iconSize)/2.0f;
+        btn.imageEdgeInsets = UIEdgeInsetsMake(verticalOffset, 0, verticalOffset, 0);
+    }
+}
+
 // Set the preview item and refresh the view.
 - (void)setPreViewItem:(id<SeafPreView>)item master:(UIViewController<SeafDentryDelegate> *)c
 {