unity-jar-resolver icon indicating copy to clipboard operation
unity-jar-resolver copied to clipboard

Published 20 hours ago • verified publisher icon googlesamples

Delay auto resolve skippable dialog

Open Thaina opened this issue 6 years ago • 7 comments

For #217

Thaina avatar May 18 '19 13:05 Thaina

As I mentioned when I started looking at this, it would be nice to rebase and squash this change into a single commit to merge.

$ git rebase -i

Squash all commits after the first one in the list so they're all combined into one

Change the commit message to describe what this is doing (e.g https://chris.beams.io/posts/git-commit/ is a nice tutorial)

Replace your branch with the squashed commit

$ git push origin -f HEAD:master

stewartmiles avatar May 21 '19 21:05 stewartmiles

@stewartmiles Doesn't the git could squash whenever you merge my branch into your branch?

https://github.blog/2016-04-01-squash-your-commits/

Or I am misunderstand this blog post?

Anyway I would fix everything as your comment first and would look about squashing or recommitting this when there was the last thing to be fixed

Thaina avatar May 22 '19 05:05 Thaina

@stewartmiles I have tries to squash by tortoisegit, is this what you expected?

Thaina avatar May 23 '19 01:05 Thaina

@Thaina typically I would use the command line to do this using git rebase -i origin/master that opens an editor and allows me to "squash" all commits in the series into a single commit i.e from origin/master..HEAD.

I think it's possible to do the same with tortoisegit https://stackoverflow.com/questions/12528854/how-to-perform-rebase-squash-using-tortoisegit

stewartmiles avatar Jun 05 '19 23:06 stewartmiles

@stewartmiles I have already did that and the result is as I have committed here > 4f15dd7

Thaina avatar Jun 06 '19 01:06 Thaina

I merged / rebased and squashed this commit into a local repo, the result is here https://github.com/stewartmiles/unity-jar-resolver/commit/fe13245ff9fb17118167baf3157dc000d2edd3a5

At the moment this doesn't really work.

  • Since AlertModal uses EditorUtility.DisplayDialogComplex / EditorUtility.DisplayDialog it's not possible to update the dialog text for the count down.
  • If resolution is skipped, auto-resolution doesn't appear to happen again
  • After the timeout the alert dialog isn't closed

Any chance you built this and managed to test it?

stewartmiles avatar Jun 12 '19 19:06 stewartmiles

I have fix it by using progressbar dialog. Now it could only cancel or wait to have it closed by itself

I could build the dll too. But it required to change something in gradle to let it be able to built in windows

Thaina avatar Jun 30 '19 13:06 Thaina