Skip to content

Conversation

@StelianMorariu
Copy link
Contributor

Hi @Doplgangr @L-Henke ,

I cleaned up the project structure a little :

  • moved all used libraries to a "libraries" folder
  • removed the sample app from the "payme" library
  • moved the payme library code directly to the "payme" folder
  • organized the payme source code to match AndroidStudio format
  • added .gitignore files for each module

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:

Written with StackEdit.

@L-Henke
Copy link
Contributor

L-Henke commented Mar 14, 2015

Thank you very much for your contribution, but sadly we cannot merge the pull request like this because it has several issues:

  • You included other PRs, which should never be done unless there is a really good reason
  • You changed the author of the commit from the other PRs to yourself, instead of committing them using the original author.
  • A commit like this "it would be nice if I actually added the files to git" should be included into the original commit via a fixup commit and an interactive rebase or just 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.

@StelianMorariu
Copy link
Contributor Author

Thanks for the feedback and sorry for creating such a mess.
I removed the other PRs and cleaned my commits.

@L-Henke
Copy link
Contributor

L-Henke commented Mar 14, 2015

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?

app/build.gradle Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some unneeded newline in this file.

@L-Henke
Copy link
Contributor

L-Henke commented Mar 14, 2015

Except from my line comments, this PR looks fine now 👍

@StelianMorariu StelianMorariu mentioned this pull request Mar 14, 2015
@L-Henke
Copy link
Contributor

L-Henke commented Mar 14, 2015

I know that I'm nitpicking. Except for the unclean reverted commit, this PR should be ready to merge.

@L-Henke
Copy link
Contributor

L-Henke commented Mar 14, 2015

Manually merged into master without e7281a5 and a585b56.

@L-Henke L-Henke closed this Mar 14, 2015
@L-Henke L-Henke reopened this Mar 14, 2015
@L-Henke
Copy link
Contributor

L-Henke commented Mar 14, 2015

I didn't saw the moved file in e7281a5. So reopened and merged.

@L-Henke L-Henke merged commit 0022e1f into SecrecySupportTeam:master Mar 14, 2015
@StelianMorariu StelianMorariu deleted the smo_cleanup branch May 2, 2015 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants