Merge lp:~saturnreturn/tomdroid/freshen-ui into lp:~tomdroid-dev/tomdroid/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
=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml 2010-08-16 22:13:00 +0000
+++ AndroidManifest.xml 2010-09-30 19:43:47 +0000
@@ -11,9 +11,7 @@
11 <application 11 <application
12 android:icon="@drawable/icon"12 android:icon="@drawable/icon"
13 android:label="@string/app_name"13 android:label="@string/app_name"
14 android:theme="@android:style/Theme.Light.NoTitleBar"14 android:theme="@android:style/Theme.Light.NoTitleBar">
15 android:debuggable="true"
16 >
1715
18 <activity android:label="@string/app_name"16 <activity android:label="@string/app_name"
19 android:name=".ui.Tomdroid"17 android:name=".ui.Tomdroid"
2018
=== added file 'data/tomdroid-4.svg'
--- data/tomdroid-4.svg 1970-01-01 00:00:00 +0000
+++ data/tomdroid-4.svg 2010-09-30 19:43:47 +0000
@@ -0,0 +1,612 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:xlink="http://www.w3.org/1999/xlink"
11 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
12 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
13 width="48"
14 height="48"
15 id="svg2394"
16 sodipodi:version="0.32"
17 inkscape:version="0.47 r22583"
18 version="1.0"
19 sodipodi:docname="tomdroid-4.png"
20 inkscape:output_extension="org.inkscape.output.svg.inkscape"
21 inkscape:export-filename="/data/code/android/web-sync/res/drawable/tomdroid-4.png"
22 inkscape:export-xdpi="90"
23 inkscape:export-ydpi="90">
24 <defs
25 id="defs2396">
26 <inkscape:perspective
27 sodipodi:type="inkscape:persp3d"
28 inkscape:vp_x="0 : 526.18109 : 1"
29 inkscape:vp_y="0 : 1000 : 0"
30 inkscape:vp_z="744.09448 : 526.18109 : 1"
31 inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
32 id="perspective2402" />
33 <linearGradient
34 id="linearGradient6377">
35 <stop
36 id="stop6379"
37 offset="0"
38 style="stop-color:#fff27e;stop-opacity:1;" />
39 <stop
40 id="stop6381"
41 offset="1"
42 style="stop-color:#edd400;stop-opacity:1;" />
43 </linearGradient>
44 <linearGradient
45 id="linearGradient2966">
46 <stop
47 style="stop-color:#ffd1d1;stop-opacity:1;"
48 offset="0"
49 id="stop2968" />
50 <stop
51 id="stop3006"
52 offset="0.5"
53 style="stop-color:#ff1d1d;stop-opacity:1;" />
54 <stop
55 style="stop-color:#6f0000;stop-opacity:1;"
56 offset="1"
57 id="stop2970" />
58 </linearGradient>
59 <linearGradient
60 id="linearGradient2974">
61 <stop
62 style="stop-color:#c1c1c1;stop-opacity:1;"
63 offset="0"
64 id="stop2976" />
65 <stop
66 style="stop-color:#acacac;stop-opacity:1;"
67 offset="1"
68 id="stop2978" />
69 </linearGradient>
70 <linearGradient
71 id="linearGradient2994">
72 <stop
73 style="stop-color:#000000;stop-opacity:1;"
74 offset="0"
75 id="stop2996" />
76 <stop
77 style="stop-color:#c9c9c9;stop-opacity:1;"
78 offset="1"
79 id="stop2998" />
80 </linearGradient>
81 <inkscape:perspective
82 id="perspective2705"
83 inkscape:persp3d-origin="24 : 16 : 1"
84 inkscape:vp_z="48 : 24 : 1"
85 inkscape:vp_y="0 : 1000 : 0"
86 inkscape:vp_x="0 : 24 : 1"
87 sodipodi:type="inkscape:persp3d" />
88 <inkscape:perspective
89 id="perspective3103"
90 inkscape:persp3d-origin="60 : 46.666667 : 1"
91 inkscape:vp_z="120 : 70 : 1"
92 inkscape:vp_y="0 : 1000 : 0"
93 inkscape:vp_x="0 : 70 : 1"
94 sodipodi:type="inkscape:persp3d" />
95 <radialGradient
96 gradientUnits="userSpaceOnUse"
97 gradientTransform="matrix(1,0,0,0.361345,0,22.29694)"
98 r="5.2591065"
99 fy="31.780704"
100 fx="39.907337"
101 cy="31.780704"
102 cx="39.907337"
103 id="radialGradient6423"
104 xlink:href="#linearGradient6417"
105 inkscape:collect="always" />
106 <radialGradient
107 gradientUnits="userSpaceOnUse"
108 gradientTransform="matrix(10.88255,-6.454846e-8,0,11.39737,-433.5968,-381.3811)"
109 r="20.21875"
110 fy="35.90107"
111 fx="43.875"
112 cy="35.90107"
113 cx="43.875"
114 id="radialGradient6413"
115 xlink:href="#linearGradient6407"
116 inkscape:collect="always" />
117 <radialGradient
118 r="21.626934"
119 fy="35.915409"
120 fx="45.150326"
121 cy="35.915409"
122 cx="45.150326"
123 gradientTransform="matrix(1.669712,0,1.702451e-8,1.220484,-30.23773,-11.79928)"
124 gradientUnits="userSpaceOnUse"
125 id="radialGradient6405"
126 xlink:href="#linearGradient6377"
127 inkscape:collect="always" />
128 <linearGradient
129 gradientUnits="userSpaceOnUse"
130 y2="67.031342"
131 x2="26.130388"
132 y1="14.08672"
133 x1="26.213203"
134 id="linearGradient5615"
135 xlink:href="#linearGradient5609"
136 inkscape:collect="always" />
137 <linearGradient
138 id="linearGradient5609"
139 inkscape:collect="always">
140 <stop
141 id="stop5611"
142 offset="0"
143 style="stop-color:white;stop-opacity:1;" />
144 <stop
145 id="stop5613"
146 offset="1"
147 style="stop-color:white;stop-opacity:0;" />
148 </linearGradient>
149 <linearGradient
150 id="linearGradient3342">
151 <stop
152 id="stop3344"
153 offset="0"
154 style="stop-color:#fff27e;stop-opacity:1;" />
155 <stop
156 id="stop3346"
157 offset="1"
158 style="stop-color:#edd400;stop-opacity:1;" />
159 </linearGradient>
160 <linearGradient
161 id="linearGradient6407"
162 inkscape:collect="always">
163 <stop
164 id="stop6409"
165 offset="0"
166 style="stop-color:white;stop-opacity:1;" />
167 <stop
168 id="stop6411"
169 offset="1"
170 style="stop-color:white;stop-opacity:0;" />
171 </linearGradient>
172 <linearGradient
173 id="linearGradient6417"
174 inkscape:collect="always">
175 <stop
176 id="stop6419"
177 offset="0"
178 style="stop-color:black;stop-opacity:1;" />
179 <stop
180 id="stop6421"
181 offset="1"
182 style="stop-color:black;stop-opacity:0;" />
183 </linearGradient>
184 <linearGradient
185 id="linearGradient3326">
186 <stop
187 style="stop-color:#ffd1d1;stop-opacity:1;"
188 offset="0"
189 id="stop3328" />
190 <stop
191 id="stop3330"
192 offset="0.5"
193 style="stop-color:#ff1d1d;stop-opacity:1;" />
194 <stop
195 style="stop-color:#6f0000;stop-opacity:1;"
196 offset="1"
197 id="stop3332" />
198 </linearGradient>
199 <linearGradient
200 id="linearGradient3319">
201 <stop
202 style="stop-color:#c1c1c1;stop-opacity:1;"
203 offset="0"
204 id="stop3321" />
205 <stop
206 style="stop-color:#acacac;stop-opacity:1;"
207 offset="1"
208 id="stop3323" />
209 </linearGradient>
210 <linearGradient
211 inkscape:collect="always"
212 id="linearGradient2984">
213 <stop
214 style="stop-color:#e7e2b8;stop-opacity:1;"
215 offset="0"
216 id="stop2986" />
217 <stop
218 style="stop-color:#e7e2b8;stop-opacity:0;"
219 offset="1"
220 id="stop2988" />
221 </linearGradient>
222 <linearGradient
223 id="linearGradient3308">
224 <stop
225 style="stop-color:#000000;stop-opacity:1;"
226 offset="0"
227 id="stop3310" />
228 <stop
229 style="stop-color:#c9c9c9;stop-opacity:1;"
230 offset="1"
231 id="stop3312" />
232 </linearGradient>
233 <inkscape:perspective
234 id="perspective3305"
235 inkscape:persp3d-origin="24 : 16 : 1"
236 inkscape:vp_z="48 : 24 : 1"
237 inkscape:vp_y="0 : 1000 : 0"
238 inkscape:vp_x="0 : 24 : 1"
239 sodipodi:type="inkscape:persp3d" />
240 <linearGradient
241 inkscape:collect="always"
242 xlink:href="#linearGradient2966"
243 id="linearGradient4272"
244 gradientUnits="userSpaceOnUse"
245 gradientTransform="translate(-5.669292,0)"
246 x1="48.90625"
247 y1="17.376184"
248 x2="50.988335"
249 y2="22.250591" />
250 <linearGradient
251 inkscape:collect="always"
252 xlink:href="#linearGradient2974"
253 id="linearGradient4274"
254 gradientUnits="userSpaceOnUse"
255 gradientTransform="translate(-5.669292,0)"
256 x1="46"
257 y1="19.8125"
258 x2="47.6875"
259 y2="22.625" />
260 <radialGradient
261 inkscape:collect="always"
262 xlink:href="#linearGradient2984"
263 id="radialGradient4276"
264 gradientUnits="userSpaceOnUse"
265 gradientTransform="matrix(2.923565,0,0,2.029717,-61.55532,-27.88417)"
266 cx="29.053354"
267 cy="27.640751"
268 fx="29.053354"
269 fy="27.640751"
270 r="3.2408544" />
271 <linearGradient
272 inkscape:collect="always"
273 xlink:href="#linearGradient2994"
274 id="linearGradient4278"
275 gradientUnits="userSpaceOnUse"
276 gradientTransform="translate(-5.825542,0.125)"
277 x1="25.71875"
278 y1="31.046875"
279 x2="25.514589"
280 y2="30.703125" />
281 <inkscape:perspective
282 id="perspective5044"
283 inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
284 inkscape:vp_z="1 : 0.5 : 1"
285 inkscape:vp_y="0 : 1000 : 0"
286 inkscape:vp_x="0 : 0.5 : 1"
287 sodipodi:type="inkscape:persp3d" />
288 <inkscape:perspective
289 id="perspective5252"
290 inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
291 inkscape:vp_z="1 : 0.5 : 1"
292 inkscape:vp_y="0 : 1000 : 0"
293 inkscape:vp_x="0 : 0.5 : 1"
294 sodipodi:type="inkscape:persp3d" />
295 <inkscape:perspective
296 id="perspective5278"
297 inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
298 inkscape:vp_z="1 : 0.5 : 1"
299 inkscape:vp_y="0 : 1000 : 0"
300 inkscape:vp_x="0 : 0.5 : 1"
301 sodipodi:type="inkscape:persp3d" />
302 <inkscape:perspective
303 id="perspective5380"
304 inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
305 inkscape:vp_z="1 : 0.5 : 1"
306 inkscape:vp_y="0 : 1000 : 0"
307 inkscape:vp_x="0 : 0.5 : 1"
308 sodipodi:type="inkscape:persp3d" />
309 <inkscape:perspective
310 id="perspective5404"
311 inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
312 inkscape:vp_z="1 : 0.5 : 1"
313 inkscape:vp_y="0 : 1000 : 0"
314 inkscape:vp_x="0 : 0.5 : 1"
315 sodipodi:type="inkscape:persp3d" />
316 <inkscape:perspective
317 id="perspective5433"
318 inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
319 inkscape:vp_z="1 : 0.5 : 1"
320 inkscape:vp_y="0 : 1000 : 0"
321 inkscape:vp_x="0 : 0.5 : 1"
322 sodipodi:type="inkscape:persp3d" />
323 <inkscape:perspective
324 id="perspective5459"
325 inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
326 inkscape:vp_z="1 : 0.5 : 1"
327 inkscape:vp_y="0 : 1000 : 0"
328 inkscape:vp_x="0 : 0.5 : 1"
329 sodipodi:type="inkscape:persp3d" />
330 <inkscape:perspective
331 id="perspective5509"
332 inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
333 inkscape:vp_z="1 : 0.5 : 1"
334 inkscape:vp_y="0 : 1000 : 0"
335 inkscape:vp_x="0 : 0.5 : 1"
336 sodipodi:type="inkscape:persp3d" />
337 <inkscape:perspective
338 id="perspective5564"
339 inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
340 inkscape:vp_z="1 : 0.5 : 1"
341 inkscape:vp_y="0 : 1000 : 0"
342 inkscape:vp_x="0 : 0.5 : 1"
343 sodipodi:type="inkscape:persp3d" />
344 </defs>
345 <sodipodi:namedview
346 id="base"
347 pagecolor="#ffffff"
348 bordercolor="#666666"
349 borderopacity="1.0"
350 inkscape:pageopacity="0.0"
351 inkscape:pageshadow="2"
352 inkscape:zoom="7.9195959"
353 inkscape:cx="25.379657"
354 inkscape:cy="34.644751"
355 inkscape:document-units="px"
356 inkscape:current-layer="layer1"
357 showgrid="false"
358 inkscape:window-width="1280"
359 inkscape:window-height="976"
360 inkscape:window-x="0"
361 inkscape:window-y="25"
362 inkscape:window-maximized="1" />
363 <metadata
364 id="metadata2399">
365 <rdf:RDF>
366 <cc:Work
367 rdf:about="">
368 <dc:format>image/svg+xml</dc:format>
369 <dc:type
370 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
371 <dc:title></dc:title>
372 <dc:date>2009-04-02</dc:date>
373 <dc:creator>
374 <cc:Agent>
375 <dc:title>Olivier Bilodeau</dc:title>
376 </cc:Agent>
377 </dc:creator>
378 <dc:description>A mashup of Tomboy's icon and Android's logo. Both available under free licences.</dc:description>
379 </cc:Work>
380 </rdf:RDF>
381 </metadata>
382 <g
383 inkscape:label="Calque 1"
384 inkscape:groupmode="layer"
385 id="layer1">
386 <g
387 id="g4242"
388 transform="translate(-0.1684169,3.5830001)">
389 <path
390 sodipodi:nodetypes="ccccccccccc"
391 id="rect1975"
392 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"
393 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" />
394 <rect
395 ry="0.67937863"
396 rx="0.67937863"
397 y="35.957905"
398 x="5.1146202"
399 height="7.0714951"
400 width="39.048077"
401 id="rect2851"
402 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" />
403 <path
404 sodipodi:nodetypes="ccccccc"
405 id="path2853"
406 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"
407 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" />
408 <path
409 id="path4730"
410 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"
411 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" />
412 <path
413 sodipodi:nodetypes="cccc"
414 id="path6415"
415 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"
416 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" />
417 <path
418 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"
419 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"
420 id="path2524"
421 sodipodi:nodetypes="cczczcccc" />
422 <path
423 id="path6403"
424 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"
425 style="opacity:0.46629214;fill:none;stroke:url(#radialGradient6413);stroke-width:0.99999964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
426 <path
427 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"
428 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"
429 id="path6359"
430 sodipodi:nodetypes="ccccccc" />
431 <path
432 sodipodi:nodetypes="ccccccc"
433 id="path6361"
434 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"
435 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" />
436 <path
437 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"
438 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"
439 id="path6363"
440 sodipodi:nodetypes="ccccccc" />
441 </g>
442 <g
443 id="g4166-6"
444 transform="matrix(1.0098472,0,0,0.98902752,-298.47562,-483.65964)"
445 style="fill:#c4a000;fill-opacity:1;stroke:none" />
446 <g
447 id="g3106"
448 inkscape:label="Layer 1"
449 transform="matrix(0.9894224,0,0,0.9894224,86.886011,8.4726515)">
450 <g
451 transform="translate(-299.00515,-503.07627)"
452 id="g3279" />
453 </g>
454 <path
455 style="fill:#d40000;fill-opacity:1;stroke:#ffffff;stroke-width:1.70000005;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
456 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"
457 id="rect5365-8" />
458 <g
459 id="g5488"
460 style="stroke:none"
461 transform="translate(0,0.39995194)">
462 <path
463 id="rect5365"
464 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"
465 style="fill:#97c024;fill-opacity:1;stroke:none" />
466 <rect
467 rx="1.7022525"
468 y="23.661636"
469 x="19.224466"
470 height="9.5017471"
471 width="4.0090432"
472 id="rect5370"
473 style="fill:#97c024;fill-opacity:1;stroke:none" />
474 <rect
475 rx="1.7022525"
476 y="23.645853"
477 x="25.80624"
478 height="9.5017471"
479 width="4.0090432"
480 id="rect5370-3"
481 style="fill:#97c024;fill-opacity:1;stroke:none" />
482 <rect
483 rx="1.9887384"
484 y="11.413537"
485 x="10.922275"
486 height="12.405936"
487 width="3.9774768"
488 id="rect5394"
489 style="fill:#97c024;fill-opacity:1;stroke:none" />
490 <rect
491 rx="1.9887384"
492 y="11.55559"
493 x="33.871677"
494 height="12.405936"
495 width="3.9774768"
496 id="rect5394-2"
497 style="fill:#97c024;fill-opacity:1;stroke:none" />
498 <g
499 transform="translate(-0.20025,0)"
500 id="g5481"
501 style="stroke:none">
502 <path
503 style="fill:#97c024;fill-opacity:1;stroke:none"
504 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"
505 id="path5418" />
506 <path
507 sodipodi:type="arc"
508 style="fill:#ffffff;fill-opacity:1;stroke:none"
509 id="path5449"
510 sodipodi:cx="21.37104"
511 sodipodi:cy="8.3357286"
512 sodipodi:rx="0.78918165"
513 sodipodi:ry="0.77339804"
514 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"
515 transform="matrix(1.0212245,0,0,1.0212245,-1.4154165,-1.4231952)" />
516 <path
517 sodipodi:type="arc"
518 style="fill:#ffffff;fill-opacity:1;stroke:none"
519 id="path5449-6"
520 sodipodi:cx="21.37104"
521 sodipodi:cy="8.3357286"
522 sodipodi:rx="0.78918165"
523 sodipodi:ry="0.77339804"
524 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"
525 transform="matrix(1.0212245,0,0,1.0212245,6.7121839,-1.4238284)" />
526 <rect
527 style="fill:#97c024;fill-opacity:1;stroke:none"
528 id="rect5423"
529 width="1.0101534"
530 height="5.0507627"
531 x="15.824705"
532 y="9.2116003"
533 rx="0.50507671"
534 transform="matrix(0.88965349,-0.45663625,0.45663625,0.88965349,0,0)"
535 ry="0.56354231" />
536 <rect
537 style="fill:#97c024;fill-opacity:1;stroke:none"
538 id="rect5423-6"
539 width="1.0101534"
540 height="5.0507627"
541 x="-27.690969"
542 y="-13.159358"
543 rx="0.50507671"
544 transform="matrix(-0.88965349,-0.45663625,-0.45663625,0.88965349,0,0)"
545 ry="0.56354231" />
546 </g>
547 </g>
548 <g
549 style="display:inline"
550 id="g1574"
551 transform="matrix(0.7113809,-0.1906141,0.1906141,0.7113809,19.866431,-7.0127809)"
552 inkscape:r_cx="true"
553 inkscape:r_cy="true">
554 <path
555 transform="translate(-29.75546,19)"
556 sodipodi:nodetypes="cccccc"
557 id="path2960"
558 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"
559 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"
560 inkscape:r_cx="true"
561 inkscape:r_cy="true" />
562 <path
563 transform="translate(-29.75546,19)"
564 style="fill:url(#linearGradient4272);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
565 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"
566 id="path2964"
567 sodipodi:nodetypes="czcczcc"
568 inkscape:r_cx="true"
569 inkscape:r_cy="true" />
570 <path
571 transform="translate(-29.75546,19)"
572 sodipodi:nodetypes="czcczcc"
573 id="path2962"
574 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"
575 style="fill:url(#linearGradient4274);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
576 inkscape:r_cx="true"
577 inkscape:r_cy="true" />
578 <path
579 transform="translate(-29.75546,19)"
580 sodipodi:nodetypes="cccc"
581 id="path2982"
582 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"
583 style="fill:url(#radialGradient4276);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
584 inkscape:r_cx="true"
585 inkscape:r_cy="true" />
586 <path
587 transform="translate(-29.75546,19)"
588 sodipodi:nodetypes="cccc"
589 id="path2992"
590 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"
591 style="fill:url(#linearGradient4278);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
592 inkscape:r_cx="true"
593 inkscape:r_cy="true" />
594 <path
595 transform="translate(-29.75546,19)"
596 sodipodi:nodetypes="ccccc"
597 id="path3002"
598 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"
599 style="fill:#ffffff;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
600 inkscape:r_cx="true"
601 inkscape:r_cy="true" />
602 <path
603 transform="translate(-29.75546,19)"
604 sodipodi:nodetypes="ccccc"
605 id="path3004"
606 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"
607 style="fill:#000000;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
608 inkscape:r_cx="true"
609 inkscape:r_cy="true" />
610 </g>
611 </g>
612</svg>
0613
=== modified file 'res/drawable/icon.png'
1Binary files res/drawable/icon.png 2009-04-03 03:19:35 +0000 and res/drawable/icon.png 2010-09-30 19:43:47 +0000 differ614Binary 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
=== modified file 'res/layout/actionbar.xml'
--- res/layout/actionbar.xml 2010-08-25 19:43:16 +0000
+++ res/layout/actionbar.xml 2010-09-30 19:43:47 +0000
@@ -28,14 +28,29 @@
28 android:background="#ddd"28 android:background="#ddd"
29 android:gravity="center_horizontal"29 android:gravity="center_horizontal"
30 android:orientation="horizontal">30 android:orientation="horizontal">
31 <ImageView
32 android:id="@+id/action_icon"
33 android:src="@drawable/icon"
34 android:layout_height="wrap_content"
35 android:layout_width="wrap_content"
36 android:scaleType="fitStart"
37 android:padding="4dip"
38 />
31 <TextView 39 <TextView
32 android:id="@+id/title"40 android:id="@+id/title"
33 android:text="Tomdroid"41 android:text="Tomdroid"
34 android:layout_margin="6dip" 42 android:layout_marginLeft="42dip"
35 android:layout_marginLeft="5dip"
36 android:layout_height="wrap_content"43 android:layout_height="wrap_content"
37 android:layout_width="wrap_content"44 android:layout_width="wrap_content"
38 android:textSize="24dip"45 android:textSize="18dip"
46 android:textStyle="bold"
47 android:textColor="#FF555555"
48 android:singleLine="true"
49 android:ellipsize="marquee"
50 android:fadingEdge="horizontal"
51 android:fadingEdgeLength="5mm"
52 android:paddingTop="10dip"
53 android:paddingRight="30dip"
39 />54 />
40 <ImageView55 <ImageView
41 android:id="@+id/sync"56 android:id="@+id/sync"
4257
=== modified file 'res/layout/main.xml'
--- res/layout/main.xml 2010-06-12 05:53:50 +0000
+++ res/layout/main.xml 2010-09-30 19:43:47 +0000
@@ -26,10 +26,15 @@
26 android:layout_height="fill_parent"26 android:layout_height="fill_parent"
27 android:orientation="vertical"27 android:orientation="vertical"
28 >28 >
29
29 <include android:id="@+id/actionbar" layout="@layout/actionbar" />30 <include android:id="@+id/actionbar" layout="@layout/actionbar" />
30 <ListView android:id="@+id/android:list"31
32 <ListView android:id="@android:id/android:list"
31 android:layout_width="fill_parent"33 android:layout_width="fill_parent"
32 android:layout_height="fill_parent"34 android:layout_height="fill_parent"
35 android:divider="#00000000"
36 android:dividerHeight="0px"
37 android:cacheColorHint="#ffdddddd"
33 />38 />
34 <TextView android:id="@+id/list_empty"39 <TextView android:id="@+id/list_empty"
35 android:layout_width="wrap_content"40 android:layout_width="wrap_content"
3641
=== modified file 'res/layout/main_list_item.xml'
--- res/layout/main_list_item.xml 2009-06-23 02:51:17 +0000
+++ res/layout/main_list_item.xml 2010-09-30 19:43:47 +0000
@@ -21,9 +21,28 @@
21 You should have received a copy of the GNU General Public License21 You should have received a copy of the GNU General Public License
22 along with Tomdroid. If not, see <http://www.gnu.org/licenses/>.22 along with Tomdroid. If not, see <http://www.gnu.org/licenses/>.
23-->23-->
24<TextView android:id="@+id/note_title" xmlns:android="http://schemas.android.com/apk/res/android"24<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
25 android:layout_width="fill_parent"25 android:orientation="vertical"
26 android:layout_height="fill_parent"26 android:layout_width="fill_parent"
27 android:textSize="24dp"27 android:layout_height="wrap_content" >
28 android:padding="10dip"28 <TextView android:id="@+id/note_title" xmlns:android="http://schemas.android.com/apk/res/android"
29 />29 android:layout_width="fill_parent"
30 android:layout_height="fill_parent"
31 android:textStyle="bold"
32 android:textColor="#FF555555"
33 android:textSize="18dp"
34 android:paddingTop="5dip"
35 android:paddingLeft="5dip"
36 android:paddingRight="5dip"
37 />
38 <TextView android:id="@+id/note_date" xmlns:android="http://schemas.android.com/apk/res/android"
39 android:layout_width="fill_parent"
40 android:layout_height="fill_parent"
41 android:textColor="#FF555555"
42 android:textSize="14dp"
43 android:paddingTop="2dip"
44 android:paddingLeft="5dip"
45 android:paddingRight="5dip"
46 android:paddingBottom="5dip"
47 />
48</LinearLayout>
30\ No newline at end of file49\ No newline at end of file
3150
=== modified file 'res/layout/note_view.xml'
--- res/layout/note_view.xml 2010-05-24 16:47:32 +0000
+++ res/layout/note_view.xml 2010-09-30 19:43:47 +0000
@@ -31,18 +31,30 @@
31 android:id="@+id/textScroller"31 android:id="@+id/textScroller"
32 android:layout_width="fill_parent"32 android:layout_width="fill_parent"
33 android:layout_height="fill_parent"33 android:layout_height="fill_parent"
34 >34 android:background="#ffffffff"
3535 >
36 <TextView 36 <LinearLayout
37 xmlns:android="http://schemas.android.com/apk/res/android"37 android:id="@+id/LinearLayout01"
38 android:id="@+id/content"38 android:orientation="vertical"
39 android:layout_width="wrap_content" 39 android:layout_width="fill_parent"
40 android:layout_height="wrap_content"40 android:layout_height="fill_parent">
41 android:singleLine="false"41
42 android:text="@string/strWait"42 <!-- <TextView
43 android:padding="10dip"43 android:id="@+id/title"
44 android:textSize="20dip"44 android:layout_width="fill_parent"
45 />45 android:layout_height="wrap_content"
46 46 android:padding="10dip"
47 android:textStyle="bold" />-->
48
49 <TextView
50 xmlns:android="http://schemas.android.com/apk/res/android"
51 android:id="@+id/content"
52 android:layout_width="wrap_content"
53 android:layout_height="wrap_content"
54 android:singleLine="false"
55 android:text="@string/strWait"
56 android:padding="10dip"
57 android:textColor="#ffb8bcb8" />
58 </LinearLayout>
47</ScrollView>59</ScrollView>
48</LinearLayout>60</LinearLayout>
49\ No newline at end of file61\ No newline at end of file
5062
=== added file 'res/values/arrays.xml'
--- res/values/arrays.xml 1970-01-01 00:00:00 +0000
+++ res/values/arrays.xml 2010-09-30 19:43:47 +0000
@@ -0,0 +1,11 @@
1<?xml version="1.0" encoding="utf-8"?>
2<resources>
3<array name="sortOrderArray">
4 <item>sort_date</item>
5 <item>sort_title</item>
6</array>
7<array name="sortOrderValues">
8 <item>Date Modified</item>
9 <item>Note Title</item>
10</array>
11</resources>
012
=== modified file 'res/values/strings.xml'
--- res/values/strings.xml 2010-07-17 16:49:11 +0000
+++ res/values/strings.xml 2010-09-30 19:43:47 +0000
@@ -68,5 +68,7 @@
68 <string name="prefAuthenticate">Authenticate</string>68 <string name="prefAuthenticate">Authenticate</string>
6969
70 <string name="prefSyncConnectionFailed">The connection to the server has failed, please check that the address you entered is correct.</string>70 <string name="prefSyncConnectionFailed">The connection to the server has failed, please check that the address you entered is correct.</string>
71<string name="prefServerEmpty">The server address changed but the new value is empty</string>71 <string name="prefServerEmpty">The server address changed but the new value is empty</string>
72
73
72</resources>74</resources>
7375
=== modified file 'res/xml/preferences.xml'
--- res/xml/preferences.xml 2010-03-19 21:57:32 +0000
+++ res/xml/preferences.xml 2010-09-30 19:43:47 +0000
@@ -1,15 +1,18 @@
1<?xml version="1.0" encoding="utf-8"?>1<?xml version="1.0" encoding="utf-8"?>
2<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">2<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
3 3
4 <PreferenceCategory android:title="@string/prefSync">4 <PreferenceCategory android:title="@string/prefSync">
5 5
6 <ListPreference android:title="@string/prefSyncService"6 <ListPreference android:title="@string/prefSyncService"
7 android:dialogTitle="Choose the sync service to use"7 android:dialogTitle="Choose the sync service to use"
8 android:key="sync_service"/>8 android:key="sync_service"
9 android:defaultValue="tomboy-web"/>
9 10
10 <EditTextPreference android:key="sync_server"11 <EditTextPreference android:key="sync_server"
11 android:title="@string/prefSyncServer"12 android:title="@string/prefSyncServer"
12 android:positiveButtonText="@string/prefAuthenticate"13 android:positiveButtonText="@string/prefAuthenticate"
13 android:shouldDisableView="true"/>14 android:shouldDisableView="true"/>
15
14 </PreferenceCategory>16 </PreferenceCategory>
17
15</PreferenceScreen>18</PreferenceScreen>
16\ No newline at end of file19\ No newline at end of file
1720
=== modified file 'src/org/tomdroid/Note.java'
--- src/org/tomdroid/Note.java 2010-09-17 20:37:42 +0000
+++ src/org/tomdroid/Note.java 2010-09-30 19:43:47 +0000
@@ -57,9 +57,9 @@
57 // TODO this is a weird yellow that was usable for the android emulator, I must confirm this for real usage57 // TODO this is a weird yellow that was usable for the android emulator, I must confirm this for real usage
58 public static final int NOTE_HIGHLIGHT_COLOR = 0xFFFFFF77;58 public static final int NOTE_HIGHLIGHT_COLOR = 0xFFFFFF77;
59 public static final String NOTE_MONOSPACE_TYPEFACE = "monospace";59 public static final String NOTE_MONOSPACE_TYPEFACE = "monospace";
60 public static final float NOTE_SIZE_SMALL_FACTOR = 0.8f;60 public static final float NOTE_SIZE_SMALL_FACTOR = 1.0f;
61 public static final float NOTE_SIZE_LARGE_FACTOR = 1.3f;61 public static final float NOTE_SIZE_LARGE_FACTOR = 1.5f;
62 public static final float NOTE_SIZE_HUGE_FACTOR = 1.6f;62 public static final float NOTE_SIZE_HUGE_FACTOR = 1.8f;
63 63
64 // Members64 // Members
65 private SpannableStringBuilder noteContent;65 private SpannableStringBuilder noteContent;
6666
=== modified file 'src/org/tomdroid/NoteManager.java'
--- src/org/tomdroid/NoteManager.java 2010-09-17 20:37:42 +0000
+++ src/org/tomdroid/NoteManager.java 2010-09-30 19:43:47 +0000
@@ -23,12 +23,15 @@
23package org.tomdroid;23package org.tomdroid;
2424
25import org.tomdroid.ui.Tomdroid;25import org.tomdroid.ui.Tomdroid;
26import org.tomdroid.util.NoteListCursorAdapter;
27import org.tomdroid.util.Preferences;
2628
27import android.app.Activity;29import android.app.Activity;
28import android.content.ContentResolver;30import android.content.ContentResolver;
29import android.content.ContentValues;31import android.content.ContentValues;
30import android.database.Cursor;32import android.database.Cursor;
31import android.net.Uri;33import android.net.Uri;
34import android.preference.ListPreference;
32import android.util.Log;35import android.util.Log;
33import android.widget.ListAdapter;36import android.widget.ListAdapter;
34import android.widget.SimpleCursorAdapter;37import android.widget.SimpleCursorAdapter;
@@ -36,7 +39,7 @@
36public class NoteManager {39public class NoteManager {
37 40
38 public static final String[] FULL_PROJECTION = { Note.ID, Note.TITLE, Note.FILE, Note.NOTE_CONTENT, Note.MODIFIED_DATE };41 public static final String[] FULL_PROJECTION = { Note.ID, Note.TITLE, Note.FILE, Note.NOTE_CONTENT, Note.MODIFIED_DATE };
39 public static final String[] LIST_PROJECTION = { Note.ID, Note.TITLE };42 public static final String[] LIST_PROJECTION = { Note.ID, Note.TITLE, Note.MODIFIED_DATE };
40 public static final String[] TITLE_PROJECTION = { Note.TITLE };43 public static final String[] TITLE_PROJECTION = { Note.TITLE };
41 public static final String[] GUID_PROJECTION = { Note.ID, Note.GUID };44 public static final String[] GUID_PROJECTION = { Note.ID, Note.GUID };
42 public static final String[] ID_PROJECTION = { Note.ID };45 public static final String[] ID_PROJECTION = { Note.ID };
@@ -132,20 +135,23 @@
132 // get a cursor representing all notes from the NoteProvider135 // get a cursor representing all notes from the NoteProvider
133 Uri notes = Tomdroid.CONTENT_URI;136 Uri notes = Tomdroid.CONTENT_URI;
134 String where = null;137 String where = null;
138 String orderBy;
135 if (!includeNotebookTemplates) {139 if (!includeNotebookTemplates) {
136 where = Note.TAGS + " NOT LIKE '%" + "system:template" + "%'";140 where = Note.TAGS + " NOT LIKE '%" + "system:template" + "%'";
137 }141 }
138 return activity.managedQuery(notes, LIST_PROJECTION, where, null, null); 142 orderBy = Note.MODIFIED_DATE + " DESC";
143 return activity.managedQuery(notes, LIST_PROJECTION, where, null, orderBy);
139 }144 }
140 145
141146
142 public static ListAdapter getListAdapter(Activity activity) {147 public static ListAdapter getListAdapter(Activity activity) {
148
143 Cursor notesCursor = getAllNotes(activity, false);149 Cursor notesCursor = getAllNotes(activity, false);
144 150
145 // set up an adapter binding the TITLE field of the cursor to the list item151 // set up an adapter binding the TITLE field of the cursor to the list item
146 String[] from = new String[] { Note.TITLE };152 String[] from = new String[] { Note.TITLE, Note.MODIFIED_DATE };
147 int[] to = new int[] { R.id.note_title };153 int[] to = new int[] { R.id.note_title, R.id.note_date };
148 return new SimpleCursorAdapter(activity, R.layout.main_list_item, notesCursor, from, to);154 return new NoteListCursorAdapter(activity, R.layout.main_list_item, notesCursor, from, to);
149 }155 }
150156
151 // gets the titles of the notes present in the db, used in ViewNote.buildLinkifyPattern()157 // gets the titles of the notes present in the db, used in ViewNote.buildLinkifyPattern()
152158
=== modified file 'src/org/tomdroid/sync/SyncManager.java'
--- src/org/tomdroid/sync/SyncManager.java 2010-08-30 16:33:02 +0000
+++ src/org/tomdroid/sync/SyncManager.java 2010-09-30 19:43:47 +0000
@@ -31,6 +31,7 @@
3131
32import android.app.Activity;32import android.app.Activity;
33import android.os.Handler;33import android.os.Handler;
34import android.util.Log;
3435
35public class SyncManager {36public class SyncManager {
36 37
@@ -49,7 +50,7 @@
49 public SyncService getService(String name) {50 public SyncService getService(String name) {
50 51
51 for (int i = 0; i < services.size(); i++) {52 for (int i = 0; i < services.size(); i++) {
52 SyncService service = services.get(i);53 SyncService service = services.get(i);
53 if (name.equals(service.getName()))54 if (name.equals(service.getName()))
54 return service;55 return service;
55 }56 }
@@ -64,7 +65,6 @@
64 }65 }
65 66
66 public SyncService getCurrentService() {67 public SyncService getCurrentService() {
67
68 String serviceName = Preferences.getString(Preferences.Key.SYNC_SERVICE);68 String serviceName = Preferences.getString(Preferences.Key.SYNC_SERVICE);
69 return getService(serviceName);69 return getService(serviceName);
70 }70 }
7171
=== modified file 'src/org/tomdroid/ui/PreferencesActivity.java'
--- src/org/tomdroid/ui/PreferencesActivity.java 2010-09-26 11:35:20 +0000
+++ src/org/tomdroid/ui/PreferencesActivity.java 2010-09-30 19:43:47 +0000
@@ -101,6 +101,7 @@
101 }101 }
102 102
103 });103 });
104
104 }105 }
105 106
106 private void authenticate(String serverUri) {107 private void authenticate(String serverUri) {
@@ -173,13 +174,14 @@
173 syncServer.setDefaultValue(defaultServer);174 syncServer.setDefaultValue(defaultServer);
174 if(syncServer.getText() == null)175 if(syncServer.getText() == null)
175 syncServer.setText(defaultServer);176 syncServer.setText(defaultServer);
176 177
177 String defaultService = (String)Preferences.Key.SYNC_SERVICE.getDefault();178 String defaultService = (String)Preferences.Key.SYNC_SERVICE.getDefault();
178 syncService.setDefaultValue(defaultService);179 syncService.setDefaultValue(defaultService);
179 if(syncService.getValue() == null)180 if(syncService.getValue() == null)
180 syncService.setValue(defaultService);181 syncService.setValue(defaultService);
182
181 }183 }
182 184
183 private void setServer(String syncServiceKey) {185 private void setServer(String syncServiceKey) {
184186
185 SyncService service = SyncManager.getInstance().getService(syncServiceKey);187 SyncService service = SyncManager.getInstance().getService(syncServiceKey);
@@ -195,7 +197,7 @@
195 syncService.setSummary(service.getDescription());197 syncService.setSummary(service.getDescription());
196198
197 }199 }
198 200
199 private void connectionFailed() {201 private void connectionFailed() {
200 new AlertDialog.Builder(this)202 new AlertDialog.Builder(this)
201 .setMessage(getString(R.string.prefSyncConnectionFailed))203 .setMessage(getString(R.string.prefSyncConnectionFailed))
202204
=== modified file 'src/org/tomdroid/ui/Tomdroid.java'
--- src/org/tomdroid/ui/Tomdroid.java 2010-09-26 11:35:20 +0000
+++ src/org/tomdroid/ui/Tomdroid.java 2010-09-30 19:43:47 +0000
@@ -122,6 +122,7 @@
122 MenuInflater inflater = getMenuInflater();122 MenuInflater inflater = getMenuInflater();
123 inflater.inflate(R.menu.main, menu);123 inflater.inflate(R.menu.main, menu);
124 return true;124 return true;
125
125 }126 }
126127
127 @Override128 @Override
128129
=== modified file 'src/org/tomdroid/ui/ViewNote.java'
--- src/org/tomdroid/ui/ViewNote.java 2010-08-30 16:33:02 +0000
+++ src/org/tomdroid/ui/ViewNote.java 2010-09-30 19:43:47 +0000
@@ -39,6 +39,7 @@
39import android.content.Intent;39import android.content.Intent;
40import android.content.DialogInterface.OnClickListener;40import android.content.DialogInterface.OnClickListener;
41import android.database.Cursor;41import android.database.Cursor;
42import android.graphics.Color;
42import android.net.Uri;43import android.net.Uri;
43import android.os.Bundle;44import android.os.Bundle;
44import android.os.Handler;45import android.os.Handler;
@@ -54,6 +55,7 @@
54public class ViewNote extends Activity {55public class ViewNote extends Activity {
55 56
56 // UI elements57 // UI elements
58 private TextView title;
57 private TextView content;59 private TextView content;
58 60
59 // Model objects61 // Model objects
@@ -73,6 +75,14 @@
73 75
74 setContentView(R.layout.note_view);76 setContentView(R.layout.note_view);
75 content = (TextView) findViewById(R.id.content);77 content = (TextView) findViewById(R.id.content);
78 content.setBackgroundColor(0xffffffff);
79 content.setTextColor(Color.DKGRAY);
80 content.setTextSize(18.0f);
81 title = (TextView) findViewById(R.id.title);
82 title.setBackgroundColor(0xffdddddd);
83 title.setTextColor(Color.DKGRAY);
84 title.setTextSize(18.0f);
85
76 final Intent intent = getIntent();86 final Intent intent = getIntent();
77 Uri uri = intent.getData();87 Uri uri = intent.getData();
78 88
@@ -91,6 +101,8 @@
91 101
92 noteContent = note.getNoteContent(noteContentHandler);102 noteContent = note.getNoteContent(noteContentHandler);
93 103
104 //Log.i(TAG, "THE NOTE IS: " + note.getXmlContent().toString());
105
94 } else {106 } else {
95 107
96 if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "The note "+uri+" doesn't exist");108 if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "The note "+uri+" doesn't exist");
@@ -146,7 +158,7 @@
146 }158 }
147 159
148 private void showNote() {160 private void showNote() {
149 setTitle(note.getTitle());161 //setTitle(note.getTitle());
150162
151 // get rid of the title that is doubled in the note's content163 // get rid of the title that is doubled in the note's content
152 // using quote to escape potential regexp chars in pattern164 // using quote to escape potential regexp chars in pattern
@@ -159,6 +171,7 @@
159 171
160 // show the note (spannable makes the TextView able to output styled text)172 // show the note (spannable makes the TextView able to output styled text)
161 content.setText(noteContent, TextView.BufferType.SPANNABLE);173 content.setText(noteContent, TextView.BufferType.SPANNABLE);
174 title.setText((CharSequence) note.getTitle());
162 175
163 // add links to stuff that is understood by Android except phone numbers because it's too aggressive176 // add links to stuff that is understood by Android except phone numbers because it's too aggressive
164 // TODO this is SLOWWWW!!!!177 // TODO this is SLOWWWW!!!!
165178
=== added file 'src/org/tomdroid/util/NoteListCursorAdapter.java'
--- src/org/tomdroid/util/NoteListCursorAdapter.java 1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/util/NoteListCursorAdapter.java 2010-09-30 19:43:47 +0000
@@ -0,0 +1,113 @@
1package org.tomdroid.util;
2
3import java.text.DateFormat;
4import java.util.Date;
5
6import android.text.format.DateUtils;
7import android.text.format.Time;
8import org.tomdroid.Note;
9import org.tomdroid.R;
10import org.tomdroid.ui.Tomdroid;
11
12import android.content.Context;
13import android.database.Cursor;
14import android.graphics.Color;
15import android.view.LayoutInflater;
16import android.view.View;
17import android.view.ViewGroup;
18import android.widget.Filterable;
19import android.widget.SimpleCursorAdapter;
20import android.widget.TextView;
21
22/* Provides a custom ListView layout for Note List */
23
24public class NoteListCursorAdapter extends SimpleCursorAdapter {
25
26 private Context context;
27
28 private int layout;
29 private int[] colors = new int[] { 0xFFFFFFFF, 0xFFEEEEEE };
30
31 private DateFormat localeDateFormat;
32 private DateFormat localeTimeFormat;
33
34 public NoteListCursorAdapter (Context context, int layout, Cursor c, String[] from, int[] to) {
35 super(context, layout, c, from, to);
36 this.context = context;
37 this.layout = layout;
38 localeDateFormat = DateFormat.getDateInstance(DateFormat.SHORT);
39 localeTimeFormat = DateFormat.getTimeInstance(DateFormat.SHORT);
40 }
41
42
43 @Override
44 public View newView(Context context, Cursor cursor, ViewGroup parent) {
45
46 Cursor c = getCursor();
47
48 final LayoutInflater inflater = LayoutInflater.from(context);
49 View v = inflater.inflate(layout, parent, false);
50
51 populateFields(v, c);
52
53 return v;
54 }
55
56 @Override
57 public void bindView(View v, Context context, Cursor c) {
58
59 populateFields(v, c);
60 }
61
62 @Override
63 public View getView(int position, View convertView, ViewGroup parent) {
64 View view = super.getView(position, convertView, parent);
65 int colorPos = position % colors.length;
66 view.setBackgroundColor(colors[colorPos]);
67 //view.setTextColor(Color.DKGRAY);
68 return view;
69 }
70
71 private void populateFields(View v, Cursor c){
72
73 int nameCol = c.getColumnIndex(Note.TITLE);
74 int modifiedCol = c.getColumnIndex(Note.MODIFIED_DATE);
75
76 String title = c.getString(nameCol);
77
78 //Format last modified dates to be similar to desktop Tomboy
79 //TODO this is messy - must be a better way than having 3 separate date types
80 Time lastModified = new Time();
81 lastModified.parse3339(c.getString(modifiedCol));
82 Long lastModifiedMillis = lastModified.toMillis(false);
83 Date lastModifiedDate = new Date(lastModifiedMillis);
84
85 String strModified = "Modified: ";
86 //TODO this is very inefficient
87 if (DateUtils.isToday(lastModifiedMillis)){
88 strModified += "Today, " + localeTimeFormat.format(lastModifiedDate);
89 } else {
90 // Add a day to the last modified date - if the date is now today, it means the note was edited yesterday
91 Time yesterdayTest = lastModified;
92 yesterdayTest.monthDay += 1;
93 if (DateUtils.isToday(yesterdayTest.toMillis(false))){
94 strModified += "Yesterday, " + localeTimeFormat.format(lastModifiedDate);
95 } else {
96 strModified += localeDateFormat.format(lastModifiedDate) + ", " + localeTimeFormat.format(lastModifiedDate);
97 }
98 }
99
100 /**
101 * Next set the name of the entry.
102 */
103 TextView note_title = (TextView) v.findViewById(R.id.note_title);
104 if (note_title != null) {
105 note_title.setText(title);
106 }
107 TextView note_modified = (TextView) v.findViewById(R.id.note_date);
108 if (note_modified != null) {
109 note_modified.setText(strModified);
110 }
111 }
112
113}
0114
=== modified file 'src/org/tomdroid/util/Preferences.java'
--- src/org/tomdroid/util/Preferences.java 2010-08-30 16:33:02 +0000
+++ src/org/tomdroid/util/Preferences.java 2010-09-30 19:43:47 +0000
@@ -42,6 +42,7 @@
42 ACCESS_TOKEN_URL ("access_token_url", ""),42 ACCESS_TOKEN_URL ("access_token_url", ""),
43 REQUEST_TOKEN_URL ("request_token_url", ""),43 REQUEST_TOKEN_URL ("request_token_url", ""),
44 LATEST_SYNC_REVISION ("latest_sync_revision", 0L),44 LATEST_SYNC_REVISION ("latest_sync_revision", 0L),
45 SORT_ORDER ("sort_order", "sort_date"),
45 FIRST_RUN ("first_run", true);46 FIRST_RUN ("first_run", true);
46 47
47 private String name = "";48 private String name = "";

Subscribers

People subscribed via source and target branches