Merge lp://staging/~saturnreturn/tomdroid/freshen-ui into lp://staging/~tomdroid-dev/tomdroid/sync-ui

Proposed by Matt Stevenson
Status: Merged
Merged at revision: 240
Proposed branch: lp://staging/~saturnreturn/tomdroid/freshen-ui
Merge into: lp://staging/~tomdroid-dev/tomdroid/sync-ui
Diff against target: 1179 lines (+856/-43)
17 files modified
AndroidManifest.xml (+1/-3)
data/tomdroid-4.svg (+612/-0)
res/layout/actionbar.xml (+18/-3)
res/layout/main.xml (+6/-1)
res/layout/main_list_item.xml (+25/-6)
res/layout/note_view.xml (+25/-13)
res/values/arrays.xml (+11/-0)
res/values/strings.xml (+3/-1)
res/xml/preferences.xml (+5/-2)
src/org/tomdroid/Note.java (+3/-3)
src/org/tomdroid/NoteManager.java (+11/-5)
src/org/tomdroid/sync/SyncManager.java (+2/-2)
src/org/tomdroid/ui/PreferencesActivity.java (+5/-3)
src/org/tomdroid/ui/Tomdroid.java (+1/-0)
src/org/tomdroid/ui/ViewNote.java (+14/-1)
src/org/tomdroid/util/NoteListCursorAdapter.java (+113/-0)
src/org/tomdroid/util/Preferences.java (+1/-0)
To merge this branch: bzr merge lp://staging/~saturnreturn/tomdroid/freshen-ui
Reviewer Review Type Date Requested Status
Rodja (community) Approve
Review via email: mp+36668@code.staging.launchpad.net

Commit message

Merge freshen-ui branch

Description of the change

Show last modified date in note list.

Alternate background colours in note list.

Light background for note list and note view.

Redrawn icon.

To post a comment you must log in.
Revision history for this message
Rodja (trappe) wrote :

Hey Matt, I really like the changes you've made, but wonder why have you changed the Applications theme back to black, instead keeping it Light?

review: Needs Information
212. By Matthew Stevenson <matt@matt-desktop>

Change theme back to Light in manifest

Revision history for this message
Matt Stevenson (saturnreturn) wrote :

Ah, I didn't realise you could set a theme in the manifest like that - I
just assumed that all colours needed to be specified in the layout xml files
or in the code.

So, basically its a mistake... I've changed the theme back to what it was in
your branch (Light.NoTitleBar)

Is there anything else like this I've missed?

On 30 September 2010 20:28, Rodja <email address hidden> wrote:

> Review: Needs Information
> Hey Matt, I really like the changes you've made, but wonder why have you
> changed the Applications theme back to black, instead keeping it Light?
> --
> https://code.launchpad.net/~saturnreturn/tomdroid/freshen-ui/+merge/36668
> You are the owner of lp:~saturnreturn/tomdroid/freshen-ui.
>

Revision history for this message
Rodja (trappe) wrote :

All fine with me. Merge is done.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches