Merge request #2: Added support for LiveFolder, changed a bit of layout on DepartureView, Sorting of Departures

I've added a LiveFolder that retrieves the last used stops from the database.
Sorting of Departures in DepartureView, first by platform, then by linenumber.
Changed to only show 5 departures pr stop
Added a linemodifier for some lines, especially on line 31E and 81B.

I seem to have some stability issues if going back from a DepartureView to the FavoriteStops, and then back into a DepartureView, but that I had before aswell, so I don't think it's new :)

Looking into refactoring the StopsDatabase into a proper Provider, but haven't gotten that far yet. For now the StopsProvider needed by the LiveFolder is using the StopsDatabase as is.

Requested by: Marius Gravdal
Status: Merged
Source repository: xoirams-trafikanten-android:master
Target repository: trafikanten-android:master
Created at: January 19th, 2010 12:50

Commits that would be merged:

Comments

→ State changed from Open to Merged

Great stuff, thanks a lot!
I made the platform headings a little smaller, hope it’s okay.

The new version (with support for the Tattoo?) is on the market now – thanks a million!

Marius Mårnes Mathiesen | 2010-01-21 15:42:34 UTC

Of course, it looks alot better with the grey aswell! :)

Marius Gravdal | 2010-01-22 14:15:19 UTC

How to apply this merge request to your repository

One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.

# Check out a new branch for integration
git checkout -b merge-requests/2

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/trafikanten/trafikanten-android.git \
  refs/merge-requests/2

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/2

# To apply the changes to your branch:
git checkout master
git merge merge-requests/2
git push origin master

	844fca3 Marius Gravdal about 2 years ago	platform is now part of grouping
	04aa646 Marius Gravdal about 2 years ago	added sorting by platform/linenumber
	44b5040 Marius Gravdal about 2 years ago	small changes
	6799a88 Marius Gravdal about 2 years ago	small changes
	d3582d4 Marius Gravdal about 2 years ago	uses E as a linemodifier instead of linenumbers > 2000
	f21e797 Marius Gravdal about 2 years ago	version update
	7700049 Marius Gravdal about 2 years ago	started livefolders, max five entries, headers now on station names
	0ea8f54 Marius Gravdal about 2 years ago	removed platformview from departureheader
	49f7620 Marius Gravdal about 2 years ago	refactored DepartureView to use an URI instead of an extra for stop, LiveFolders now working
	7b69fe8 Marius Gravdal about 2 years ago	small cosmetic changes
	49ca48f Marius Gravdal about 2 years ago	changed to use default Action.VIEW instead of custom
	8794752 Marius Gravdal about 2 years ago	missed the Folder and Provider for stops

Reviewing merge request #2: Added support for LiveFolder, changed a bit of layout on DepartureView, Sorting of Departures

Commits that would be merged:

Comments
Include comments entered inline

Add a new comment:

Gitorious

Reviewing merge request #2: Added support for LiveFolder, changed a bit of layout on DepartureView, Sorting of Departures

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline