ESE2013 Team 5

Project: Mensa@Unibe

Add your username behind the app name of your choice in parenthesis as your vote for the app name, e.g. Name (exside)

Taskpool

Let's have a To-Do list with individual tasks that can be assignes to team members

What do we need?

A common GitHub commit/merge strategy, PLEASE READ THE INSTRUCTIONS BELOW!!!
~~Common coding standards, suggested is PSR-2 (which is primarily for PHP, but is easily adoptable for Java)~~ (nicolas) I agree with having coding standarts however I dont think the formatting in the suggestion is useful (e.g.spaces insted of tabs) I would prefer if we list all explicitly needed standarts here somewhere (see bellow)
Requirements
Prototype / Wireframe

Write down all explicitly needed standards here:

The formatting should be the eclipse standard (press ctrl+shift+f for auto formatting)
Comment all Classes with javadoc (at least all the classes of the model)
Comment all non trivial public methods with javadoc (at least in the model)
Use //TODO to comment work in progress things. That way they will all be listed in the eclipse "Tasks" view.

Each team member forks the original repository to his own account to work on it
Clone the forked repository to your local machine
Work on the project, add and commit the changes to your local repository
Push the changes online to your forked master branch
Make a pull request against the original ese2013-team5 repositorys master branch (in the online interface via the green button)
Pull request should be merged only, if all team members have commented with +1 to give their vote, if this is the case the responsible for the pull request can merge the change into the projects master branch
Do the merging of pull request in the original repository via the web frontend, so nobody would have to fork the "real/original" repository and thus maybe make unintentional changes
For faster testing, it would be very handy if everybody could compile an actual .apk package that can be tested on a real device!

Terminal > cd to local project directory on your computer, check with git status that you are in the right directory!
Make an alias of the original project git remote add original https://github.com/ese-unibe-ch/ese2013-team5.git
Get the files from the original repository to your local repository with git fetch original
Merge the original with the local repository git merge original/master (it will open vim, just hit ESC, then type :w, then :q, the standard message is fine)
Push the changes to your own online repository/fork git push origin master

make the changes in the code
Terminal > cd to local repository if not there yet (you should probably have the most recent version synced before starting to work on it)
git status to see what's the current status of that repository
git add <file> or git add * (for all files) to add the changed files to a commit (seen via git status)
git commit -m "<commit message>" to commit the added changes and set the message that will appear on GitHub
git push origin master to upload the changes to the master branch of your online repository/fork on GitHub
go to your own online repository/fork and click the green "review/compare" button left to the branch dropdown
create a pull request against the original repository
you are taken to the original repository, if the change doesn't need approval of all team members you can merge your pull request on the presented page

Do not use your workspace project folder as the git repository! It will be a mess...if you have made and tested your changes to the code, copy the project files into your github repositories folder -> ProjectFiles
We want a multilanguage app, all strings should always be translated to german and english in their respecitve folders (res/values for english, res/values-de for german)