Closed StelianMorariu closed 9 years ago
Thank you very much for your contribution, but sadly we cannot merge the pull request like this because it has several issues:
git commit --amend
if it has been the last commit.If these issues are fixed, we can look at the actual content of this PR. One possibility would be about:
git reset HEAD~7 --hard
git cherry-pick 0836091
git cherry-pick 4a2d9bd
git rebase -i HEAD~2
Now write replace the line pick 4a2d9bd
with fixup 4a2d9bd
and exit the editor.
Then push the changes back.
git push origin -f
I hope I didn't scare you away, but things have to be and stay clean. If you are having problems cleaning up this PR, I can push those changes in your name into this PR.
Thanks for the feedback and sorry for creating such a mess. I removed the other PRs and cleaned my commits.
This PR is a lot cleaner now and it is possible to see what have been done. Also the project structure is improved with the libraries folder.
It seems, that you have extracted all the android sdk properties into the android_commons.gradle. Wouldn't it be possible to extract these from the app/build.gradle too?
Except from my line comments, this PR looks fine now :+1:
I know that I'm nitpicking. Except for the unclean reverted commit, this PR should be ready to merge.
Manually merged into master without e7281a5 and a585b56.
I didn't saw the moved file in e7281a58972a3debbf18926cfe80c1b256d7dc7f. So reopened and merged.
Hi @Doplgangr @L-Henke ,
I cleaned up the project structure a little :
PS : because the .iml files are not committed to source control, you will still see the *aFileChooser,payme &PreferenceFragment folders in the root of the project. To fix this I usually delete all the **.iml* files and the build directories and re-import the project in Android Studio.
PPS : I have also included fixes from the previuos pull requests:
97 Edit "OurFileProvider"
108 Fixed menu not shown in vault list
109 Fixed multiple file deletes
110 Fixed gallery not sorted
111 Fixed vault list not shown in file import