kolkov / ngx-gallery

A simple responsive native gallery component for Angular 8+.
https://ngx-gallery.kolkov.ru/
MIT License
115 stars 56 forks source link

Fixing animations on master: Rotate, Fade, Zoom #26

Closed Simbaclaws closed 4 years ago

Simbaclaws commented 4 years ago

Dear @kolkov,

I have made a new pull request that can be merged with master in order to fix the other animations of the gallery.

Like previously discussed the transition animations should be separated in a separate file and the isAnimating and transition duration should be configurable.

These are things that still need to be done, but for now this pull request might be useful for fixing the other animations.

Thank you for taking the time to improve the gallery :+1: , Simbaclaws

codecov[bot] commented 4 years ago

Codecov Report

Merging #26 into master will decrease coverage by 2.24%. The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #26      +/-   ##
==========================================
- Coverage   37.36%   35.12%   -2.25%     
==========================================
  Files          16       16              
  Lines         752      800      +48     
  Branches      158      182      +24     
==========================================
  Hits          281      281              
- Misses        432      480      +48     
  Partials       39       39              
Impacted Files Coverage Δ
...b/ngx-gallery-image/ngx-gallery-image.component.ts 20.57% <0.00%> (-7.78%) :arrow_down:

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 5a2c2cc...4d1edf1. Read the comment docs.

kolkov commented 4 years ago

I think you need to squash some commits

Simbaclaws commented 4 years ago

I did git rebase -i HEAD~10 And then fixed all the conflicts.

But this didn't squash all the commits in the pull request. How can I squash all of the commits?

EDIT: Are you able to press this button? https://stackoverflow.com/a/43858707/3466128 If you click on the arrow next to merge request you should be able to select squash and merge. For some reason I can't squash these commits from my branch into the pull request. I think I'm not allowed to do that for this pull request. https://cloudfour.com/thinks/squashing-your-pull-requests/

kolkov commented 4 years ago

I use SmartGit for my Git. It's free for opensource. https://www.syntevo.com/smartgit/

Simbaclaws commented 4 years ago

Dear @kolkov, I made a mistake in the last 2 commits trying to squash them together, is this now in master?

I'm having a hard time figuring out how to do this. For some reason it's missing changedetectorref and animating. These need to be readded to the repository. Sorry.

Both the contructor (private changeDetectorRef: ChangeDetectorRef) the import ChangeDetectorRef in @angular/core and @Output() animating = new EventEmitter();

And also this._selectedIndex is changed.

I have no idea why it changed these. I'm trying to revert my commit to a previous state which worked, but I can't seem to be doing that.

These need to be fixed still.

the following commit is a working commit I think: commit 0d9ff70f4c7f701effe38c87fe4cd1600ba9fb87

I can't seem to revert my repository to this commit.

I'm very sorry.

kolkov commented 4 years ago

Ok I fixed this squash artifacts. But image component still not working. Fix please in next PR.