Merge lp:~saturnreturn/tomdroid/freshen-ui into lp:~tomdroid-dev/tomdroid/sync-ui
- freshen-ui
- Merge into sync-ui
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 |
Related bugs: |
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.
- 212. By Matthew Stevenson <matt@matt-desktop>
-
Change theme back to Light in manifest
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:/
> You are the owner of lp:~saturnreturn/tomdroid/freshen-ui.
>
Rodja (trappe) wrote : | # |
All fine with me. Merge is done.
Preview Diff
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 | 11 | <application | 11 | <application |
6 | 12 | android:icon="@drawable/icon" | 12 | android:icon="@drawable/icon" |
7 | 13 | android:label="@string/app_name" | 13 | android:label="@string/app_name" |
11 | 14 | android:theme="@android:style/Theme.Light.NoTitleBar" | 14 | android:theme="@android:style/Theme.Light.NoTitleBar"> |
9 | 15 | android:debuggable="true" | ||
10 | 16 | > | ||
12 | 17 | 15 | ||
13 | 18 | <activity android:label="@string/app_name" | 16 | <activity android:label="@string/app_name" |
14 | 19 | android:name=".ui.Tomdroid" | 17 | android:name=".ui.Tomdroid" |
15 | 20 | 18 | ||
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 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
21 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
22 | 3 | |||
23 | 4 | <svg | ||
24 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
25 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
26 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
27 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
28 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
29 | 10 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
30 | 11 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
31 | 12 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
32 | 13 | width="48" | ||
33 | 14 | height="48" | ||
34 | 15 | id="svg2394" | ||
35 | 16 | sodipodi:version="0.32" | ||
36 | 17 | inkscape:version="0.47 r22583" | ||
37 | 18 | version="1.0" | ||
38 | 19 | sodipodi:docname="tomdroid-4.png" | ||
39 | 20 | inkscape:output_extension="org.inkscape.output.svg.inkscape" | ||
40 | 21 | inkscape:export-filename="/data/code/android/web-sync/res/drawable/tomdroid-4.png" | ||
41 | 22 | inkscape:export-xdpi="90" | ||
42 | 23 | inkscape:export-ydpi="90"> | ||
43 | 24 | <defs | ||
44 | 25 | id="defs2396"> | ||
45 | 26 | <inkscape:perspective | ||
46 | 27 | sodipodi:type="inkscape:persp3d" | ||
47 | 28 | inkscape:vp_x="0 : 526.18109 : 1" | ||
48 | 29 | inkscape:vp_y="0 : 1000 : 0" | ||
49 | 30 | inkscape:vp_z="744.09448 : 526.18109 : 1" | ||
50 | 31 | inkscape:persp3d-origin="372.04724 : 350.78739 : 1" | ||
51 | 32 | id="perspective2402" /> | ||
52 | 33 | <linearGradient | ||
53 | 34 | id="linearGradient6377"> | ||
54 | 35 | <stop | ||
55 | 36 | id="stop6379" | ||
56 | 37 | offset="0" | ||
57 | 38 | style="stop-color:#fff27e;stop-opacity:1;" /> | ||
58 | 39 | <stop | ||
59 | 40 | id="stop6381" | ||
60 | 41 | offset="1" | ||
61 | 42 | style="stop-color:#edd400;stop-opacity:1;" /> | ||
62 | 43 | </linearGradient> | ||
63 | 44 | <linearGradient | ||
64 | 45 | id="linearGradient2966"> | ||
65 | 46 | <stop | ||
66 | 47 | style="stop-color:#ffd1d1;stop-opacity:1;" | ||
67 | 48 | offset="0" | ||
68 | 49 | id="stop2968" /> | ||
69 | 50 | <stop | ||
70 | 51 | id="stop3006" | ||
71 | 52 | offset="0.5" | ||
72 | 53 | style="stop-color:#ff1d1d;stop-opacity:1;" /> | ||
73 | 54 | <stop | ||
74 | 55 | style="stop-color:#6f0000;stop-opacity:1;" | ||
75 | 56 | offset="1" | ||
76 | 57 | id="stop2970" /> | ||
77 | 58 | </linearGradient> | ||
78 | 59 | <linearGradient | ||
79 | 60 | id="linearGradient2974"> | ||
80 | 61 | <stop | ||
81 | 62 | style="stop-color:#c1c1c1;stop-opacity:1;" | ||
82 | 63 | offset="0" | ||
83 | 64 | id="stop2976" /> | ||
84 | 65 | <stop | ||
85 | 66 | style="stop-color:#acacac;stop-opacity:1;" | ||
86 | 67 | offset="1" | ||
87 | 68 | id="stop2978" /> | ||
88 | 69 | </linearGradient> | ||
89 | 70 | <linearGradient | ||
90 | 71 | id="linearGradient2994"> | ||
91 | 72 | <stop | ||
92 | 73 | style="stop-color:#000000;stop-opacity:1;" | ||
93 | 74 | offset="0" | ||
94 | 75 | id="stop2996" /> | ||
95 | 76 | <stop | ||
96 | 77 | style="stop-color:#c9c9c9;stop-opacity:1;" | ||
97 | 78 | offset="1" | ||
98 | 79 | id="stop2998" /> | ||
99 | 80 | </linearGradient> | ||
100 | 81 | <inkscape:perspective | ||
101 | 82 | id="perspective2705" | ||
102 | 83 | inkscape:persp3d-origin="24 : 16 : 1" | ||
103 | 84 | inkscape:vp_z="48 : 24 : 1" | ||
104 | 85 | inkscape:vp_y="0 : 1000 : 0" | ||
105 | 86 | inkscape:vp_x="0 : 24 : 1" | ||
106 | 87 | sodipodi:type="inkscape:persp3d" /> | ||
107 | 88 | <inkscape:perspective | ||
108 | 89 | id="perspective3103" | ||
109 | 90 | inkscape:persp3d-origin="60 : 46.666667 : 1" | ||
110 | 91 | inkscape:vp_z="120 : 70 : 1" | ||
111 | 92 | inkscape:vp_y="0 : 1000 : 0" | ||
112 | 93 | inkscape:vp_x="0 : 70 : 1" | ||
113 | 94 | sodipodi:type="inkscape:persp3d" /> | ||
114 | 95 | <radialGradient | ||
115 | 96 | gradientUnits="userSpaceOnUse" | ||
116 | 97 | gradientTransform="matrix(1,0,0,0.361345,0,22.29694)" | ||
117 | 98 | r="5.2591065" | ||
118 | 99 | fy="31.780704" | ||
119 | 100 | fx="39.907337" | ||
120 | 101 | cy="31.780704" | ||
121 | 102 | cx="39.907337" | ||
122 | 103 | id="radialGradient6423" | ||
123 | 104 | xlink:href="#linearGradient6417" | ||
124 | 105 | inkscape:collect="always" /> | ||
125 | 106 | <radialGradient | ||
126 | 107 | gradientUnits="userSpaceOnUse" | ||
127 | 108 | gradientTransform="matrix(10.88255,-6.454846e-8,0,11.39737,-433.5968,-381.3811)" | ||
128 | 109 | r="20.21875" | ||
129 | 110 | fy="35.90107" | ||
130 | 111 | fx="43.875" | ||
131 | 112 | cy="35.90107" | ||
132 | 113 | cx="43.875" | ||
133 | 114 | id="radialGradient6413" | ||
134 | 115 | xlink:href="#linearGradient6407" | ||
135 | 116 | inkscape:collect="always" /> | ||
136 | 117 | <radialGradient | ||
137 | 118 | r="21.626934" | ||
138 | 119 | fy="35.915409" | ||
139 | 120 | fx="45.150326" | ||
140 | 121 | cy="35.915409" | ||
141 | 122 | cx="45.150326" | ||
142 | 123 | gradientTransform="matrix(1.669712,0,1.702451e-8,1.220484,-30.23773,-11.79928)" | ||
143 | 124 | gradientUnits="userSpaceOnUse" | ||
144 | 125 | id="radialGradient6405" | ||
145 | 126 | xlink:href="#linearGradient6377" | ||
146 | 127 | inkscape:collect="always" /> | ||
147 | 128 | <linearGradient | ||
148 | 129 | gradientUnits="userSpaceOnUse" | ||
149 | 130 | y2="67.031342" | ||
150 | 131 | x2="26.130388" | ||
151 | 132 | y1="14.08672" | ||
152 | 133 | x1="26.213203" | ||
153 | 134 | id="linearGradient5615" | ||
154 | 135 | xlink:href="#linearGradient5609" | ||
155 | 136 | inkscape:collect="always" /> | ||
156 | 137 | <linearGradient | ||
157 | 138 | id="linearGradient5609" | ||
158 | 139 | inkscape:collect="always"> | ||
159 | 140 | <stop | ||
160 | 141 | id="stop5611" | ||
161 | 142 | offset="0" | ||
162 | 143 | style="stop-color:white;stop-opacity:1;" /> | ||
163 | 144 | <stop | ||
164 | 145 | id="stop5613" | ||
165 | 146 | offset="1" | ||
166 | 147 | style="stop-color:white;stop-opacity:0;" /> | ||
167 | 148 | </linearGradient> | ||
168 | 149 | <linearGradient | ||
169 | 150 | id="linearGradient3342"> | ||
170 | 151 | <stop | ||
171 | 152 | id="stop3344" | ||
172 | 153 | offset="0" | ||
173 | 154 | style="stop-color:#fff27e;stop-opacity:1;" /> | ||
174 | 155 | <stop | ||
175 | 156 | id="stop3346" | ||
176 | 157 | offset="1" | ||
177 | 158 | style="stop-color:#edd400;stop-opacity:1;" /> | ||
178 | 159 | </linearGradient> | ||
179 | 160 | <linearGradient | ||
180 | 161 | id="linearGradient6407" | ||
181 | 162 | inkscape:collect="always"> | ||
182 | 163 | <stop | ||
183 | 164 | id="stop6409" | ||
184 | 165 | offset="0" | ||
185 | 166 | style="stop-color:white;stop-opacity:1;" /> | ||
186 | 167 | <stop | ||
187 | 168 | id="stop6411" | ||
188 | 169 | offset="1" | ||
189 | 170 | style="stop-color:white;stop-opacity:0;" /> | ||
190 | 171 | </linearGradient> | ||
191 | 172 | <linearGradient | ||
192 | 173 | id="linearGradient6417" | ||
193 | 174 | inkscape:collect="always"> | ||
194 | 175 | <stop | ||
195 | 176 | id="stop6419" | ||
196 | 177 | offset="0" | ||
197 | 178 | style="stop-color:black;stop-opacity:1;" /> | ||
198 | 179 | <stop | ||
199 | 180 | id="stop6421" | ||
200 | 181 | offset="1" | ||
201 | 182 | style="stop-color:black;stop-opacity:0;" /> | ||
202 | 183 | </linearGradient> | ||
203 | 184 | <linearGradient | ||
204 | 185 | id="linearGradient3326"> | ||
205 | 186 | <stop | ||
206 | 187 | style="stop-color:#ffd1d1;stop-opacity:1;" | ||
207 | 188 | offset="0" | ||
208 | 189 | id="stop3328" /> | ||
209 | 190 | <stop | ||
210 | 191 | id="stop3330" | ||
211 | 192 | offset="0.5" | ||
212 | 193 | style="stop-color:#ff1d1d;stop-opacity:1;" /> | ||
213 | 194 | <stop | ||
214 | 195 | style="stop-color:#6f0000;stop-opacity:1;" | ||
215 | 196 | offset="1" | ||
216 | 197 | id="stop3332" /> | ||
217 | 198 | </linearGradient> | ||
218 | 199 | <linearGradient | ||
219 | 200 | id="linearGradient3319"> | ||
220 | 201 | <stop | ||
221 | 202 | style="stop-color:#c1c1c1;stop-opacity:1;" | ||
222 | 203 | offset="0" | ||
223 | 204 | id="stop3321" /> | ||
224 | 205 | <stop | ||
225 | 206 | style="stop-color:#acacac;stop-opacity:1;" | ||
226 | 207 | offset="1" | ||
227 | 208 | id="stop3323" /> | ||
228 | 209 | </linearGradient> | ||
229 | 210 | <linearGradient | ||
230 | 211 | inkscape:collect="always" | ||
231 | 212 | id="linearGradient2984"> | ||
232 | 213 | <stop | ||
233 | 214 | style="stop-color:#e7e2b8;stop-opacity:1;" | ||
234 | 215 | offset="0" | ||
235 | 216 | id="stop2986" /> | ||
236 | 217 | <stop | ||
237 | 218 | style="stop-color:#e7e2b8;stop-opacity:0;" | ||
238 | 219 | offset="1" | ||
239 | 220 | id="stop2988" /> | ||
240 | 221 | </linearGradient> | ||
241 | 222 | <linearGradient | ||
242 | 223 | id="linearGradient3308"> | ||
243 | 224 | <stop | ||
244 | 225 | style="stop-color:#000000;stop-opacity:1;" | ||
245 | 226 | offset="0" | ||
246 | 227 | id="stop3310" /> | ||
247 | 228 | <stop | ||
248 | 229 | style="stop-color:#c9c9c9;stop-opacity:1;" | ||
249 | 230 | offset="1" | ||
250 | 231 | id="stop3312" /> | ||
251 | 232 | </linearGradient> | ||
252 | 233 | <inkscape:perspective | ||
253 | 234 | id="perspective3305" | ||
254 | 235 | inkscape:persp3d-origin="24 : 16 : 1" | ||
255 | 236 | inkscape:vp_z="48 : 24 : 1" | ||
256 | 237 | inkscape:vp_y="0 : 1000 : 0" | ||
257 | 238 | inkscape:vp_x="0 : 24 : 1" | ||
258 | 239 | sodipodi:type="inkscape:persp3d" /> | ||
259 | 240 | <linearGradient | ||
260 | 241 | inkscape:collect="always" | ||
261 | 242 | xlink:href="#linearGradient2966" | ||
262 | 243 | id="linearGradient4272" | ||
263 | 244 | gradientUnits="userSpaceOnUse" | ||
264 | 245 | gradientTransform="translate(-5.669292,0)" | ||
265 | 246 | x1="48.90625" | ||
266 | 247 | y1="17.376184" | ||
267 | 248 | x2="50.988335" | ||
268 | 249 | y2="22.250591" /> | ||
269 | 250 | <linearGradient | ||
270 | 251 | inkscape:collect="always" | ||
271 | 252 | xlink:href="#linearGradient2974" | ||
272 | 253 | id="linearGradient4274" | ||
273 | 254 | gradientUnits="userSpaceOnUse" | ||
274 | 255 | gradientTransform="translate(-5.669292,0)" | ||
275 | 256 | x1="46" | ||
276 | 257 | y1="19.8125" | ||
277 | 258 | x2="47.6875" | ||
278 | 259 | y2="22.625" /> | ||
279 | 260 | <radialGradient | ||
280 | 261 | inkscape:collect="always" | ||
281 | 262 | xlink:href="#linearGradient2984" | ||
282 | 263 | id="radialGradient4276" | ||
283 | 264 | gradientUnits="userSpaceOnUse" | ||
284 | 265 | gradientTransform="matrix(2.923565,0,0,2.029717,-61.55532,-27.88417)" | ||
285 | 266 | cx="29.053354" | ||
286 | 267 | cy="27.640751" | ||
287 | 268 | fx="29.053354" | ||
288 | 269 | fy="27.640751" | ||
289 | 270 | r="3.2408544" /> | ||
290 | 271 | <linearGradient | ||
291 | 272 | inkscape:collect="always" | ||
292 | 273 | xlink:href="#linearGradient2994" | ||
293 | 274 | id="linearGradient4278" | ||
294 | 275 | gradientUnits="userSpaceOnUse" | ||
295 | 276 | gradientTransform="translate(-5.825542,0.125)" | ||
296 | 277 | x1="25.71875" | ||
297 | 278 | y1="31.046875" | ||
298 | 279 | x2="25.514589" | ||
299 | 280 | y2="30.703125" /> | ||
300 | 281 | <inkscape:perspective | ||
301 | 282 | id="perspective5044" | ||
302 | 283 | inkscape:persp3d-origin="0.5 : 0.33333333 : 1" | ||
303 | 284 | inkscape:vp_z="1 : 0.5 : 1" | ||
304 | 285 | inkscape:vp_y="0 : 1000 : 0" | ||
305 | 286 | inkscape:vp_x="0 : 0.5 : 1" | ||
306 | 287 | sodipodi:type="inkscape:persp3d" /> | ||
307 | 288 | <inkscape:perspective | ||
308 | 289 | id="perspective5252" | ||
309 | 290 | inkscape:persp3d-origin="0.5 : 0.33333333 : 1" | ||
310 | 291 | inkscape:vp_z="1 : 0.5 : 1" | ||
311 | 292 | inkscape:vp_y="0 : 1000 : 0" | ||
312 | 293 | inkscape:vp_x="0 : 0.5 : 1" | ||
313 | 294 | sodipodi:type="inkscape:persp3d" /> | ||
314 | 295 | <inkscape:perspective | ||
315 | 296 | id="perspective5278" | ||
316 | 297 | inkscape:persp3d-origin="0.5 : 0.33333333 : 1" | ||
317 | 298 | inkscape:vp_z="1 : 0.5 : 1" | ||
318 | 299 | inkscape:vp_y="0 : 1000 : 0" | ||
319 | 300 | inkscape:vp_x="0 : 0.5 : 1" | ||
320 | 301 | sodipodi:type="inkscape:persp3d" /> | ||
321 | 302 | <inkscape:perspective | ||
322 | 303 | id="perspective5380" | ||
323 | 304 | inkscape:persp3d-origin="0.5 : 0.33333333 : 1" | ||
324 | 305 | inkscape:vp_z="1 : 0.5 : 1" | ||
325 | 306 | inkscape:vp_y="0 : 1000 : 0" | ||
326 | 307 | inkscape:vp_x="0 : 0.5 : 1" | ||
327 | 308 | sodipodi:type="inkscape:persp3d" /> | ||
328 | 309 | <inkscape:perspective | ||
329 | 310 | id="perspective5404" | ||
330 | 311 | inkscape:persp3d-origin="0.5 : 0.33333333 : 1" | ||
331 | 312 | inkscape:vp_z="1 : 0.5 : 1" | ||
332 | 313 | inkscape:vp_y="0 : 1000 : 0" | ||
333 | 314 | inkscape:vp_x="0 : 0.5 : 1" | ||
334 | 315 | sodipodi:type="inkscape:persp3d" /> | ||
335 | 316 | <inkscape:perspective | ||
336 | 317 | id="perspective5433" | ||
337 | 318 | inkscape:persp3d-origin="0.5 : 0.33333333 : 1" | ||
338 | 319 | inkscape:vp_z="1 : 0.5 : 1" | ||
339 | 320 | inkscape:vp_y="0 : 1000 : 0" | ||
340 | 321 | inkscape:vp_x="0 : 0.5 : 1" | ||
341 | 322 | sodipodi:type="inkscape:persp3d" /> | ||
342 | 323 | <inkscape:perspective | ||
343 | 324 | id="perspective5459" | ||
344 | 325 | inkscape:persp3d-origin="0.5 : 0.33333333 : 1" | ||
345 | 326 | inkscape:vp_z="1 : 0.5 : 1" | ||
346 | 327 | inkscape:vp_y="0 : 1000 : 0" | ||
347 | 328 | inkscape:vp_x="0 : 0.5 : 1" | ||
348 | 329 | sodipodi:type="inkscape:persp3d" /> | ||
349 | 330 | <inkscape:perspective | ||
350 | 331 | id="perspective5509" | ||
351 | 332 | inkscape:persp3d-origin="0.5 : 0.33333333 : 1" | ||
352 | 333 | inkscape:vp_z="1 : 0.5 : 1" | ||
353 | 334 | inkscape:vp_y="0 : 1000 : 0" | ||
354 | 335 | inkscape:vp_x="0 : 0.5 : 1" | ||
355 | 336 | sodipodi:type="inkscape:persp3d" /> | ||
356 | 337 | <inkscape:perspective | ||
357 | 338 | id="perspective5564" | ||
358 | 339 | inkscape:persp3d-origin="0.5 : 0.33333333 : 1" | ||
359 | 340 | inkscape:vp_z="1 : 0.5 : 1" | ||
360 | 341 | inkscape:vp_y="0 : 1000 : 0" | ||
361 | 342 | inkscape:vp_x="0 : 0.5 : 1" | ||
362 | 343 | sodipodi:type="inkscape:persp3d" /> | ||
363 | 344 | </defs> | ||
364 | 345 | <sodipodi:namedview | ||
365 | 346 | id="base" | ||
366 | 347 | pagecolor="#ffffff" | ||
367 | 348 | bordercolor="#666666" | ||
368 | 349 | borderopacity="1.0" | ||
369 | 350 | inkscape:pageopacity="0.0" | ||
370 | 351 | inkscape:pageshadow="2" | ||
371 | 352 | inkscape:zoom="7.9195959" | ||
372 | 353 | inkscape:cx="25.379657" | ||
373 | 354 | inkscape:cy="34.644751" | ||
374 | 355 | inkscape:document-units="px" | ||
375 | 356 | inkscape:current-layer="layer1" | ||
376 | 357 | showgrid="false" | ||
377 | 358 | inkscape:window-width="1280" | ||
378 | 359 | inkscape:window-height="976" | ||
379 | 360 | inkscape:window-x="0" | ||
380 | 361 | inkscape:window-y="25" | ||
381 | 362 | inkscape:window-maximized="1" /> | ||
382 | 363 | <metadata | ||
383 | 364 | id="metadata2399"> | ||
384 | 365 | <rdf:RDF> | ||
385 | 366 | <cc:Work | ||
386 | 367 | rdf:about=""> | ||
387 | 368 | <dc:format>image/svg+xml</dc:format> | ||
388 | 369 | <dc:type | ||
389 | 370 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
390 | 371 | <dc:title></dc:title> | ||
391 | 372 | <dc:date>2009-04-02</dc:date> | ||
392 | 373 | <dc:creator> | ||
393 | 374 | <cc:Agent> | ||
394 | 375 | <dc:title>Olivier Bilodeau</dc:title> | ||
395 | 376 | </cc:Agent> | ||
396 | 377 | </dc:creator> | ||
397 | 378 | <dc:description>A mashup of Tomboy's icon and Android's logo. Both available under free licences.</dc:description> | ||
398 | 379 | </cc:Work> | ||
399 | 380 | </rdf:RDF> | ||
400 | 381 | </metadata> | ||
401 | 382 | <g | ||
402 | 383 | inkscape:label="Calque 1" | ||
403 | 384 | inkscape:groupmode="layer" | ||
404 | 385 | id="layer1"> | ||
405 | 386 | <g | ||
406 | 387 | id="g4242" | ||
407 | 388 | transform="translate(-0.1684169,3.5830001)"> | ||
408 | 389 | <path | ||
409 | 390 | sodipodi:nodetypes="ccccccccccc" | ||
410 | 391 | id="rect1975" | ||
411 | 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" | ||
412 | 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" /> | ||
413 | 394 | <rect | ||
414 | 395 | ry="0.67937863" | ||
415 | 396 | rx="0.67937863" | ||
416 | 397 | y="35.957905" | ||
417 | 398 | x="5.1146202" | ||
418 | 399 | height="7.0714951" | ||
419 | 400 | width="39.048077" | ||
420 | 401 | id="rect2851" | ||
421 | 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" /> | ||
422 | 403 | <path | ||
423 | 404 | sodipodi:nodetypes="ccccccc" | ||
424 | 405 | id="path2853" | ||
425 | 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" | ||
426 | 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" /> | ||
427 | 408 | <path | ||
428 | 409 | id="path4730" | ||
429 | 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" | ||
430 | 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" /> | ||
431 | 412 | <path | ||
432 | 413 | sodipodi:nodetypes="cccc" | ||
433 | 414 | id="path6415" | ||
434 | 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" | ||
435 | 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" /> | ||
436 | 417 | <path | ||
437 | 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" | ||
438 | 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" | ||
439 | 420 | id="path2524" | ||
440 | 421 | sodipodi:nodetypes="cczczcccc" /> | ||
441 | 422 | <path | ||
442 | 423 | id="path6403" | ||
443 | 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" | ||
444 | 425 | style="opacity:0.46629214;fill:none;stroke:url(#radialGradient6413);stroke-width:0.99999964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> | ||
445 | 426 | <path | ||
446 | 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" | ||
447 | 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" | ||
448 | 429 | id="path6359" | ||
449 | 430 | sodipodi:nodetypes="ccccccc" /> | ||
450 | 431 | <path | ||
451 | 432 | sodipodi:nodetypes="ccccccc" | ||
452 | 433 | id="path6361" | ||
453 | 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" | ||
454 | 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" /> | ||
455 | 436 | <path | ||
456 | 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" | ||
457 | 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" | ||
458 | 439 | id="path6363" | ||
459 | 440 | sodipodi:nodetypes="ccccccc" /> | ||
460 | 441 | </g> | ||
461 | 442 | <g | ||
462 | 443 | id="g4166-6" | ||
463 | 444 | transform="matrix(1.0098472,0,0,0.98902752,-298.47562,-483.65964)" | ||
464 | 445 | style="fill:#c4a000;fill-opacity:1;stroke:none" /> | ||
465 | 446 | <g | ||
466 | 447 | id="g3106" | ||
467 | 448 | inkscape:label="Layer 1" | ||
468 | 449 | transform="matrix(0.9894224,0,0,0.9894224,86.886011,8.4726515)"> | ||
469 | 450 | <g | ||
470 | 451 | transform="translate(-299.00515,-503.07627)" | ||
471 | 452 | id="g3279" /> | ||
472 | 453 | </g> | ||
473 | 454 | <path | ||
474 | 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" | ||
475 | 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" | ||
476 | 457 | id="rect5365-8" /> | ||
477 | 458 | <g | ||
478 | 459 | id="g5488" | ||
479 | 460 | style="stroke:none" | ||
480 | 461 | transform="translate(0,0.39995194)"> | ||
481 | 462 | <path | ||
482 | 463 | id="rect5365" | ||
483 | 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" | ||
484 | 465 | style="fill:#97c024;fill-opacity:1;stroke:none" /> | ||
485 | 466 | <rect | ||
486 | 467 | rx="1.7022525" | ||
487 | 468 | y="23.661636" | ||
488 | 469 | x="19.224466" | ||
489 | 470 | height="9.5017471" | ||
490 | 471 | width="4.0090432" | ||
491 | 472 | id="rect5370" | ||
492 | 473 | style="fill:#97c024;fill-opacity:1;stroke:none" /> | ||
493 | 474 | <rect | ||
494 | 475 | rx="1.7022525" | ||
495 | 476 | y="23.645853" | ||
496 | 477 | x="25.80624" | ||
497 | 478 | height="9.5017471" | ||
498 | 479 | width="4.0090432" | ||
499 | 480 | id="rect5370-3" | ||
500 | 481 | style="fill:#97c024;fill-opacity:1;stroke:none" /> | ||
501 | 482 | <rect | ||
502 | 483 | rx="1.9887384" | ||
503 | 484 | y="11.413537" | ||
504 | 485 | x="10.922275" | ||
505 | 486 | height="12.405936" | ||
506 | 487 | width="3.9774768" | ||
507 | 488 | id="rect5394" | ||
508 | 489 | style="fill:#97c024;fill-opacity:1;stroke:none" /> | ||
509 | 490 | <rect | ||
510 | 491 | rx="1.9887384" | ||
511 | 492 | y="11.55559" | ||
512 | 493 | x="33.871677" | ||
513 | 494 | height="12.405936" | ||
514 | 495 | width="3.9774768" | ||
515 | 496 | id="rect5394-2" | ||
516 | 497 | style="fill:#97c024;fill-opacity:1;stroke:none" /> | ||
517 | 498 | <g | ||
518 | 499 | transform="translate(-0.20025,0)" | ||
519 | 500 | id="g5481" | ||
520 | 501 | style="stroke:none"> | ||
521 | 502 | <path | ||
522 | 503 | style="fill:#97c024;fill-opacity:1;stroke:none" | ||
523 | 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" | ||
524 | 505 | id="path5418" /> | ||
525 | 506 | <path | ||
526 | 507 | sodipodi:type="arc" | ||
527 | 508 | style="fill:#ffffff;fill-opacity:1;stroke:none" | ||
528 | 509 | id="path5449" | ||
529 | 510 | sodipodi:cx="21.37104" | ||
530 | 511 | sodipodi:cy="8.3357286" | ||
531 | 512 | sodipodi:rx="0.78918165" | ||
532 | 513 | sodipodi:ry="0.77339804" | ||
533 | 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" | ||
534 | 515 | transform="matrix(1.0212245,0,0,1.0212245,-1.4154165,-1.4231952)" /> | ||
535 | 516 | <path | ||
536 | 517 | sodipodi:type="arc" | ||
537 | 518 | style="fill:#ffffff;fill-opacity:1;stroke:none" | ||
538 | 519 | id="path5449-6" | ||
539 | 520 | sodipodi:cx="21.37104" | ||
540 | 521 | sodipodi:cy="8.3357286" | ||
541 | 522 | sodipodi:rx="0.78918165" | ||
542 | 523 | sodipodi:ry="0.77339804" | ||
543 | 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" | ||
544 | 525 | transform="matrix(1.0212245,0,0,1.0212245,6.7121839,-1.4238284)" /> | ||
545 | 526 | <rect | ||
546 | 527 | style="fill:#97c024;fill-opacity:1;stroke:none" | ||
547 | 528 | id="rect5423" | ||
548 | 529 | width="1.0101534" | ||
549 | 530 | height="5.0507627" | ||
550 | 531 | x="15.824705" | ||
551 | 532 | y="9.2116003" | ||
552 | 533 | rx="0.50507671" | ||
553 | 534 | transform="matrix(0.88965349,-0.45663625,0.45663625,0.88965349,0,0)" | ||
554 | 535 | ry="0.56354231" /> | ||
555 | 536 | <rect | ||
556 | 537 | style="fill:#97c024;fill-opacity:1;stroke:none" | ||
557 | 538 | id="rect5423-6" | ||
558 | 539 | width="1.0101534" | ||
559 | 540 | height="5.0507627" | ||
560 | 541 | x="-27.690969" | ||
561 | 542 | y="-13.159358" | ||
562 | 543 | rx="0.50507671" | ||
563 | 544 | transform="matrix(-0.88965349,-0.45663625,-0.45663625,0.88965349,0,0)" | ||
564 | 545 | ry="0.56354231" /> | ||
565 | 546 | </g> | ||
566 | 547 | </g> | ||
567 | 548 | <g | ||
568 | 549 | style="display:inline" | ||
569 | 550 | id="g1574" | ||
570 | 551 | transform="matrix(0.7113809,-0.1906141,0.1906141,0.7113809,19.866431,-7.0127809)" | ||
571 | 552 | inkscape:r_cx="true" | ||
572 | 553 | inkscape:r_cy="true"> | ||
573 | 554 | <path | ||
574 | 555 | transform="translate(-29.75546,19)" | ||
575 | 556 | sodipodi:nodetypes="cccccc" | ||
576 | 557 | id="path2960" | ||
577 | 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" | ||
578 | 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" | ||
579 | 560 | inkscape:r_cx="true" | ||
580 | 561 | inkscape:r_cy="true" /> | ||
581 | 562 | <path | ||
582 | 563 | transform="translate(-29.75546,19)" | ||
583 | 564 | style="fill:url(#linearGradient4272);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" | ||
584 | 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" | ||
585 | 566 | id="path2964" | ||
586 | 567 | sodipodi:nodetypes="czcczcc" | ||
587 | 568 | inkscape:r_cx="true" | ||
588 | 569 | inkscape:r_cy="true" /> | ||
589 | 570 | <path | ||
590 | 571 | transform="translate(-29.75546,19)" | ||
591 | 572 | sodipodi:nodetypes="czcczcc" | ||
592 | 573 | id="path2962" | ||
593 | 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" | ||
594 | 575 | style="fill:url(#linearGradient4274);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" | ||
595 | 576 | inkscape:r_cx="true" | ||
596 | 577 | inkscape:r_cy="true" /> | ||
597 | 578 | <path | ||
598 | 579 | transform="translate(-29.75546,19)" | ||
599 | 580 | sodipodi:nodetypes="cccc" | ||
600 | 581 | id="path2982" | ||
601 | 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" | ||
602 | 583 | style="fill:url(#radialGradient4276);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" | ||
603 | 584 | inkscape:r_cx="true" | ||
604 | 585 | inkscape:r_cy="true" /> | ||
605 | 586 | <path | ||
606 | 587 | transform="translate(-29.75546,19)" | ||
607 | 588 | sodipodi:nodetypes="cccc" | ||
608 | 589 | id="path2992" | ||
609 | 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" | ||
610 | 591 | style="fill:url(#linearGradient4278);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" | ||
611 | 592 | inkscape:r_cx="true" | ||
612 | 593 | inkscape:r_cy="true" /> | ||
613 | 594 | <path | ||
614 | 595 | transform="translate(-29.75546,19)" | ||
615 | 596 | sodipodi:nodetypes="ccccc" | ||
616 | 597 | id="path3002" | ||
617 | 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" | ||
618 | 599 | style="fill:#ffffff;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" | ||
619 | 600 | inkscape:r_cx="true" | ||
620 | 601 | inkscape:r_cy="true" /> | ||
621 | 602 | <path | ||
622 | 603 | transform="translate(-29.75546,19)" | ||
623 | 604 | sodipodi:nodetypes="ccccc" | ||
624 | 605 | id="path3004" | ||
625 | 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" | ||
626 | 607 | style="fill:#000000;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" | ||
627 | 608 | inkscape:r_cx="true" | ||
628 | 609 | inkscape:r_cy="true" /> | ||
629 | 610 | </g> | ||
630 | 611 | </g> | ||
631 | 612 | </svg> | ||
632 | 0 | 613 | ||
633 | === modified file 'res/drawable/icon.png' | |||
634 | 1 | Binary 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 | 614 | Binary 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 | 28 | android:background="#ddd" | 28 | android:background="#ddd" |
640 | 29 | android:gravity="center_horizontal" | 29 | android:gravity="center_horizontal" |
641 | 30 | android:orientation="horizontal"> | 30 | android:orientation="horizontal"> |
642 | 31 | <ImageView | ||
643 | 32 | android:id="@+id/action_icon" | ||
644 | 33 | android:src="@drawable/icon" | ||
645 | 34 | android:layout_height="wrap_content" | ||
646 | 35 | android:layout_width="wrap_content" | ||
647 | 36 | android:scaleType="fitStart" | ||
648 | 37 | android:padding="4dip" | ||
649 | 38 | /> | ||
650 | 31 | <TextView | 39 | <TextView |
651 | 32 | android:id="@+id/title" | 40 | android:id="@+id/title" |
652 | 33 | android:text="Tomdroid" | 41 | android:text="Tomdroid" |
655 | 34 | android:layout_margin="6dip" | 42 | android:layout_marginLeft="42dip" |
654 | 35 | android:layout_marginLeft="5dip" | ||
656 | 36 | android:layout_height="wrap_content" | 43 | android:layout_height="wrap_content" |
657 | 37 | android:layout_width="wrap_content" | 44 | android:layout_width="wrap_content" |
659 | 38 | android:textSize="24dip" | 45 | android:textSize="18dip" |
660 | 46 | android:textStyle="bold" | ||
661 | 47 | android:textColor="#FF555555" | ||
662 | 48 | android:singleLine="true" | ||
663 | 49 | android:ellipsize="marquee" | ||
664 | 50 | android:fadingEdge="horizontal" | ||
665 | 51 | android:fadingEdgeLength="5mm" | ||
666 | 52 | android:paddingTop="10dip" | ||
667 | 53 | android:paddingRight="30dip" | ||
668 | 39 | /> | 54 | /> |
669 | 40 | <ImageView | 55 | <ImageView |
670 | 41 | android:id="@+id/sync" | 56 | android:id="@+id/sync" |
671 | 42 | 57 | ||
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 | 26 | android:layout_height="fill_parent" | 26 | android:layout_height="fill_parent" |
677 | 27 | android:orientation="vertical" | 27 | android:orientation="vertical" |
678 | 28 | > | 28 | > |
679 | 29 | |||
680 | 29 | <include android:id="@+id/actionbar" layout="@layout/actionbar" /> | 30 | <include android:id="@+id/actionbar" layout="@layout/actionbar" /> |
682 | 30 | <ListView android:id="@+id/android:list" | 31 | |
683 | 32 | <ListView android:id="@android:id/android:list" | ||
684 | 31 | android:layout_width="fill_parent" | 33 | android:layout_width="fill_parent" |
685 | 32 | android:layout_height="fill_parent" | 34 | android:layout_height="fill_parent" |
686 | 35 | android:divider="#00000000" | ||
687 | 36 | android:dividerHeight="0px" | ||
688 | 37 | android:cacheColorHint="#ffdddddd" | ||
689 | 33 | /> | 38 | /> |
690 | 34 | <TextView android:id="@+id/list_empty" | 39 | <TextView android:id="@+id/list_empty" |
691 | 35 | android:layout_width="wrap_content" | 40 | android:layout_width="wrap_content" |
692 | 36 | 41 | ||
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 | 21 | You should have received a copy of the GNU General Public License | 21 | You should have received a copy of the GNU General Public License |
698 | 22 | along with Tomdroid. If not, see <http://www.gnu.org/licenses/>. | 22 | along with Tomdroid. If not, see <http://www.gnu.org/licenses/>. |
699 | 23 | --> | 23 | --> |
706 | 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" |
707 | 25 | android:layout_width="fill_parent" | 25 | android:orientation="vertical" |
708 | 26 | android:layout_height="fill_parent" | 26 | android:layout_width="fill_parent" |
709 | 27 | android:textSize="24dp" | 27 | android:layout_height="wrap_content" > |
710 | 28 | android:padding="10dip" | 28 | <TextView android:id="@+id/note_title" xmlns:android="http://schemas.android.com/apk/res/android" |
711 | 29 | /> | 29 | android:layout_width="fill_parent" |
712 | 30 | android:layout_height="fill_parent" | ||
713 | 31 | android:textStyle="bold" | ||
714 | 32 | android:textColor="#FF555555" | ||
715 | 33 | android:textSize="18dp" | ||
716 | 34 | android:paddingTop="5dip" | ||
717 | 35 | android:paddingLeft="5dip" | ||
718 | 36 | android:paddingRight="5dip" | ||
719 | 37 | /> | ||
720 | 38 | <TextView android:id="@+id/note_date" xmlns:android="http://schemas.android.com/apk/res/android" | ||
721 | 39 | android:layout_width="fill_parent" | ||
722 | 40 | android:layout_height="fill_parent" | ||
723 | 41 | android:textColor="#FF555555" | ||
724 | 42 | android:textSize="14dp" | ||
725 | 43 | android:paddingTop="2dip" | ||
726 | 44 | android:paddingLeft="5dip" | ||
727 | 45 | android:paddingRight="5dip" | ||
728 | 46 | android:paddingBottom="5dip" | ||
729 | 47 | /> | ||
730 | 48 | </LinearLayout> | ||
731 | 30 | \ No newline at end of file | 49 | \ No newline at end of file |
732 | 31 | 50 | ||
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 | 31 | android:id="@+id/textScroller" | 31 | android:id="@+id/textScroller" |
738 | 32 | android:layout_width="fill_parent" | 32 | android:layout_width="fill_parent" |
739 | 33 | android:layout_height="fill_parent" | 33 | android:layout_height="fill_parent" |
753 | 34 | > | 34 | android:background="#ffffffff" |
754 | 35 | 35 | > | |
755 | 36 | <TextView | 36 | <LinearLayout |
756 | 37 | xmlns:android="http://schemas.android.com/apk/res/android" | 37 | android:id="@+id/LinearLayout01" |
757 | 38 | android:id="@+id/content" | 38 | android:orientation="vertical" |
758 | 39 | android:layout_width="wrap_content" | 39 | android:layout_width="fill_parent" |
759 | 40 | android:layout_height="wrap_content" | 40 | android:layout_height="fill_parent"> |
760 | 41 | android:singleLine="false" | 41 | |
761 | 42 | android:text="@string/strWait" | 42 | <!-- <TextView |
762 | 43 | android:padding="10dip" | 43 | android:id="@+id/title" |
763 | 44 | android:textSize="20dip" | 44 | android:layout_width="fill_parent" |
764 | 45 | /> | 45 | android:layout_height="wrap_content" |
765 | 46 | 46 | android:padding="10dip" | |
766 | 47 | android:textStyle="bold" />--> | ||
767 | 48 | |||
768 | 49 | <TextView | ||
769 | 50 | xmlns:android="http://schemas.android.com/apk/res/android" | ||
770 | 51 | android:id="@+id/content" | ||
771 | 52 | android:layout_width="wrap_content" | ||
772 | 53 | android:layout_height="wrap_content" | ||
773 | 54 | android:singleLine="false" | ||
774 | 55 | android:text="@string/strWait" | ||
775 | 56 | android:padding="10dip" | ||
776 | 57 | android:textColor="#ffb8bcb8" /> | ||
777 | 58 | </LinearLayout> | ||
778 | 47 | </ScrollView> | 59 | </ScrollView> |
779 | 48 | </LinearLayout> | 60 | </LinearLayout> |
780 | 49 | \ No newline at end of file | 61 | \ No newline at end of file |
781 | 50 | 62 | ||
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 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
787 | 2 | <resources> | ||
788 | 3 | <array name="sortOrderArray"> | ||
789 | 4 | <item>sort_date</item> | ||
790 | 5 | <item>sort_title</item> | ||
791 | 6 | </array> | ||
792 | 7 | <array name="sortOrderValues"> | ||
793 | 8 | <item>Date Modified</item> | ||
794 | 9 | <item>Note Title</item> | ||
795 | 10 | </array> | ||
796 | 11 | </resources> | ||
797 | 0 | 12 | ||
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 | 68 | <string name="prefAuthenticate">Authenticate</string> | 68 | <string name="prefAuthenticate">Authenticate</string> |
803 | 69 | 69 | ||
804 | 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> |
806 | 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> |
807 | 72 | |||
808 | 73 | |||
809 | 72 | </resources> | 74 | </resources> |
810 | 73 | 75 | ||
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 | 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
816 | 2 | <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> | 2 | <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> |
818 | 3 | 3 | ||
819 | 4 | <PreferenceCategory android:title="@string/prefSync"> | 4 | <PreferenceCategory android:title="@string/prefSync"> |
820 | 5 | 5 | ||
821 | 6 | <ListPreference android:title="@string/prefSyncService" | 6 | <ListPreference android:title="@string/prefSyncService" |
822 | 7 | android:dialogTitle="Choose the sync service to use" | 7 | android:dialogTitle="Choose the sync service to use" |
824 | 8 | android:key="sync_service"/> | 8 | android:key="sync_service" |
825 | 9 | android:defaultValue="tomboy-web"/> | ||
826 | 9 | 10 | ||
827 | 10 | <EditTextPreference android:key="sync_server" | 11 | <EditTextPreference android:key="sync_server" |
828 | 11 | android:title="@string/prefSyncServer" | 12 | android:title="@string/prefSyncServer" |
829 | 12 | android:positiveButtonText="@string/prefAuthenticate" | 13 | android:positiveButtonText="@string/prefAuthenticate" |
830 | 13 | android:shouldDisableView="true"/> | 14 | android:shouldDisableView="true"/> |
831 | 15 | |||
832 | 14 | </PreferenceCategory> | 16 | </PreferenceCategory> |
833 | 17 | |||
834 | 15 | </PreferenceScreen> | 18 | </PreferenceScreen> |
835 | 16 | \ No newline at end of file | 19 | \ No newline at end of file |
836 | 17 | 20 | ||
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 | 57 | // TODO this is a weird yellow that was usable for the android emulator, I must confirm this for real usage | 57 | // TODO this is a weird yellow that was usable for the android emulator, I must confirm this for real usage |
842 | 58 | public static final int NOTE_HIGHLIGHT_COLOR = 0xFFFFFF77; | 58 | public static final int NOTE_HIGHLIGHT_COLOR = 0xFFFFFF77; |
843 | 59 | public static final String NOTE_MONOSPACE_TYPEFACE = "monospace"; | 59 | public static final String NOTE_MONOSPACE_TYPEFACE = "monospace"; |
847 | 60 | public static final float NOTE_SIZE_SMALL_FACTOR = 0.8f; | 60 | public static final float NOTE_SIZE_SMALL_FACTOR = 1.0f; |
848 | 61 | public static final float NOTE_SIZE_LARGE_FACTOR = 1.3f; | 61 | public static final float NOTE_SIZE_LARGE_FACTOR = 1.5f; |
849 | 62 | public static final float NOTE_SIZE_HUGE_FACTOR = 1.6f; | 62 | public static final float NOTE_SIZE_HUGE_FACTOR = 1.8f; |
850 | 63 | 63 | ||
851 | 64 | // Members | 64 | // Members |
852 | 65 | private SpannableStringBuilder noteContent; | 65 | private SpannableStringBuilder noteContent; |
853 | 66 | 66 | ||
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 | 23 | package org.tomdroid; | 23 | package org.tomdroid; |
859 | 24 | 24 | ||
860 | 25 | import org.tomdroid.ui.Tomdroid; | 25 | import org.tomdroid.ui.Tomdroid; |
861 | 26 | import org.tomdroid.util.NoteListCursorAdapter; | ||
862 | 27 | import org.tomdroid.util.Preferences; | ||
863 | 26 | 28 | ||
864 | 27 | import android.app.Activity; | 29 | import android.app.Activity; |
865 | 28 | import android.content.ContentResolver; | 30 | import android.content.ContentResolver; |
866 | 29 | import android.content.ContentValues; | 31 | import android.content.ContentValues; |
867 | 30 | import android.database.Cursor; | 32 | import android.database.Cursor; |
868 | 31 | import android.net.Uri; | 33 | import android.net.Uri; |
869 | 34 | import android.preference.ListPreference; | ||
870 | 32 | import android.util.Log; | 35 | import android.util.Log; |
871 | 33 | import android.widget.ListAdapter; | 36 | import android.widget.ListAdapter; |
872 | 34 | import android.widget.SimpleCursorAdapter; | 37 | import android.widget.SimpleCursorAdapter; |
873 | @@ -36,7 +39,7 @@ | |||
874 | 36 | public class NoteManager { | 39 | public class NoteManager { |
875 | 37 | 40 | ||
876 | 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 }; |
878 | 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 }; |
879 | 40 | public static final String[] TITLE_PROJECTION = { Note.TITLE }; | 43 | public static final String[] TITLE_PROJECTION = { Note.TITLE }; |
880 | 41 | public static final String[] GUID_PROJECTION = { Note.ID, Note.GUID }; | 44 | public static final String[] GUID_PROJECTION = { Note.ID, Note.GUID }; |
881 | 42 | public static final String[] ID_PROJECTION = { Note.ID }; | 45 | public static final String[] ID_PROJECTION = { Note.ID }; |
882 | @@ -132,20 +135,23 @@ | |||
883 | 132 | // get a cursor representing all notes from the NoteProvider | 135 | // get a cursor representing all notes from the NoteProvider |
884 | 133 | Uri notes = Tomdroid.CONTENT_URI; | 136 | Uri notes = Tomdroid.CONTENT_URI; |
885 | 134 | String where = null; | 137 | String where = null; |
886 | 138 | String orderBy; | ||
887 | 135 | if (!includeNotebookTemplates) { | 139 | if (!includeNotebookTemplates) { |
888 | 136 | where = Note.TAGS + " NOT LIKE '%" + "system:template" + "%'"; | 140 | where = Note.TAGS + " NOT LIKE '%" + "system:template" + "%'"; |
889 | 137 | } | 141 | } |
891 | 138 | return activity.managedQuery(notes, LIST_PROJECTION, where, null, null); | 142 | orderBy = Note.MODIFIED_DATE + " DESC"; |
892 | 143 | return activity.managedQuery(notes, LIST_PROJECTION, where, null, orderBy); | ||
893 | 139 | } | 144 | } |
894 | 140 | 145 | ||
895 | 141 | 146 | ||
896 | 142 | public static ListAdapter getListAdapter(Activity activity) { | 147 | public static ListAdapter getListAdapter(Activity activity) { |
897 | 148 | |||
898 | 143 | Cursor notesCursor = getAllNotes(activity, false); | 149 | Cursor notesCursor = getAllNotes(activity, false); |
899 | 144 | 150 | ||
900 | 145 | // set up an adapter binding the TITLE field of the cursor to the list item | 151 | // set up an adapter binding the TITLE field of the cursor to the list item |
904 | 146 | String[] from = new String[] { Note.TITLE }; | 152 | String[] from = new String[] { Note.TITLE, Note.MODIFIED_DATE }; |
905 | 147 | int[] to = new int[] { R.id.note_title }; | 153 | int[] to = new int[] { R.id.note_title, R.id.note_date }; |
906 | 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); |
907 | 149 | } | 155 | } |
908 | 150 | 156 | ||
909 | 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() |
910 | 152 | 158 | ||
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 | 31 | 31 | ||
916 | 32 | import android.app.Activity; | 32 | import android.app.Activity; |
917 | 33 | import android.os.Handler; | 33 | import android.os.Handler; |
918 | 34 | import android.util.Log; | ||
919 | 34 | 35 | ||
920 | 35 | public class SyncManager { | 36 | public class SyncManager { |
921 | 36 | 37 | ||
922 | @@ -49,7 +50,7 @@ | |||
923 | 49 | public SyncService getService(String name) { | 50 | public SyncService getService(String name) { |
924 | 50 | 51 | ||
925 | 51 | for (int i = 0; i < services.size(); i++) { | 52 | for (int i = 0; i < services.size(); i++) { |
927 | 52 | SyncService service = services.get(i); | 53 | SyncService service = services.get(i); |
928 | 53 | if (name.equals(service.getName())) | 54 | if (name.equals(service.getName())) |
929 | 54 | return service; | 55 | return service; |
930 | 55 | } | 56 | } |
931 | @@ -64,7 +65,6 @@ | |||
932 | 64 | } | 65 | } |
933 | 65 | 66 | ||
934 | 66 | public SyncService getCurrentService() { | 67 | public SyncService getCurrentService() { |
935 | 67 | |||
936 | 68 | String serviceName = Preferences.getString(Preferences.Key.SYNC_SERVICE); | 68 | String serviceName = Preferences.getString(Preferences.Key.SYNC_SERVICE); |
937 | 69 | return getService(serviceName); | 69 | return getService(serviceName); |
938 | 70 | } | 70 | } |
939 | 71 | 71 | ||
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 | 101 | } | 101 | } |
945 | 102 | 102 | ||
946 | 103 | }); | 103 | }); |
947 | 104 | |||
948 | 104 | } | 105 | } |
949 | 105 | 106 | ||
950 | 106 | private void authenticate(String serverUri) { | 107 | private void authenticate(String serverUri) { |
951 | @@ -173,13 +174,14 @@ | |||
952 | 173 | syncServer.setDefaultValue(defaultServer); | 174 | syncServer.setDefaultValue(defaultServer); |
953 | 174 | if(syncServer.getText() == null) | 175 | if(syncServer.getText() == null) |
954 | 175 | syncServer.setText(defaultServer); | 176 | syncServer.setText(defaultServer); |
956 | 176 | 177 | ||
957 | 177 | String defaultService = (String)Preferences.Key.SYNC_SERVICE.getDefault(); | 178 | String defaultService = (String)Preferences.Key.SYNC_SERVICE.getDefault(); |
958 | 178 | syncService.setDefaultValue(defaultService); | 179 | syncService.setDefaultValue(defaultService); |
959 | 179 | if(syncService.getValue() == null) | 180 | if(syncService.getValue() == null) |
960 | 180 | syncService.setValue(defaultService); | 181 | syncService.setValue(defaultService); |
961 | 182 | |||
962 | 181 | } | 183 | } |
964 | 182 | 184 | ||
965 | 183 | private void setServer(String syncServiceKey) { | 185 | private void setServer(String syncServiceKey) { |
966 | 184 | 186 | ||
967 | 185 | SyncService service = SyncManager.getInstance().getService(syncServiceKey); | 187 | SyncService service = SyncManager.getInstance().getService(syncServiceKey); |
968 | @@ -195,7 +197,7 @@ | |||
969 | 195 | syncService.setSummary(service.getDescription()); | 197 | syncService.setSummary(service.getDescription()); |
970 | 196 | 198 | ||
971 | 197 | } | 199 | } |
973 | 198 | 200 | ||
974 | 199 | private void connectionFailed() { | 201 | private void connectionFailed() { |
975 | 200 | new AlertDialog.Builder(this) | 202 | new AlertDialog.Builder(this) |
976 | 201 | .setMessage(getString(R.string.prefSyncConnectionFailed)) | 203 | .setMessage(getString(R.string.prefSyncConnectionFailed)) |
977 | 202 | 204 | ||
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 | 122 | MenuInflater inflater = getMenuInflater(); | 122 | MenuInflater inflater = getMenuInflater(); |
983 | 123 | inflater.inflate(R.menu.main, menu); | 123 | inflater.inflate(R.menu.main, menu); |
984 | 124 | return true; | 124 | return true; |
985 | 125 | |||
986 | 125 | } | 126 | } |
987 | 126 | 127 | ||
988 | 127 | @Override | 128 | @Override |
989 | 128 | 129 | ||
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 | 39 | import android.content.Intent; | 39 | import android.content.Intent; |
995 | 40 | import android.content.DialogInterface.OnClickListener; | 40 | import android.content.DialogInterface.OnClickListener; |
996 | 41 | import android.database.Cursor; | 41 | import android.database.Cursor; |
997 | 42 | import android.graphics.Color; | ||
998 | 42 | import android.net.Uri; | 43 | import android.net.Uri; |
999 | 43 | import android.os.Bundle; | 44 | import android.os.Bundle; |
1000 | 44 | import android.os.Handler; | 45 | import android.os.Handler; |
1001 | @@ -54,6 +55,7 @@ | |||
1002 | 54 | public class ViewNote extends Activity { | 55 | public class ViewNote extends Activity { |
1003 | 55 | 56 | ||
1004 | 56 | // UI elements | 57 | // UI elements |
1005 | 58 | private TextView title; | ||
1006 | 57 | private TextView content; | 59 | private TextView content; |
1007 | 58 | 60 | ||
1008 | 59 | // Model objects | 61 | // Model objects |
1009 | @@ -73,6 +75,14 @@ | |||
1010 | 73 | 75 | ||
1011 | 74 | setContentView(R.layout.note_view); | 76 | setContentView(R.layout.note_view); |
1012 | 75 | content = (TextView) findViewById(R.id.content); | 77 | content = (TextView) findViewById(R.id.content); |
1013 | 78 | content.setBackgroundColor(0xffffffff); | ||
1014 | 79 | content.setTextColor(Color.DKGRAY); | ||
1015 | 80 | content.setTextSize(18.0f); | ||
1016 | 81 | title = (TextView) findViewById(R.id.title); | ||
1017 | 82 | title.setBackgroundColor(0xffdddddd); | ||
1018 | 83 | title.setTextColor(Color.DKGRAY); | ||
1019 | 84 | title.setTextSize(18.0f); | ||
1020 | 85 | |||
1021 | 76 | final Intent intent = getIntent(); | 86 | final Intent intent = getIntent(); |
1022 | 77 | Uri uri = intent.getData(); | 87 | Uri uri = intent.getData(); |
1023 | 78 | 88 | ||
1024 | @@ -91,6 +101,8 @@ | |||
1025 | 91 | 101 | ||
1026 | 92 | noteContent = note.getNoteContent(noteContentHandler); | 102 | noteContent = note.getNoteContent(noteContentHandler); |
1027 | 93 | 103 | ||
1028 | 104 | //Log.i(TAG, "THE NOTE IS: " + note.getXmlContent().toString()); | ||
1029 | 105 | |||
1030 | 94 | } else { | 106 | } else { |
1031 | 95 | 107 | ||
1032 | 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"); |
1033 | @@ -146,7 +158,7 @@ | |||
1034 | 146 | } | 158 | } |
1035 | 147 | 159 | ||
1036 | 148 | private void showNote() { | 160 | private void showNote() { |
1038 | 149 | setTitle(note.getTitle()); | 161 | //setTitle(note.getTitle()); |
1039 | 150 | 162 | ||
1040 | 151 | // get rid of the title that is doubled in the note's content | 163 | // get rid of the title that is doubled in the note's content |
1041 | 152 | // using quote to escape potential regexp chars in pattern | 164 | // using quote to escape potential regexp chars in pattern |
1042 | @@ -159,6 +171,7 @@ | |||
1043 | 159 | 171 | ||
1044 | 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) |
1045 | 161 | content.setText(noteContent, TextView.BufferType.SPANNABLE); | 173 | content.setText(noteContent, TextView.BufferType.SPANNABLE); |
1046 | 174 | title.setText((CharSequence) note.getTitle()); | ||
1047 | 162 | 175 | ||
1048 | 163 | // add links to stuff that is understood by Android except phone numbers because it's too aggressive | 176 | // add links to stuff that is understood by Android except phone numbers because it's too aggressive |
1049 | 164 | // TODO this is SLOWWWW!!!! | 177 | // TODO this is SLOWWWW!!!! |
1050 | 165 | 178 | ||
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 | 1 | package org.tomdroid.util; | ||
1056 | 2 | |||
1057 | 3 | import java.text.DateFormat; | ||
1058 | 4 | import java.util.Date; | ||
1059 | 5 | |||
1060 | 6 | import android.text.format.DateUtils; | ||
1061 | 7 | import android.text.format.Time; | ||
1062 | 8 | import org.tomdroid.Note; | ||
1063 | 9 | import org.tomdroid.R; | ||
1064 | 10 | import org.tomdroid.ui.Tomdroid; | ||
1065 | 11 | |||
1066 | 12 | import android.content.Context; | ||
1067 | 13 | import android.database.Cursor; | ||
1068 | 14 | import android.graphics.Color; | ||
1069 | 15 | import android.view.LayoutInflater; | ||
1070 | 16 | import android.view.View; | ||
1071 | 17 | import android.view.ViewGroup; | ||
1072 | 18 | import android.widget.Filterable; | ||
1073 | 19 | import android.widget.SimpleCursorAdapter; | ||
1074 | 20 | import android.widget.TextView; | ||
1075 | 21 | |||
1076 | 22 | /* Provides a custom ListView layout for Note List */ | ||
1077 | 23 | |||
1078 | 24 | public class NoteListCursorAdapter extends SimpleCursorAdapter { | ||
1079 | 25 | |||
1080 | 26 | private Context context; | ||
1081 | 27 | |||
1082 | 28 | private int layout; | ||
1083 | 29 | private int[] colors = new int[] { 0xFFFFFFFF, 0xFFEEEEEE }; | ||
1084 | 30 | |||
1085 | 31 | private DateFormat localeDateFormat; | ||
1086 | 32 | private DateFormat localeTimeFormat; | ||
1087 | 33 | |||
1088 | 34 | public NoteListCursorAdapter (Context context, int layout, Cursor c, String[] from, int[] to) { | ||
1089 | 35 | super(context, layout, c, from, to); | ||
1090 | 36 | this.context = context; | ||
1091 | 37 | this.layout = layout; | ||
1092 | 38 | localeDateFormat = DateFormat.getDateInstance(DateFormat.SHORT); | ||
1093 | 39 | localeTimeFormat = DateFormat.getTimeInstance(DateFormat.SHORT); | ||
1094 | 40 | } | ||
1095 | 41 | |||
1096 | 42 | |||
1097 | 43 | @Override | ||
1098 | 44 | public View newView(Context context, Cursor cursor, ViewGroup parent) { | ||
1099 | 45 | |||
1100 | 46 | Cursor c = getCursor(); | ||
1101 | 47 | |||
1102 | 48 | final LayoutInflater inflater = LayoutInflater.from(context); | ||
1103 | 49 | View v = inflater.inflate(layout, parent, false); | ||
1104 | 50 | |||
1105 | 51 | populateFields(v, c); | ||
1106 | 52 | |||
1107 | 53 | return v; | ||
1108 | 54 | } | ||
1109 | 55 | |||
1110 | 56 | @Override | ||
1111 | 57 | public void bindView(View v, Context context, Cursor c) { | ||
1112 | 58 | |||
1113 | 59 | populateFields(v, c); | ||
1114 | 60 | } | ||
1115 | 61 | |||
1116 | 62 | @Override | ||
1117 | 63 | public View getView(int position, View convertView, ViewGroup parent) { | ||
1118 | 64 | View view = super.getView(position, convertView, parent); | ||
1119 | 65 | int colorPos = position % colors.length; | ||
1120 | 66 | view.setBackgroundColor(colors[colorPos]); | ||
1121 | 67 | //view.setTextColor(Color.DKGRAY); | ||
1122 | 68 | return view; | ||
1123 | 69 | } | ||
1124 | 70 | |||
1125 | 71 | private void populateFields(View v, Cursor c){ | ||
1126 | 72 | |||
1127 | 73 | int nameCol = c.getColumnIndex(Note.TITLE); | ||
1128 | 74 | int modifiedCol = c.getColumnIndex(Note.MODIFIED_DATE); | ||
1129 | 75 | |||
1130 | 76 | String title = c.getString(nameCol); | ||
1131 | 77 | |||
1132 | 78 | //Format last modified dates to be similar to desktop Tomboy | ||
1133 | 79 | //TODO this is messy - must be a better way than having 3 separate date types | ||
1134 | 80 | Time lastModified = new Time(); | ||
1135 | 81 | lastModified.parse3339(c.getString(modifiedCol)); | ||
1136 | 82 | Long lastModifiedMillis = lastModified.toMillis(false); | ||
1137 | 83 | Date lastModifiedDate = new Date(lastModifiedMillis); | ||
1138 | 84 | |||
1139 | 85 | String strModified = "Modified: "; | ||
1140 | 86 | //TODO this is very inefficient | ||
1141 | 87 | if (DateUtils.isToday(lastModifiedMillis)){ | ||
1142 | 88 | strModified += "Today, " + localeTimeFormat.format(lastModifiedDate); | ||
1143 | 89 | } else { | ||
1144 | 90 | // Add a day to the last modified date - if the date is now today, it means the note was edited yesterday | ||
1145 | 91 | Time yesterdayTest = lastModified; | ||
1146 | 92 | yesterdayTest.monthDay += 1; | ||
1147 | 93 | if (DateUtils.isToday(yesterdayTest.toMillis(false))){ | ||
1148 | 94 | strModified += "Yesterday, " + localeTimeFormat.format(lastModifiedDate); | ||
1149 | 95 | } else { | ||
1150 | 96 | strModified += localeDateFormat.format(lastModifiedDate) + ", " + localeTimeFormat.format(lastModifiedDate); | ||
1151 | 97 | } | ||
1152 | 98 | } | ||
1153 | 99 | |||
1154 | 100 | /** | ||
1155 | 101 | * Next set the name of the entry. | ||
1156 | 102 | */ | ||
1157 | 103 | TextView note_title = (TextView) v.findViewById(R.id.note_title); | ||
1158 | 104 | if (note_title != null) { | ||
1159 | 105 | note_title.setText(title); | ||
1160 | 106 | } | ||
1161 | 107 | TextView note_modified = (TextView) v.findViewById(R.id.note_date); | ||
1162 | 108 | if (note_modified != null) { | ||
1163 | 109 | note_modified.setText(strModified); | ||
1164 | 110 | } | ||
1165 | 111 | } | ||
1166 | 112 | |||
1167 | 113 | } | ||
1168 | 0 | 114 | ||
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 | 42 | ACCESS_TOKEN_URL ("access_token_url", ""), | 42 | ACCESS_TOKEN_URL ("access_token_url", ""), |
1174 | 43 | REQUEST_TOKEN_URL ("request_token_url", ""), | 43 | REQUEST_TOKEN_URL ("request_token_url", ""), |
1175 | 44 | LATEST_SYNC_REVISION ("latest_sync_revision", 0L), | 44 | LATEST_SYNC_REVISION ("latest_sync_revision", 0L), |
1176 | 45 | SORT_ORDER ("sort_order", "sort_date"), | ||
1177 | 45 | FIRST_RUN ("first_run", true); | 46 | FIRST_RUN ("first_run", true); |
1178 | 46 | 47 | ||
1179 | 47 | private String name = ""; | 48 | private String name = ""; |
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?