From 8362692523a6c367a617efe47edc51da97540bc6 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Sat, 12 Sep 2020 19:24:32 -0400
Subject: [PATCH] use some pretty animations when drag/dropping media.

---
 Ample/Base.lproj/MediaView.xib |  2 +-
 Ample/MediaViewController.m    | 38 +++++++++++++++++++++++++++-------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/Ample/Base.lproj/MediaView.xib b/Ample/Base.lproj/MediaView.xib
index 27c2c16..6089746 100644
--- a/Ample/Base.lproj/MediaView.xib
+++ b/Ample/Base.lproj/MediaView.xib
@@ -71,7 +71,7 @@
                                                     <action selector="pathAction:" target="-2" id="4oX-bW-ANp"/>
                                                 </connections>
                                             </pathControl>
-                                            <imageView hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="6g1-NT-J1w">
+                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="6g1-NT-J1w">
                                                 <rect key="frame" x="0.0" y="1" width="20" height="20"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" image="drag-handle-4x10" id="x7F-qD-5y9"/>
diff --git a/Ample/MediaViewController.m b/Ample/MediaViewController.m
index 500b44a..e8c7360 100644
--- a/Ample/MediaViewController.m
+++ b/Ample/MediaViewController.m
@@ -26,6 +26,7 @@
 #endif
 
 -(void)viewDidMoveToSuperview {
+    return;
     if (_trackingRect) {
         [self removeTrackingRect: _trackingRect];
     }
@@ -151,25 +152,32 @@
     return YES;
 }
 
--(BOOL)pruneChildren {
+-(BOOL)pruneChildrenWithOutlineView: (NSOutlineView *)view {
     NSUInteger count = [_children count];
     BOOL delta = NO;
     if (_validCount == count) return NO;
+    NSMutableIndexSet *set = [NSMutableIndexSet new];
 
     for (NSInteger i = _validCount; i < count; ++i) {
         MediaItem *item = [_children lastObject];
         if ([item url]) break;
     
         [_children removeLastObject];
+        [set addIndex: [_children count]];
+
         delta = YES;
     }
     if (delta) {
+
+        if (view)
+            [view removeItemsAtIndexes: set inParent: self withAnimation: NSTableViewAnimationEffectFade];
+
         return YES;
     }
     return NO;
 }
 
--(BOOL)moveItemFrom: (NSInteger)oldIndex to: (NSInteger)newIndex {
+-(BOOL)moveItemFrom: (NSInteger)oldIndex to: (NSInteger)newIndex outlineView: (NSOutlineView *)view {
     if (newIndex == oldIndex) return NO;
     NSUInteger count = [_children count];
     if (oldIndex >= count) return NO;
@@ -182,15 +190,20 @@
     } else {
         [_children insertObject: item atIndex: newIndex];
     }
-    
+    if (view) [view moveItemAtIndex: oldIndex inParent: self toIndex: newIndex inParent: self];
+
     // re-index and re-validate.
     unsigned ix = 0;
     for (MediaItem *item in _children) {
         [item setIndex: ix];
         [item setValid: ix < _validCount];
+        
+        [view reloadItem: item];
+        
         ++ix;
     }
-    [self pruneChildren];
+    [self pruneChildrenWithOutlineView: view];
+    //[view reloadItem: self reloadChildren: YES];
     return YES;
 }
 @end
@@ -338,6 +351,9 @@ enum {
     }
     _root = tmp;
 
+    // todo - switch this to use removeItemsAtIndexes:inParent:withAnimation:
+    // and insertItemsAtIndexes:inParent:withAnimation:
+    
     [_outlineView reloadData];
     [_outlineView expandItem: nil expandChildren: YES];
 }
@@ -590,10 +606,12 @@ static NSString *kDragType = @"private.ample.media";
     
     NSInteger oldIndex = indexes[1];
 
-    [cat moveItemFrom: oldIndex to: index];
+    [_outlineView beginUpdates];
+    [cat moveItemFrom: oldIndex to: index outlineView: _outlineView];
+    [_outlineView endUpdates];
     [self rebuildArgs];
 
-    [_outlineView reloadItem: cat reloadChildren: YES];
+    //[_outlineView reloadItem: cat reloadChildren: YES];
     return YES;
 
 }
@@ -615,8 +633,14 @@ static NSString *kDragType = @"private.ample.media";
     // if item is invalid, should attempt to remove...
     if (![item valid]) {
         MediaCategory *cat = [_outlineView parentForItem: item];
-        if ([cat pruneChildren]) [self rebuildRoot];
+        [_outlineView beginUpdates];
+        [cat pruneChildrenWithOutlineView: _outlineView];
+        [_outlineView endUpdates];
     }
+    
+    // todo -- if this eliminates a category completely, it will still be included
+    // since we're now using animaations instead of reloading.
+    
     [self rebuildArgs];
 }