Tomdroid

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

  1. freshen-ui
  2. Merge into sync-ui
Proposed by Matt Stevenson
Status: Merged
Merged at revision: 240
Proposed branch: lp:~saturnreturn/tomdroid/freshen-ui
Merge into: lp:~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:~saturnreturn/tomdroid/freshen-ui
Reviewer Review Type Date Requested Status
Rodja (community) Approve
Review via email: mp+36668@code.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
lp:~saturnreturn/tomdroid/freshen-ui updated
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
1=== modified file 'AndroidManifest.xml'
2--- AndroidManifest.xml 2010-08-16 22:13:00 +0000
3+++ AndroidManifest.xml 2010-09-30 19:43:47 +0000
4@@ -11,9 +11,7 @@
5 <application
6 android:icon="@drawable/icon"
7 android:label="@string/app_name"
8- android:theme="@android:style/Theme.Light.NoTitleBar"
9- android:debuggable="true"
10- >
11+ android:theme="@android:style/Theme.Light.NoTitleBar">
12
13 <activity android:label="@string/app_name"
14 android:name=".ui.Tomdroid"
15
16=== added file 'data/tomdroid-4.svg'
17--- data/tomdroid-4.svg 1970-01-01 00:00:00 +0000
18+++ data/tomdroid-4.svg 2010-09-30 19:43:47 +0000
19@@ -0,0 +1,612 @@
20+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
21+<!-- Created with Inkscape (http://www.inkscape.org/) -->
22+
23+<svg
24+ xmlns:dc="http://purl.org/dc/elements/1.1/"
25+ xmlns:cc="http://creativecommons.org/ns#"
26+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
27+ xmlns:svg="http://www.w3.org/2000/svg"
28+ xmlns="http://www.w3.org/2000/svg"
29+ xmlns:xlink="http://www.w3.org/1999/xlink"
30+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
31+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
32+ width="48"
33+ height="48"
34+ id="svg2394"
35+ sodipodi:version="0.32"
36+ inkscape:version="0.47 r22583"
37+ version="1.0"
38+ sodipodi:docname="tomdroid-4.png"
39+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
40+ inkscape:export-filename="/data/code/android/web-sync/res/drawable/tomdroid-4.png"
41+ inkscape:export-xdpi="90"
42+ inkscape:export-ydpi="90">
43+ <defs
44+ id="defs2396">
45+ <inkscape:perspective
46+ sodipodi:type="inkscape:persp3d"
47+ inkscape:vp_x="0 : 526.18109 : 1"
48+ inkscape:vp_y="0 : 1000 : 0"
49+ inkscape:vp_z="744.09448 : 526.18109 : 1"
50+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
51+ id="perspective2402" />
52+ <linearGradient
53+ id="linearGradient6377">
54+ <stop
55+ id="stop6379"
56+ offset="0"
57+ style="stop-color:#fff27e;stop-opacity:1;" />
58+ <stop
59+ id="stop6381"
60+ offset="1"
61+ style="stop-color:#edd400;stop-opacity:1;" />
62+ </linearGradient>
63+ <linearGradient
64+ id="linearGradient2966">
65+ <stop
66+ style="stop-color:#ffd1d1;stop-opacity:1;"
67+ offset="0"
68+ id="stop2968" />
69+ <stop
70+ id="stop3006"
71+ offset="0.5"
72+ style="stop-color:#ff1d1d;stop-opacity:1;" />
73+ <stop
74+ style="stop-color:#6f0000;stop-opacity:1;"
75+ offset="1"
76+ id="stop2970" />
77+ </linearGradient>
78+ <linearGradient
79+ id="linearGradient2974">
80+ <stop
81+ style="stop-color:#c1c1c1;stop-opacity:1;"
82+ offset="0"
83+ id="stop2976" />
84+ <stop
85+ style="stop-color:#acacac;stop-opacity:1;"
86+ offset="1"
87+ id="stop2978" />
88+ </linearGradient>
89+ <linearGradient
90+ id="linearGradient2994">
91+ <stop
92+ style="stop-color:#000000;stop-opacity:1;"
93+ offset="0"
94+ id="stop2996" />
95+ <stop
96+ style="stop-color:#c9c9c9;stop-opacity:1;"
97+ offset="1"
98+ id="stop2998" />
99+ </linearGradient>
100+ <inkscape:perspective
101+ id="perspective2705"
102+ inkscape:persp3d-origin="24 : 16 : 1"
103+ inkscape:vp_z="48 : 24 : 1"
104+ inkscape:vp_y="0 : 1000 : 0"
105+ inkscape:vp_x="0 : 24 : 1"
106+ sodipodi:type="inkscape:persp3d" />
107+ <inkscape:perspective
108+ id="perspective3103"
109+ inkscape:persp3d-origin="60 : 46.666667 : 1"
110+ inkscape:vp_z="120 : 70 : 1"
111+ inkscape:vp_y="0 : 1000 : 0"
112+ inkscape:vp_x="0 : 70 : 1"
113+ sodipodi:type="inkscape:persp3d" />
114+ <radialGradient
115+ gradientUnits="userSpaceOnUse"
116+ gradientTransform="matrix(1,0,0,0.361345,0,22.29694)"
117+ r="5.2591065"
118+ fy="31.780704"
119+ fx="39.907337"
120+ cy="31.780704"
121+ cx="39.907337"
122+ id="radialGradient6423"
123+ xlink:href="#linearGradient6417"
124+ inkscape:collect="always" />
125+ <radialGradient
126+ gradientUnits="userSpaceOnUse"
127+ gradientTransform="matrix(10.88255,-6.454846e-8,0,11.39737,-433.5968,-381.3811)"
128+ r="20.21875"
129+ fy="35.90107"
130+ fx="43.875"
131+ cy="35.90107"
132+ cx="43.875"
133+ id="radialGradient6413"
134+ xlink:href="#linearGradient6407"
135+ inkscape:collect="always" />
136+ <radialGradient
137+ r="21.626934"
138+ fy="35.915409"
139+ fx="45.150326"
140+ cy="35.915409"
141+ cx="45.150326"
142+ gradientTransform="matrix(1.669712,0,1.702451e-8,1.220484,-30.23773,-11.79928)"
143+ gradientUnits="userSpaceOnUse"
144+ id="radialGradient6405"
145+ xlink:href="#linearGradient6377"
146+ inkscape:collect="always" />
147+ <linearGradient
148+ gradientUnits="userSpaceOnUse"
149+ y2="67.031342"
150+ x2="26.130388"
151+ y1="14.08672"
152+ x1="26.213203"
153+ id="linearGradient5615"
154+ xlink:href="#linearGradient5609"
155+ inkscape:collect="always" />
156+ <linearGradient
157+ id="linearGradient5609"
158+ inkscape:collect="always">
159+ <stop
160+ id="stop5611"
161+ offset="0"
162+ style="stop-color:white;stop-opacity:1;" />
163+ <stop
164+ id="stop5613"
165+ offset="1"
166+ style="stop-color:white;stop-opacity:0;" />
167+ </linearGradient>
168+ <linearGradient
169+ id="linearGradient3342">
170+ <stop
171+ id="stop3344"
172+ offset="0"
173+ style="stop-color:#fff27e;stop-opacity:1;" />
174+ <stop
175+ id="stop3346"
176+ offset="1"
177+ style="stop-color:#edd400;stop-opacity:1;" />
178+ </linearGradient>
179+ <linearGradient
180+ id="linearGradient6407"
181+ inkscape:collect="always">
182+ <stop
183+ id="stop6409"
184+ offset="0"
185+ style="stop-color:white;stop-opacity:1;" />
186+ <stop
187+ id="stop6411"
188+ offset="1"
189+ style="stop-color:white;stop-opacity:0;" />
190+ </linearGradient>
191+ <linearGradient
192+ id="linearGradient6417"
193+ inkscape:collect="always">
194+ <stop
195+ id="stop6419"
196+ offset="0"
197+ style="stop-color:black;stop-opacity:1;" />
198+ <stop
199+ id="stop6421"
200+ offset="1"
201+ style="stop-color:black;stop-opacity:0;" />
202+ </linearGradient>
203+ <linearGradient
204+ id="linearGradient3326">
205+ <stop
206+ style="stop-color:#ffd1d1;stop-opacity:1;"
207+ offset="0"
208+ id="stop3328" />
209+ <stop
210+ id="stop3330"
211+ offset="0.5"
212+ style="stop-color:#ff1d1d;stop-opacity:1;" />
213+ <stop
214+ style="stop-color:#6f0000;stop-opacity:1;"
215+ offset="1"
216+ id="stop3332" />
217+ </linearGradient>
218+ <linearGradient
219+ id="linearGradient3319">
220+ <stop
221+ style="stop-color:#c1c1c1;stop-opacity:1;"
222+ offset="0"
223+ id="stop3321" />
224+ <stop
225+ style="stop-color:#acacac;stop-opacity:1;"
226+ offset="1"
227+ id="stop3323" />
228+ </linearGradient>
229+ <linearGradient
230+ inkscape:collect="always"
231+ id="linearGradient2984">
232+ <stop
233+ style="stop-color:#e7e2b8;stop-opacity:1;"
234+ offset="0"
235+ id="stop2986" />
236+ <stop
237+ style="stop-color:#e7e2b8;stop-opacity:0;"
238+ offset="1"
239+ id="stop2988" />
240+ </linearGradient>
241+ <linearGradient
242+ id="linearGradient3308">
243+ <stop
244+ style="stop-color:#000000;stop-opacity:1;"
245+ offset="0"
246+ id="stop3310" />
247+ <stop
248+ style="stop-color:#c9c9c9;stop-opacity:1;"
249+ offset="1"
250+ id="stop3312" />
251+ </linearGradient>
252+ <inkscape:perspective
253+ id="perspective3305"
254+ inkscape:persp3d-origin="24 : 16 : 1"
255+ inkscape:vp_z="48 : 24 : 1"
256+ inkscape:vp_y="0 : 1000 : 0"
257+ inkscape:vp_x="0 : 24 : 1"
258+ sodipodi:type="inkscape:persp3d" />
259+ <linearGradient
260+ inkscape:collect="always"
261+ xlink:href="#linearGradient2966"
262+ id="linearGradient4272"
263+ gradientUnits="userSpaceOnUse"
264+ gradientTransform="translate(-5.669292,0)"
265+ x1="48.90625"
266+ y1="17.376184"
267+ x2="50.988335"
268+ y2="22.250591" />
269+ <linearGradient
270+ inkscape:collect="always"
271+ xlink:href="#linearGradient2974"
272+ id="linearGradient4274"
273+ gradientUnits="userSpaceOnUse"
274+ gradientTransform="translate(-5.669292,0)"
275+ x1="46"
276+ y1="19.8125"
277+ x2="47.6875"
278+ y2="22.625" />
279+ <radialGradient
280+ inkscape:collect="always"
281+ xlink:href="#linearGradient2984"
282+ id="radialGradient4276"
283+ gradientUnits="userSpaceOnUse"
284+ gradientTransform="matrix(2.923565,0,0,2.029717,-61.55532,-27.88417)"
285+ cx="29.053354"
286+ cy="27.640751"
287+ fx="29.053354"
288+ fy="27.640751"
289+ r="3.2408544" />
290+ <linearGradient
291+ inkscape:collect="always"
292+ xlink:href="#linearGradient2994"
293+ id="linearGradient4278"
294+ gradientUnits="userSpaceOnUse"
295+ gradientTransform="translate(-5.825542,0.125)"
296+ x1="25.71875"
297+ y1="31.046875"
298+ x2="25.514589"
299+ y2="30.703125" />
300+ <inkscape:perspective
301+ id="perspective5044"
302+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
303+ inkscape:vp_z="1 : 0.5 : 1"
304+ inkscape:vp_y="0 : 1000 : 0"
305+ inkscape:vp_x="0 : 0.5 : 1"
306+ sodipodi:type="inkscape:persp3d" />
307+ <inkscape:perspective
308+ id="perspective5252"
309+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
310+ inkscape:vp_z="1 : 0.5 : 1"
311+ inkscape:vp_y="0 : 1000 : 0"
312+ inkscape:vp_x="0 : 0.5 : 1"
313+ sodipodi:type="inkscape:persp3d" />
314+ <inkscape:perspective
315+ id="perspective5278"
316+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
317+ inkscape:vp_z="1 : 0.5 : 1"
318+ inkscape:vp_y="0 : 1000 : 0"
319+ inkscape:vp_x="0 : 0.5 : 1"
320+ sodipodi:type="inkscape:persp3d" />
321+ <inkscape:perspective
322+ id="perspective5380"
323+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
324+ inkscape:vp_z="1 : 0.5 : 1"
325+ inkscape:vp_y="0 : 1000 : 0"
326+ inkscape:vp_x="0 : 0.5 : 1"
327+ sodipodi:type="inkscape:persp3d" />
328+ <inkscape:perspective
329+ id="perspective5404"
330+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
331+ inkscape:vp_z="1 : 0.5 : 1"
332+ inkscape:vp_y="0 : 1000 : 0"
333+ inkscape:vp_x="0 : 0.5 : 1"
334+ sodipodi:type="inkscape:persp3d" />
335+ <inkscape:perspective
336+ id="perspective5433"
337+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
338+ inkscape:vp_z="1 : 0.5 : 1"
339+ inkscape:vp_y="0 : 1000 : 0"
340+ inkscape:vp_x="0 : 0.5 : 1"
341+ sodipodi:type="inkscape:persp3d" />
342+ <inkscape:perspective
343+ id="perspective5459"
344+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
345+ inkscape:vp_z="1 : 0.5 : 1"
346+ inkscape:vp_y="0 : 1000 : 0"
347+ inkscape:vp_x="0 : 0.5 : 1"
348+ sodipodi:type="inkscape:persp3d" />
349+ <inkscape:perspective
350+ id="perspective5509"
351+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
352+ inkscape:vp_z="1 : 0.5 : 1"
353+ inkscape:vp_y="0 : 1000 : 0"
354+ inkscape:vp_x="0 : 0.5 : 1"
355+ sodipodi:type="inkscape:persp3d" />
356+ <inkscape:perspective
357+ id="perspective5564"
358+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
359+ inkscape:vp_z="1 : 0.5 : 1"
360+ inkscape:vp_y="0 : 1000 : 0"
361+ inkscape:vp_x="0 : 0.5 : 1"
362+ sodipodi:type="inkscape:persp3d" />
363+ </defs>
364+ <sodipodi:namedview
365+ id="base"
366+ pagecolor="#ffffff"
367+ bordercolor="#666666"
368+ borderopacity="1.0"
369+ inkscape:pageopacity="0.0"
370+ inkscape:pageshadow="2"
371+ inkscape:zoom="7.9195959"
372+ inkscape:cx="25.379657"
373+ inkscape:cy="34.644751"
374+ inkscape:document-units="px"
375+ inkscape:current-layer="layer1"
376+ showgrid="false"
377+ inkscape:window-width="1280"
378+ inkscape:window-height="976"
379+ inkscape:window-x="0"
380+ inkscape:window-y="25"
381+ inkscape:window-maximized="1" />
382+ <metadata
383+ id="metadata2399">
384+ <rdf:RDF>
385+ <cc:Work
386+ rdf:about="">
387+ <dc:format>image/svg+xml</dc:format>
388+ <dc:type
389+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
390+ <dc:title></dc:title>
391+ <dc:date>2009-04-02</dc:date>
392+ <dc:creator>
393+ <cc:Agent>
394+ <dc:title>Olivier Bilodeau</dc:title>
395+ </cc:Agent>
396+ </dc:creator>
397+ <dc:description>A mashup of Tomboy's icon and Android's logo. Both available under free licences.</dc:description>
398+ </cc:Work>
399+ </rdf:RDF>
400+ </metadata>
401+ <g
402+ inkscape:label="Calque 1"
403+ inkscape:groupmode="layer"
404+ id="layer1">
405+ <g
406+ id="g4242"
407+ transform="translate(-0.1684169,3.5830001)">
408+ <path
409+ sodipodi:nodetypes="ccccccccccc"
410+ id="rect1975"
411+ d="m 10.301452,14.596007 28.649253,0.353553 c 0.762577,0 1.24391,0.576646 1.376493,1.193837 0,0 4.40133,19.815144 4.40133,19.815144 0,0 0.01246,6.347622 0.01246,6.347622 0,0.661386 -0.613915,1.193837 -1.376492,1.193837 l -37.4768304,0 C 5.1250868,43.5 4.5111713,42.967549 4.5111713,42.306163 L 4.4999999,36.139247 8.9249601,15.789844 c 0.3093592,-0.661386 0.6139156,-1.193837 1.3764919,-1.193837 z"
412+ style="fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
413+ <rect
414+ ry="0.67937863"
415+ rx="0.67937863"
416+ y="35.957905"
417+ x="5.1146202"
418+ height="7.0714951"
419+ width="39.048077"
420+ id="rect2851"
421+ style="opacity:0.37078654;fill:#f57900;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
422+ <path
423+ sodipodi:nodetypes="ccccccc"
424+ id="path2853"
425+ d="m 5.0643333,36.53243 c 0,0 0.1508618,-0.53033 0.704022,-0.574524 l 37.5646027,0 c 0.754309,0 0.804596,0.751301 0.804596,0.751301 0,0 0.0236,-1.619573 -1.283871,-1.619573 l -36.4118845,0 c -1.0057457,0.08839 -1.3774652,0.779883 -1.3774652,1.442796 z"
426+ style="opacity:0.16292138;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
427+ <path
428+ id="path4730"
429+ d="m 10.3125,15.59375 c -0.151316,0 -0.09946,-0.02674 -0.15625,0.03125 -0.05088,0.05195 -0.155811,0.275085 -0.28125,0.53125 -0.014579,0.02977 -0.016184,0.03029 -0.03125,0.0625 L 5.5,36.125 l 0,0.0625 0,6.125 C 5.5,42.35657 5.572368,42.5 5.875,42.5 l 37.5,0 c 0.302632,0 0.375,-0.143429 0.375,-0.1875 0,0 -0.03035,-6.068147 -0.03125,-6.25 -2.51e-4,-0.0011 4.27e-4,-0.09183 0,-0.09375 C 43.625157,35.547912 39.34375,16.375 39.34375,16.375 39.2872,16.111751 39.174175,15.9375 38.9375,15.9375 l -28.625,-0.34375 z"
430+ style="opacity:0.4831461;fill:none;stroke:url(#linearGradient5615);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
431+ <path
432+ sodipodi:nodetypes="cccc"
433+ id="path6415"
434+ d="M 44.194174,35.681088 C 43.814854,34.425759 43.31029,31.880389 43.31029,31.880389 l -8.927222,3.181981 c 5.745243,0 8.573669,-0.265165 9.811106,0.618718 z"
435+ style="opacity:0.46629214;fill:url(#radialGradient6423);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
436+ <path
437+ style="fill:url(#radialGradient6405);fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:0.99999964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
438+ d="m 8.7832195,16.426565 -4.13483,18.029279 c 0,0 21.4716075,0.125001 29.2755775,0.125001 7.980569,0 11.155067,-2.96842 11.155067,-2.96842 0,0 -1.006743,-0.453488 -2.325109,-4.966721 0,0 -2.403785,-10.500389 -2.403785,-10.500389 -0.463441,-1.186401 -0.856206,-1.663669 -1.75639,-1.65625 l -27.78125,0 c -1.7452746,0.03209 -1.7364187,0.835552 -2.0292805,1.9375 z"
439+ id="path2524"
440+ sodipodi:nodetypes="cczczcccc" />
441+ <path
442+ id="path6403"
443+ d="m 10.8125,15.5 c -0.640289,0.01823 -0.708297,0.09979 -0.75,0.15625 C 10.01913,15.71497 9.9124269,16.076338 9.75,16.6875 L 5.90625,33.46875 c 1.6944357,0.0098 20.570644,0.125 28.03125,0.125 3.866286,0 6.517278,-0.714302 8.1875,-1.40625 1.054074,-0.436687 1.113325,-0.577029 1.4375,-0.8125 -0.490628,-0.789905 -1.105041,-2.122597 -1.78125,-4.4375 -6.51e-4,-0.02083 -6.51e-4,-0.04167 0,-0.0625 0,0 -2.305929,-10.042349 -2.375,-10.34375 C 39.192263,15.983448 39.024353,15.680487 38.9375,15.59375 38.85065,15.50701 38.86595,15.49776 38.59375,15.5 l -27.75,0 -0.03125,0 z"
444+ style="opacity:0.46629214;fill:none;stroke:url(#radialGradient6413);stroke-width:0.99999964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
445+ <path
446+ style="opacity:0.26404497;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
447+ d="m 5.0643333,38.53243 c 0,0 0.1508618,-0.53033 0.704022,-0.574524 l 37.5646027,0 c 0.754309,0 0.804596,0.751301 0.804596,0.751301 0,0 0.0236,-1.619573 -1.283871,-1.619573 l -36.4118845,0 c -1.0057457,0.08839 -1.3774652,0.779883 -1.3774652,1.442796 z"
448+ id="path6359"
449+ sodipodi:nodetypes="ccccccc" />
450+ <path
451+ sodipodi:nodetypes="ccccccc"
452+ id="path6361"
453+ d="m 5.0643333,40.53243 c 0,0 0.1508618,-0.53033 0.704022,-0.574524 l 37.5646027,0 c 0.754309,0 0.804596,0.751301 0.804596,0.751301 0,0 0.0236,-1.619573 -1.283871,-1.619573 l -36.4118845,0 c -1.0057457,0.08839 -1.3774652,0.779883 -1.3774652,1.442796 z"
454+ style="opacity:0.26404497;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
455+ <path
456+ style="opacity:0.26404497;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
457+ d="m 5.0643333,42.53243 c 0,0 0.1508618,-0.53033 0.704022,-0.574524 l 37.5646027,0 c 0.754309,0 0.804596,0.751301 0.804596,0.751301 0,0 0.0236,-1.619573 -1.283871,-1.619573 l -36.4118845,0 c -1.0057457,0.08839 -1.3774652,0.779883 -1.3774652,1.442796 z"
458+ id="path6363"
459+ sodipodi:nodetypes="ccccccc" />
460+ </g>
461+ <g
462+ id="g4166-6"
463+ transform="matrix(1.0098472,0,0,0.98902752,-298.47562,-483.65964)"
464+ style="fill:#c4a000;fill-opacity:1;stroke:none" />
465+ <g
466+ id="g3106"
467+ inkscape:label="Layer 1"
468+ transform="matrix(0.9894224,0,0,0.9894224,86.886011,8.4726515)">
469+ <g
470+ transform="translate(-299.00515,-503.07627)"
471+ id="g3279" />
472+ </g>
473+ <path
474+ style="fill:#d40000;fill-opacity:1;stroke:#ffffff;stroke-width:1.70000005;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
475+ d="m 29.78125,1.0249519 c -0.200346,-0.00693 -0.393078,0.104186 -0.5,0.3125001 l -1.375,2.65625 c -1.068903,-0.3679226 -2.237706,-0.5625 -3.46875,-0.5625 -1.366399,0 -2.652232,0.2394169 -3.8125,0.6875 l -1.40625,-2.75 C 19.076187,1.0909499 18.780186,0.99092944 18.53125,1.1187019 18.282314,1.2464745 18.169937,1.5597 18.3125,1.837452 l 1.40625,2.6875 c -2.563621,1.3037284 -4.28125,3.6451702 -4.28125,6.3125 0,0.224276 0.03887,0.43704 0.0625,0.65625 l 17.875,0 c 0.02363,-0.21921 0.0625,-0.431974 0.0625,-0.65625 0,-2.7740229 -1.857873,-5.1997008 -4.59375,-6.46875 l 1.3125,-2.5625 c 0.142563,-0.277752 0.06144,-0.6222276 -0.1875,-0.7500001 -0.06223,-0.031943 -0.120718,-0.028941 -0.1875,-0.03125 z m -16.875,10.7500001 c -1.101761,0 -2,0.898239 -2,2 l 0,8.40625 c 0,1.101761 0.898239,2 2,2 1.101761,0 1.96875,-0.898239 1.96875,-2 l 0,-8.40625 c 0,-1.101761 -0.866989,-2 -1.96875,-2 z m 22.9375,0.15625 c -1.101761,0 -2,0.866989 -2,1.96875 l 0,8.4375 c 0,1.101761 0.898239,2 2,2 1.101761,0 2,-0.898239 2,-2 l 0,-8.4375 c 0,-1.101761 -0.898239,-1.96875 -2,-1.96875 z m -20.21875,0.1875 0,1.15625 0,0.34375 0,1.4375 0,6.25 0,3.75 c 0,1.19785 0.9584,2.15625 2.15625,2.15625 l 1.4375,0 0,4.625 c 0,0.943048 0.744452,1.6875 1.6875,1.6875 l 0.59375,0 c 0.943048,0 1.71875,-0.744452 1.71875,-1.6875 l 0,-4.625 2.5625,0 0,4.59375 c 0,0.943048 0.775702,1.71875 1.71875,1.71875 l 0.59375,0 c 0.943048,0 1.71875,-0.775702 1.71875,-1.71875 l 0,-4.59375 1.1875,0 c 1.19785,0 2.1875,-0.9584 2.1875,-2.15625 l 0,-3.75 0,-6.25 0,-1.78125 0,-1.15625 -17.5625,0 z"
476+ id="rect5365-8" />
477+ <g
478+ id="g5488"
479+ style="stroke:none"
480+ transform="translate(0,0.39995194)">
481+ <path
482+ id="rect5365"
483+ d="m 15.65625,11.75 0,1.15625 0,0.34375 0,1.4375 0,6.25 0,3.75 c 0,1.19785 0.9584,2.15625 2.15625,2.15625 l 13.21875,0 c 1.19785,0 2.1875,-0.9584 2.1875,-2.15625 l 0,-3.75 0,-6.25 0,-1.78125 0,-1.15625 -17.5625,0 z"
484+ style="fill:#97c024;fill-opacity:1;stroke:none" />
485+ <rect
486+ rx="1.7022525"
487+ y="23.661636"
488+ x="19.224466"
489+ height="9.5017471"
490+ width="4.0090432"
491+ id="rect5370"
492+ style="fill:#97c024;fill-opacity:1;stroke:none" />
493+ <rect
494+ rx="1.7022525"
495+ y="23.645853"
496+ x="25.80624"
497+ height="9.5017471"
498+ width="4.0090432"
499+ id="rect5370-3"
500+ style="fill:#97c024;fill-opacity:1;stroke:none" />
501+ <rect
502+ rx="1.9887384"
503+ y="11.413537"
504+ x="10.922275"
505+ height="12.405936"
506+ width="3.9774768"
507+ id="rect5394"
508+ style="fill:#97c024;fill-opacity:1;stroke:none" />
509+ <rect
510+ rx="1.9887384"
511+ y="11.55559"
512+ x="33.871677"
513+ height="12.405936"
514+ width="3.9774768"
515+ id="rect5394-2"
516+ style="fill:#97c024;fill-opacity:1;stroke:none" />
517+ <g
518+ transform="translate(-0.20025,0)"
519+ id="g5481"
520+ style="stroke:none">
521+ <path
522+ style="fill:#97c024;fill-opacity:1;stroke:none"
523+ d="m 24.65625,3.0625 c -4.968725,0 -9,3.3092317 -9,7.40625 0,0.224276 0.03887,0.43704 0.0625,0.65625 l 17.875,0 c 0.02363,-0.21921 0.0625,-0.431974 0.0625,-0.65625 0,-4.0970183 -4.031275,-7.40625 -9,-7.40625 z"
524+ id="path5418" />
525+ <path
526+ sodipodi:type="arc"
527+ style="fill:#ffffff;fill-opacity:1;stroke:none"
528+ id="path5449"
529+ sodipodi:cx="21.37104"
530+ sodipodi:cy="8.3357286"
531+ sodipodi:rx="0.78918165"
532+ sodipodi:ry="0.77339804"
533+ d="m 22.160222,8.3357286 c 0,0.427136 -0.353329,0.7733981 -0.789182,0.7733981 -0.435853,0 -0.789181,-0.3462621 -0.789181,-0.7733981 0,-0.4271359 0.353328,-0.773398 0.789181,-0.773398 0.435853,0 0.789182,0.3462621 0.789182,0.773398 z"
534+ transform="matrix(1.0212245,0,0,1.0212245,-1.4154165,-1.4231952)" />
535+ <path
536+ sodipodi:type="arc"
537+ style="fill:#ffffff;fill-opacity:1;stroke:none"
538+ id="path5449-6"
539+ sodipodi:cx="21.37104"
540+ sodipodi:cy="8.3357286"
541+ sodipodi:rx="0.78918165"
542+ sodipodi:ry="0.77339804"
543+ d="m 22.160222,8.3357286 c 0,0.427136 -0.353329,0.7733981 -0.789182,0.7733981 -0.435853,0 -0.789181,-0.3462621 -0.789181,-0.7733981 0,-0.4271359 0.353328,-0.773398 0.789181,-0.773398 0.435853,0 0.789182,0.3462621 0.789182,0.773398 z"
544+ transform="matrix(1.0212245,0,0,1.0212245,6.7121839,-1.4238284)" />
545+ <rect
546+ style="fill:#97c024;fill-opacity:1;stroke:none"
547+ id="rect5423"
548+ width="1.0101534"
549+ height="5.0507627"
550+ x="15.824705"
551+ y="9.2116003"
552+ rx="0.50507671"
553+ transform="matrix(0.88965349,-0.45663625,0.45663625,0.88965349,0,0)"
554+ ry="0.56354231" />
555+ <rect
556+ style="fill:#97c024;fill-opacity:1;stroke:none"
557+ id="rect5423-6"
558+ width="1.0101534"
559+ height="5.0507627"
560+ x="-27.690969"
561+ y="-13.159358"
562+ rx="0.50507671"
563+ transform="matrix(-0.88965349,-0.45663625,-0.45663625,0.88965349,0,0)"
564+ ry="0.56354231" />
565+ </g>
566+ </g>
567+ <g
568+ style="display:inline"
569+ id="g1574"
570+ transform="matrix(0.7113809,-0.1906141,0.1906141,0.7113809,19.866431,-7.0127809)"
571+ inkscape:r_cx="true"
572+ inkscape:r_cy="true">
573+ <path
574+ transform="translate(-29.75546,19)"
575+ sodipodi:nodetypes="cccccc"
576+ id="path2960"
577+ d="m 17.34116,32.5 5.625,-5.625 20.093749,-9.75 c 3.25,-1.25 5.1875,3.375 2.3125,5 L 25.34116,31.5 l -8,1 z"
578+ style="fill:#cb9022;fill-opacity:1;fill-rule:evenodd;stroke:#5c410c;stroke-width:0.93443578;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
579+ inkscape:r_cx="true"
580+ inkscape:r_cy="true" />
581+ <path
582+ transform="translate(-29.75546,19)"
583+ style="fill:url(#linearGradient4272);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
584+ d="m 38.330708,20 c 0,0 1.4375,0.09375 2,1.34375 0.579493,1.287761 0,2.65625 0,2.65625 l 5.03125,-2.46875 c 0,0 1.452032,-0.881367 0.65625,-2.84375 -0.784912,-1.935577 -2.6875,-1.15625 -2.6875,-1.15625 l -5,2.46875 z"
585+ id="path2964"
586+ sodipodi:nodetypes="czcczcc"
587+ inkscape:r_cx="true"
588+ inkscape:r_cy="true" />
589+ <path
590+ transform="translate(-29.75546,19)"
591+ sodipodi:nodetypes="czcczcc"
592+ id="path2962"
593+ d="m 38.330708,20 c 0,0 1.4375,0.09375 2,1.34375 0.579493,1.287761 0,2.65625 0,2.65625 l 2,-1 c 0,0 0.827032,-1.318867 0.21875,-2.6875 C 41.924458,18.90625 40.330708,19 40.330708,19 l -2,1 z"
594+ style="fill:url(#linearGradient4274);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
595+ inkscape:r_cx="true"
596+ inkscape:r_cy="true" />
597+ <path
598+ transform="translate(-29.75546,19)"
599+ sodipodi:nodetypes="cccc"
600+ id="path2982"
601+ d="m 18.768208,31.78125 4.5,-4.5 c 1.5,0.8125 2.28125,2.15625 1.875,3.71875 l -6.375,0.78125 z"
602+ style="fill:url(#radialGradient4276);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
603+ inkscape:r_cx="true"
604+ inkscape:r_cy="true" />
605+ <path
606+ transform="translate(-29.75546,19)"
607+ sodipodi:nodetypes="cccc"
608+ id="path2992"
609+ d="m 20.111958,30.375 -1.625,1.59375 2.34375,-0.3125 c 0.21875,-0.71875 -0.1875,-1.0625 -0.71875,-1.28125 z"
610+ style="fill:url(#linearGradient4278);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
611+ inkscape:r_cx="true"
612+ inkscape:r_cy="true" />
613+ <path
614+ transform="translate(-29.75546,19)"
615+ sodipodi:nodetypes="ccccc"
616+ id="path3002"
617+ d="m 23.268208,27.25 1.5625,1.25 15.38734,-7.31867 C 39.773616,20.325286 38.976281,20.096733 38.314669,20.019068 L 23.268208,27.25 z"
618+ style="fill:#ffffff;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
619+ inkscape:r_cx="true"
620+ inkscape:r_cy="true" />
621+ <path
622+ transform="translate(-29.75546,19)"
623+ sodipodi:nodetypes="ccccc"
624+ id="path3004"
625+ d="m 25.143208,31.0625 0.1875,-0.75 15.23109,-7.1296 c 0,0 -0.11016,0.613627 -0.215879,0.74935 L 25.143208,31.0625 z"
626+ style="fill:#000000;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
627+ inkscape:r_cx="true"
628+ inkscape:r_cy="true" />
629+ </g>
630+ </g>
631+</svg>
632
633=== modified file 'res/drawable/icon.png'
634Binary files res/drawable/icon.png 2009-04-03 03:19:35 +0000 and res/drawable/icon.png 2010-09-30 19:43:47 +0000 differ
635=== modified file 'res/layout/actionbar.xml'
636--- res/layout/actionbar.xml 2010-08-25 19:43:16 +0000
637+++ res/layout/actionbar.xml 2010-09-30 19:43:47 +0000
638@@ -28,14 +28,29 @@
639 android:background="#ddd"
640 android:gravity="center_horizontal"
641 android:orientation="horizontal">
642+ <ImageView
643+ android:id="@+id/action_icon"
644+ android:src="@drawable/icon"
645+ android:layout_height="wrap_content"
646+ android:layout_width="wrap_content"
647+ android:scaleType="fitStart"
648+ android:padding="4dip"
649+ />
650 <TextView
651 android:id="@+id/title"
652 android:text="Tomdroid"
653- android:layout_margin="6dip"
654- android:layout_marginLeft="5dip"
655+ android:layout_marginLeft="42dip"
656 android:layout_height="wrap_content"
657 android:layout_width="wrap_content"
658- android:textSize="24dip"
659+ android:textSize="18dip"
660+ android:textStyle="bold"
661+ android:textColor="#FF555555"
662+ android:singleLine="true"
663+ android:ellipsize="marquee"
664+ android:fadingEdge="horizontal"
665+ android:fadingEdgeLength="5mm"
666+ android:paddingTop="10dip"
667+ android:paddingRight="30dip"
668 />
669 <ImageView
670 android:id="@+id/sync"
671
672=== modified file 'res/layout/main.xml'
673--- res/layout/main.xml 2010-06-12 05:53:50 +0000
674+++ res/layout/main.xml 2010-09-30 19:43:47 +0000
675@@ -26,10 +26,15 @@
676 android:layout_height="fill_parent"
677 android:orientation="vertical"
678 >
679+
680 <include android:id="@+id/actionbar" layout="@layout/actionbar" />
681- <ListView android:id="@+id/android:list"
682+
683+ <ListView android:id="@android:id/android:list"
684 android:layout_width="fill_parent"
685 android:layout_height="fill_parent"
686+ android:divider="#00000000"
687+ android:dividerHeight="0px"
688+ android:cacheColorHint="#ffdddddd"
689 />
690 <TextView android:id="@+id/list_empty"
691 android:layout_width="wrap_content"
692
693=== modified file 'res/layout/main_list_item.xml'
694--- res/layout/main_list_item.xml 2009-06-23 02:51:17 +0000
695+++ res/layout/main_list_item.xml 2010-09-30 19:43:47 +0000
696@@ -21,9 +21,28 @@
697 You should have received a copy of the GNU General Public License
698 along with Tomdroid. If not, see <http://www.gnu.org/licenses/>.
699 -->
700-<TextView android:id="@+id/note_title" xmlns:android="http://schemas.android.com/apk/res/android"
701- android:layout_width="fill_parent"
702- android:layout_height="fill_parent"
703- android:textSize="24dp"
704- android:padding="10dip"
705- />
706+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
707+ android:orientation="vertical"
708+ android:layout_width="fill_parent"
709+ android:layout_height="wrap_content" >
710+ <TextView android:id="@+id/note_title" xmlns:android="http://schemas.android.com/apk/res/android"
711+ android:layout_width="fill_parent"
712+ android:layout_height="fill_parent"
713+ android:textStyle="bold"
714+ android:textColor="#FF555555"
715+ android:textSize="18dp"
716+ android:paddingTop="5dip"
717+ android:paddingLeft="5dip"
718+ android:paddingRight="5dip"
719+ />
720+ <TextView android:id="@+id/note_date" xmlns:android="http://schemas.android.com/apk/res/android"
721+ android:layout_width="fill_parent"
722+ android:layout_height="fill_parent"
723+ android:textColor="#FF555555"
724+ android:textSize="14dp"
725+ android:paddingTop="2dip"
726+ android:paddingLeft="5dip"
727+ android:paddingRight="5dip"
728+ android:paddingBottom="5dip"
729+ />
730+</LinearLayout>
731\ No newline at end of file
732
733=== modified file 'res/layout/note_view.xml'
734--- res/layout/note_view.xml 2010-05-24 16:47:32 +0000
735+++ res/layout/note_view.xml 2010-09-30 19:43:47 +0000
736@@ -31,18 +31,30 @@
737 android:id="@+id/textScroller"
738 android:layout_width="fill_parent"
739 android:layout_height="fill_parent"
740- >
741-
742- <TextView
743- xmlns:android="http://schemas.android.com/apk/res/android"
744- android:id="@+id/content"
745- android:layout_width="wrap_content"
746- android:layout_height="wrap_content"
747- android:singleLine="false"
748- android:text="@string/strWait"
749- android:padding="10dip"
750- android:textSize="20dip"
751- />
752-
753+ android:background="#ffffffff"
754+ >
755+ <LinearLayout
756+ android:id="@+id/LinearLayout01"
757+ android:orientation="vertical"
758+ android:layout_width="fill_parent"
759+ android:layout_height="fill_parent">
760+
761+ <!-- <TextView
762+ android:id="@+id/title"
763+ android:layout_width="fill_parent"
764+ android:layout_height="wrap_content"
765+ android:padding="10dip"
766+ android:textStyle="bold" />-->
767+
768+ <TextView
769+ xmlns:android="http://schemas.android.com/apk/res/android"
770+ android:id="@+id/content"
771+ android:layout_width="wrap_content"
772+ android:layout_height="wrap_content"
773+ android:singleLine="false"
774+ android:text="@string/strWait"
775+ android:padding="10dip"
776+ android:textColor="#ffb8bcb8" />
777+ </LinearLayout>
778 </ScrollView>
779 </LinearLayout>
780\ No newline at end of file
781
782=== added file 'res/values/arrays.xml'
783--- res/values/arrays.xml 1970-01-01 00:00:00 +0000
784+++ res/values/arrays.xml 2010-09-30 19:43:47 +0000
785@@ -0,0 +1,11 @@
786+<?xml version="1.0" encoding="utf-8"?>
787+<resources>
788+<array name="sortOrderArray">
789+ <item>sort_date</item>
790+ <item>sort_title</item>
791+</array>
792+<array name="sortOrderValues">
793+ <item>Date Modified</item>
794+ <item>Note Title</item>
795+</array>
796+</resources>
797
798=== modified file 'res/values/strings.xml'
799--- res/values/strings.xml 2010-07-17 16:49:11 +0000
800+++ res/values/strings.xml 2010-09-30 19:43:47 +0000
801@@ -68,5 +68,7 @@
802 <string name="prefAuthenticate">Authenticate</string>
803
804 <string name="prefSyncConnectionFailed">The connection to the server has failed, please check that the address you entered is correct.</string>
805-<string name="prefServerEmpty">The server address changed but the new value is empty</string>
806+ <string name="prefServerEmpty">The server address changed but the new value is empty</string>
807+
808+
809 </resources>
810
811=== modified file 'res/xml/preferences.xml'
812--- res/xml/preferences.xml 2010-03-19 21:57:32 +0000
813+++ res/xml/preferences.xml 2010-09-30 19:43:47 +0000
814@@ -1,15 +1,18 @@
815 <?xml version="1.0" encoding="utf-8"?>
816 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
817-
818+
819 <PreferenceCategory android:title="@string/prefSync">
820
821 <ListPreference android:title="@string/prefSyncService"
822 android:dialogTitle="Choose the sync service to use"
823- android:key="sync_service"/>
824+ android:key="sync_service"
825+ android:defaultValue="tomboy-web"/>
826
827 <EditTextPreference android:key="sync_server"
828 android:title="@string/prefSyncServer"
829 android:positiveButtonText="@string/prefAuthenticate"
830 android:shouldDisableView="true"/>
831+
832 </PreferenceCategory>
833+
834 </PreferenceScreen>
835\ No newline at end of file
836
837=== modified file 'src/org/tomdroid/Note.java'
838--- src/org/tomdroid/Note.java 2010-09-17 20:37:42 +0000
839+++ src/org/tomdroid/Note.java 2010-09-30 19:43:47 +0000
840@@ -57,9 +57,9 @@
841 // TODO this is a weird yellow that was usable for the android emulator, I must confirm this for real usage
842 public static final int NOTE_HIGHLIGHT_COLOR = 0xFFFFFF77;
843 public static final String NOTE_MONOSPACE_TYPEFACE = "monospace";
844- public static final float NOTE_SIZE_SMALL_FACTOR = 0.8f;
845- public static final float NOTE_SIZE_LARGE_FACTOR = 1.3f;
846- public static final float NOTE_SIZE_HUGE_FACTOR = 1.6f;
847+ public static final float NOTE_SIZE_SMALL_FACTOR = 1.0f;
848+ public static final float NOTE_SIZE_LARGE_FACTOR = 1.5f;
849+ public static final float NOTE_SIZE_HUGE_FACTOR = 1.8f;
850
851 // Members
852 private SpannableStringBuilder noteContent;
853
854=== modified file 'src/org/tomdroid/NoteManager.java'
855--- src/org/tomdroid/NoteManager.java 2010-09-17 20:37:42 +0000
856+++ src/org/tomdroid/NoteManager.java 2010-09-30 19:43:47 +0000
857@@ -23,12 +23,15 @@
858 package org.tomdroid;
859
860 import org.tomdroid.ui.Tomdroid;
861+import org.tomdroid.util.NoteListCursorAdapter;
862+import org.tomdroid.util.Preferences;
863
864 import android.app.Activity;
865 import android.content.ContentResolver;
866 import android.content.ContentValues;
867 import android.database.Cursor;
868 import android.net.Uri;
869+import android.preference.ListPreference;
870 import android.util.Log;
871 import android.widget.ListAdapter;
872 import android.widget.SimpleCursorAdapter;
873@@ -36,7 +39,7 @@
874 public class NoteManager {
875
876 public static final String[] FULL_PROJECTION = { Note.ID, Note.TITLE, Note.FILE, Note.NOTE_CONTENT, Note.MODIFIED_DATE };
877- public static final String[] LIST_PROJECTION = { Note.ID, Note.TITLE };
878+ public static final String[] LIST_PROJECTION = { Note.ID, Note.TITLE, Note.MODIFIED_DATE };
879 public static final String[] TITLE_PROJECTION = { Note.TITLE };
880 public static final String[] GUID_PROJECTION = { Note.ID, Note.GUID };
881 public static final String[] ID_PROJECTION = { Note.ID };
882@@ -132,20 +135,23 @@
883 // get a cursor representing all notes from the NoteProvider
884 Uri notes = Tomdroid.CONTENT_URI;
885 String where = null;
886+ String orderBy;
887 if (!includeNotebookTemplates) {
888 where = Note.TAGS + " NOT LIKE '%" + "system:template" + "%'";
889 }
890- return activity.managedQuery(notes, LIST_PROJECTION, where, null, null);
891+ orderBy = Note.MODIFIED_DATE + " DESC";
892+ return activity.managedQuery(notes, LIST_PROJECTION, where, null, orderBy);
893 }
894
895
896 public static ListAdapter getListAdapter(Activity activity) {
897+
898 Cursor notesCursor = getAllNotes(activity, false);
899
900 // set up an adapter binding the TITLE field of the cursor to the list item
901- String[] from = new String[] { Note.TITLE };
902- int[] to = new int[] { R.id.note_title };
903- return new SimpleCursorAdapter(activity, R.layout.main_list_item, notesCursor, from, to);
904+ String[] from = new String[] { Note.TITLE, Note.MODIFIED_DATE };
905+ int[] to = new int[] { R.id.note_title, R.id.note_date };
906+ return new NoteListCursorAdapter(activity, R.layout.main_list_item, notesCursor, from, to);
907 }
908
909 // gets the titles of the notes present in the db, used in ViewNote.buildLinkifyPattern()
910
911=== modified file 'src/org/tomdroid/sync/SyncManager.java'
912--- src/org/tomdroid/sync/SyncManager.java 2010-08-30 16:33:02 +0000
913+++ src/org/tomdroid/sync/SyncManager.java 2010-09-30 19:43:47 +0000
914@@ -31,6 +31,7 @@
915
916 import android.app.Activity;
917 import android.os.Handler;
918+import android.util.Log;
919
920 public class SyncManager {
921
922@@ -49,7 +50,7 @@
923 public SyncService getService(String name) {
924
925 for (int i = 0; i < services.size(); i++) {
926- SyncService service = services.get(i);
927+ SyncService service = services.get(i);
928 if (name.equals(service.getName()))
929 return service;
930 }
931@@ -64,7 +65,6 @@
932 }
933
934 public SyncService getCurrentService() {
935-
936 String serviceName = Preferences.getString(Preferences.Key.SYNC_SERVICE);
937 return getService(serviceName);
938 }
939
940=== modified file 'src/org/tomdroid/ui/PreferencesActivity.java'
941--- src/org/tomdroid/ui/PreferencesActivity.java 2010-09-26 11:35:20 +0000
942+++ src/org/tomdroid/ui/PreferencesActivity.java 2010-09-30 19:43:47 +0000
943@@ -101,6 +101,7 @@
944 }
945
946 });
947+
948 }
949
950 private void authenticate(String serverUri) {
951@@ -173,13 +174,14 @@
952 syncServer.setDefaultValue(defaultServer);
953 if(syncServer.getText() == null)
954 syncServer.setText(defaultServer);
955-
956+
957 String defaultService = (String)Preferences.Key.SYNC_SERVICE.getDefault();
958 syncService.setDefaultValue(defaultService);
959 if(syncService.getValue() == null)
960 syncService.setValue(defaultService);
961+
962 }
963-
964+
965 private void setServer(String syncServiceKey) {
966
967 SyncService service = SyncManager.getInstance().getService(syncServiceKey);
968@@ -195,7 +197,7 @@
969 syncService.setSummary(service.getDescription());
970
971 }
972-
973+
974 private void connectionFailed() {
975 new AlertDialog.Builder(this)
976 .setMessage(getString(R.string.prefSyncConnectionFailed))
977
978=== modified file 'src/org/tomdroid/ui/Tomdroid.java'
979--- src/org/tomdroid/ui/Tomdroid.java 2010-09-26 11:35:20 +0000
980+++ src/org/tomdroid/ui/Tomdroid.java 2010-09-30 19:43:47 +0000
981@@ -122,6 +122,7 @@
982 MenuInflater inflater = getMenuInflater();
983 inflater.inflate(R.menu.main, menu);
984 return true;
985+
986 }
987
988 @Override
989
990=== modified file 'src/org/tomdroid/ui/ViewNote.java'
991--- src/org/tomdroid/ui/ViewNote.java 2010-08-30 16:33:02 +0000
992+++ src/org/tomdroid/ui/ViewNote.java 2010-09-30 19:43:47 +0000
993@@ -39,6 +39,7 @@
994 import android.content.Intent;
995 import android.content.DialogInterface.OnClickListener;
996 import android.database.Cursor;
997+import android.graphics.Color;
998 import android.net.Uri;
999 import android.os.Bundle;
1000 import android.os.Handler;
1001@@ -54,6 +55,7 @@
1002 public class ViewNote extends Activity {
1003
1004 // UI elements
1005+ private TextView title;
1006 private TextView content;
1007
1008 // Model objects
1009@@ -73,6 +75,14 @@
1010
1011 setContentView(R.layout.note_view);
1012 content = (TextView) findViewById(R.id.content);
1013+ content.setBackgroundColor(0xffffffff);
1014+ content.setTextColor(Color.DKGRAY);
1015+ content.setTextSize(18.0f);
1016+ title = (TextView) findViewById(R.id.title);
1017+ title.setBackgroundColor(0xffdddddd);
1018+ title.setTextColor(Color.DKGRAY);
1019+ title.setTextSize(18.0f);
1020+
1021 final Intent intent = getIntent();
1022 Uri uri = intent.getData();
1023
1024@@ -91,6 +101,8 @@
1025
1026 noteContent = note.getNoteContent(noteContentHandler);
1027
1028+ //Log.i(TAG, "THE NOTE IS: " + note.getXmlContent().toString());
1029+
1030 } else {
1031
1032 if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "The note "+uri+" doesn't exist");
1033@@ -146,7 +158,7 @@
1034 }
1035
1036 private void showNote() {
1037- setTitle(note.getTitle());
1038+ //setTitle(note.getTitle());
1039
1040 // get rid of the title that is doubled in the note's content
1041 // using quote to escape potential regexp chars in pattern
1042@@ -159,6 +171,7 @@
1043
1044 // show the note (spannable makes the TextView able to output styled text)
1045 content.setText(noteContent, TextView.BufferType.SPANNABLE);
1046+ title.setText((CharSequence) note.getTitle());
1047
1048 // add links to stuff that is understood by Android except phone numbers because it's too aggressive
1049 // TODO this is SLOWWWW!!!!
1050
1051=== added file 'src/org/tomdroid/util/NoteListCursorAdapter.java'
1052--- src/org/tomdroid/util/NoteListCursorAdapter.java 1970-01-01 00:00:00 +0000
1053+++ src/org/tomdroid/util/NoteListCursorAdapter.java 2010-09-30 19:43:47 +0000
1054@@ -0,0 +1,113 @@
1055+package org.tomdroid.util;
1056+
1057+import java.text.DateFormat;
1058+import java.util.Date;
1059+
1060+import android.text.format.DateUtils;
1061+import android.text.format.Time;
1062+import org.tomdroid.Note;
1063+import org.tomdroid.R;
1064+import org.tomdroid.ui.Tomdroid;
1065+
1066+import android.content.Context;
1067+import android.database.Cursor;
1068+import android.graphics.Color;
1069+import android.view.LayoutInflater;
1070+import android.view.View;
1071+import android.view.ViewGroup;
1072+import android.widget.Filterable;
1073+import android.widget.SimpleCursorAdapter;
1074+import android.widget.TextView;
1075+
1076+/* Provides a custom ListView layout for Note List */
1077+
1078+public class NoteListCursorAdapter extends SimpleCursorAdapter {
1079+
1080+ private Context context;
1081+
1082+ private int layout;
1083+ private int[] colors = new int[] { 0xFFFFFFFF, 0xFFEEEEEE };
1084+
1085+ private DateFormat localeDateFormat;
1086+ private DateFormat localeTimeFormat;
1087+
1088+ public NoteListCursorAdapter (Context context, int layout, Cursor c, String[] from, int[] to) {
1089+ super(context, layout, c, from, to);
1090+ this.context = context;
1091+ this.layout = layout;
1092+ localeDateFormat = DateFormat.getDateInstance(DateFormat.SHORT);
1093+ localeTimeFormat = DateFormat.getTimeInstance(DateFormat.SHORT);
1094+ }
1095+
1096+
1097+ @Override
1098+ public View newView(Context context, Cursor cursor, ViewGroup parent) {
1099+
1100+ Cursor c = getCursor();
1101+
1102+ final LayoutInflater inflater = LayoutInflater.from(context);
1103+ View v = inflater.inflate(layout, parent, false);
1104+
1105+ populateFields(v, c);
1106+
1107+ return v;
1108+ }
1109+
1110+ @Override
1111+ public void bindView(View v, Context context, Cursor c) {
1112+
1113+ populateFields(v, c);
1114+ }
1115+
1116+ @Override
1117+ public View getView(int position, View convertView, ViewGroup parent) {
1118+ View view = super.getView(position, convertView, parent);
1119+ int colorPos = position % colors.length;
1120+ view.setBackgroundColor(colors[colorPos]);
1121+ //view.setTextColor(Color.DKGRAY);
1122+ return view;
1123+ }
1124+
1125+ private void populateFields(View v, Cursor c){
1126+
1127+ int nameCol = c.getColumnIndex(Note.TITLE);
1128+ int modifiedCol = c.getColumnIndex(Note.MODIFIED_DATE);
1129+
1130+ String title = c.getString(nameCol);
1131+
1132+ //Format last modified dates to be similar to desktop Tomboy
1133+ //TODO this is messy - must be a better way than having 3 separate date types
1134+ Time lastModified = new Time();
1135+ lastModified.parse3339(c.getString(modifiedCol));
1136+ Long lastModifiedMillis = lastModified.toMillis(false);
1137+ Date lastModifiedDate = new Date(lastModifiedMillis);
1138+
1139+ String strModified = "Modified: ";
1140+ //TODO this is very inefficient
1141+ if (DateUtils.isToday(lastModifiedMillis)){
1142+ strModified += "Today, " + localeTimeFormat.format(lastModifiedDate);
1143+ } else {
1144+ // Add a day to the last modified date - if the date is now today, it means the note was edited yesterday
1145+ Time yesterdayTest = lastModified;
1146+ yesterdayTest.monthDay += 1;
1147+ if (DateUtils.isToday(yesterdayTest.toMillis(false))){
1148+ strModified += "Yesterday, " + localeTimeFormat.format(lastModifiedDate);
1149+ } else {
1150+ strModified += localeDateFormat.format(lastModifiedDate) + ", " + localeTimeFormat.format(lastModifiedDate);
1151+ }
1152+ }
1153+
1154+ /**
1155+ * Next set the name of the entry.
1156+ */
1157+ TextView note_title = (TextView) v.findViewById(R.id.note_title);
1158+ if (note_title != null) {
1159+ note_title.setText(title);
1160+ }
1161+ TextView note_modified = (TextView) v.findViewById(R.id.note_date);
1162+ if (note_modified != null) {
1163+ note_modified.setText(strModified);
1164+ }
1165+ }
1166+
1167+}
1168
1169=== modified file 'src/org/tomdroid/util/Preferences.java'
1170--- src/org/tomdroid/util/Preferences.java 2010-08-30 16:33:02 +0000
1171+++ src/org/tomdroid/util/Preferences.java 2010-09-30 19:43:47 +0000
1172@@ -42,6 +42,7 @@
1173 ACCESS_TOKEN_URL ("access_token_url", ""),
1174 REQUEST_TOKEN_URL ("request_token_url", ""),
1175 LATEST_SYNC_REVISION ("latest_sync_revision", 0L),
1176+ SORT_ORDER ("sort_order", "sort_date"),
1177 FIRST_RUN ("first_run", true);
1178
1179 private String name = "";

Subscribers

People subscribed via source and target branches