Merge lp:~tomdroid-dev/tomdroid/cleanup_icons into lp:~tomdroid-maintainers/tomdroid/main
- cleanup_icons
- Merge into main
Status: | Merged |
---|---|
Approved by: | Olivier Bilodeau |
Approved revision: | 235 |
Merged at revision: | 230 |
Proposed branch: | lp:~tomdroid-dev/tomdroid/cleanup_icons |
Merge into: | lp:~tomdroid-maintainers/tomdroid/main |
Diff against target: |
884 lines (+581/-83) 13 files modified
AndroidManifest.xml (+2/-2) data/icon-src/README.txt (+19/-0) data/tomdroid-5.svg (+501/-0) res/drawable/syncbutton_background.xml (+0/-16) res/drawable/syncbutton_background_focus.xml (+0/-4) res/drawable/syncbutton_background_pressed.xml (+0/-4) res/layout/actionbar.xml (+29/-27) res/layout/main.xml (+3/-3) res/layout/main_list_item.xml (+25/-20) res/layout/note_view.xml (+1/-0) res/menu/main.xml (+1/-2) src/org/tomdroid/ui/ViewNote.java (+0/-1) src/org/tomdroid/util/NoteListCursorAdapter.java (+0/-4) |
To merge this branch: | bzr merge lp:~tomdroid-dev/tomdroid/cleanup_icons |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Olivier Bilodeau | Approve | ||
Stefan Hammer (community) | Needs Resubmitting | ||
Review via email: mp+65307@code.launchpad.net |
Commit message
Description of the change
* New launcher icon fits to Android guidelines and has right resolutions (old one was always fuzzy).
* New Android Market promotion figure.
* Changed all icons to Android default ones.
* Sync icon in actionbar is now a intuitively understood button.
* List items now show highlighting on longpress and clicked status with nice Android animations.
* All icons (Launcher, Sync,...) and the whole interface are tested in all available screen resolutions.
* Highlighting of buttons and list always fits to used Android theme.
* Actionbar now has a gradient (should it be darker/lighter, more flat???).
* Height of list item gets bigger for very long note-titles (that needs two or more lines).
Olivier Bilodeau (plaxx) wrote : | # |
- 235. By Stefan Hammer
-
Added README for icons with list of used stock-icons and a reminder to use stock-icons cause of several advantages
Stefan Hammer (j-4-deactivatedaccount) wrote : | # |
The README is included now. It's great that you like my work. It was a lot of fun doing it - if there are further UI improvements needed, I would love to do it!
Olivier Bilodeau (plaxx) wrote : | # |
Good stuff! I already updated the android market material.
Preview Diff
1 | === modified file 'AndroidManifest.xml' |
2 | --- AndroidManifest.xml 2010-12-13 02:55:59 +0000 |
3 | +++ AndroidManifest.xml 2011-07-07 04:23:24 +0000 |
4 | @@ -8,8 +8,8 @@ |
5 | |
6 | <supports-screens android:anyDensity="true" /> |
7 | |
8 | - <application |
9 | - android:icon="@drawable/icon" |
10 | + <application |
11 | + android:icon="@drawable/ic_launcher" |
12 | android:label="@string/app_name" |
13 | android:theme="@android:style/Theme.Light.NoTitleBar" |
14 | android:debuggable="false" |
15 | |
16 | === modified file 'data/icon-192.png' |
17 | Binary files data/icon-192.png 2010-12-12 23:05:20 +0000 and data/icon-192.png 2011-07-07 04:23:24 +0000 differ |
18 | === added file 'data/icon-36.png' |
19 | Binary files data/icon-36.png 1970-01-01 00:00:00 +0000 and data/icon-36.png 2011-07-07 04:23:24 +0000 differ |
20 | === added file 'data/icon-48.png' |
21 | Binary files data/icon-48.png 1970-01-01 00:00:00 +0000 and data/icon-48.png 2011-07-07 04:23:24 +0000 differ |
22 | === modified file 'data/icon-512.png' |
23 | Binary files data/icon-512.png 2010-12-12 23:05:20 +0000 and data/icon-512.png 2011-07-07 04:23:24 +0000 differ |
24 | === modified file 'data/icon-64.png' |
25 | Binary files data/icon-64.png 2010-12-12 23:05:20 +0000 and data/icon-64.png 2011-07-07 04:23:24 +0000 differ |
26 | === added file 'data/icon-72.png' |
27 | Binary files data/icon-72.png 1970-01-01 00:00:00 +0000 and data/icon-72.png 2011-07-07 04:23:24 +0000 differ |
28 | === added file 'data/icon-src/README.txt' |
29 | --- data/icon-src/README.txt 1970-01-01 00:00:00 +0000 |
30 | +++ data/icon-src/README.txt 2011-07-07 04:23:24 +0000 |
31 | @@ -0,0 +1,19 @@ |
32 | +List of used Stock-Android Icons: |
33 | + |
34 | +@android:drawable/menuitem_background |
35 | +@android:drawable/ic_menu_info_details |
36 | +@android:drawable/ic_menu_preferences |
37 | + |
38 | + |
39 | +***IMPORTANT*** |
40 | + |
41 | +Please use Stock-Android icons whenever possible instead of selfmade ones. |
42 | + |
43 | +You can find this icons in your Android SDK folder: android-sdk-linux_x86/platforms/android-4/data/res/drawable |
44 | +In the code you refere to them as @android:drawable/<file_name_w/o_extension> |
45 | + |
46 | +This has several advantages: |
47 | + * They 100% fit to the Android Icon Guidlines and Android style |
48 | + * They automatically suit all available resolutions, themes and Android versions! |
49 | + * We do not have to resize them, when requirements change |
50 | + * It's less work for you ;-) |
51 | |
52 | === modified file 'data/market-promo-graphic.png' |
53 | Binary files data/market-promo-graphic.png 2010-10-24 18:54:07 +0000 and data/market-promo-graphic.png 2011-07-07 04:23:24 +0000 differ |
54 | === added file 'data/market-promo-graphic.xcf' |
55 | Binary files data/market-promo-graphic.xcf 1970-01-01 00:00:00 +0000 and data/market-promo-graphic.xcf 2011-07-07 04:23:24 +0000 differ |
56 | === added file 'data/tomdroid-5.svg' |
57 | --- data/tomdroid-5.svg 1970-01-01 00:00:00 +0000 |
58 | +++ data/tomdroid-5.svg 2011-07-07 04:23:24 +0000 |
59 | @@ -0,0 +1,501 @@ |
60 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
61 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
62 | + |
63 | +<svg |
64 | + xmlns:dc="http://purl.org/dc/elements/1.1/" |
65 | + xmlns:cc="http://creativecommons.org/ns#" |
66 | + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
67 | + xmlns:svg="http://www.w3.org/2000/svg" |
68 | + xmlns="http://www.w3.org/2000/svg" |
69 | + xmlns:xlink="http://www.w3.org/1999/xlink" |
70 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
71 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
72 | + inkscape:export-ydpi="90.000000" |
73 | + inkscape:export-xdpi="90.000000" |
74 | + inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png" |
75 | + width="48px" |
76 | + height="48px" |
77 | + id="svg11300" |
78 | + sodipodi:version="0.32" |
79 | + inkscape:version="0.48.1 r9760" |
80 | + sodipodi:docname="tomdroid-5.svg" |
81 | + inkscape:output_extension="org.inkscape.output.svg.inkscape" |
82 | + sodipodi:modified="true" |
83 | + version="1.1"> |
84 | + <defs |
85 | + id="defs3"> |
86 | + <inkscape:path-effect |
87 | + effect="spiro" |
88 | + id="path-effect4244" |
89 | + is_visible="true" /> |
90 | + <linearGradient |
91 | + id="linearGradient2994"> |
92 | + <stop |
93 | + id="stop2996" |
94 | + offset="0" |
95 | + style="stop-color:#000000;stop-opacity:1;" /> |
96 | + <stop |
97 | + id="stop2998" |
98 | + offset="1" |
99 | + style="stop-color:#c9c9c9;stop-opacity:1;" /> |
100 | + </linearGradient> |
101 | + <linearGradient |
102 | + inkscape:collect="always" |
103 | + xlink:href="#linearGradient2994" |
104 | + id="linearGradient2560" |
105 | + gradientUnits="userSpaceOnUse" |
106 | + gradientTransform="translate(-5.825542,0.125)" |
107 | + x1="25.71875" |
108 | + y1="31.046875" |
109 | + x2="25.514589" |
110 | + y2="30.703125" /> |
111 | + <linearGradient |
112 | + id="linearGradient2984" |
113 | + inkscape:collect="always"> |
114 | + <stop |
115 | + id="stop2986" |
116 | + offset="0" |
117 | + style="stop-color:#e7e2b8;stop-opacity:1;" /> |
118 | + <stop |
119 | + id="stop2988" |
120 | + offset="1" |
121 | + style="stop-color:#e7e2b8;stop-opacity:0;" /> |
122 | + </linearGradient> |
123 | + <radialGradient |
124 | + inkscape:collect="always" |
125 | + xlink:href="#linearGradient2984" |
126 | + id="radialGradient2558" |
127 | + gradientUnits="userSpaceOnUse" |
128 | + gradientTransform="matrix(2.923565,0,0,2.029717,-61.55532,-27.88417)" |
129 | + cx="29.053354" |
130 | + cy="27.640751" |
131 | + fx="29.053354" |
132 | + fy="27.640751" |
133 | + r="3.2408544" /> |
134 | + <linearGradient |
135 | + id="linearGradient2974"> |
136 | + <stop |
137 | + id="stop2976" |
138 | + offset="0" |
139 | + style="stop-color:#c1c1c1;stop-opacity:1;" /> |
140 | + <stop |
141 | + id="stop2978" |
142 | + offset="1" |
143 | + style="stop-color:#acacac;stop-opacity:1;" /> |
144 | + </linearGradient> |
145 | + <linearGradient |
146 | + inkscape:collect="always" |
147 | + xlink:href="#linearGradient2974" |
148 | + id="linearGradient2556" |
149 | + gradientUnits="userSpaceOnUse" |
150 | + gradientTransform="translate(-5.669292,0)" |
151 | + x1="46" |
152 | + y1="19.8125" |
153 | + x2="47.6875" |
154 | + y2="22.625" /> |
155 | + <linearGradient |
156 | + id="linearGradient2966"> |
157 | + <stop |
158 | + id="stop2968" |
159 | + offset="0" |
160 | + style="stop-color:#ffd1d1;stop-opacity:1;" /> |
161 | + <stop |
162 | + style="stop-color:#ff1d1d;stop-opacity:1;" |
163 | + offset="0.5" |
164 | + id="stop3006" /> |
165 | + <stop |
166 | + id="stop2970" |
167 | + offset="1" |
168 | + style="stop-color:#6f0000;stop-opacity:1;" /> |
169 | + </linearGradient> |
170 | + <linearGradient |
171 | + inkscape:collect="always" |
172 | + xlink:href="#linearGradient2966" |
173 | + id="linearGradient2554" |
174 | + gradientUnits="userSpaceOnUse" |
175 | + gradientTransform="translate(-5.669292,0)" |
176 | + x1="48.90625" |
177 | + y1="17.376184" |
178 | + x2="50.988335" |
179 | + y2="22.250591" /> |
180 | + <radialGradient |
181 | + inkscape:collect="always" |
182 | + xlink:href="#linearGradient2865" |
183 | + id="radialGradient2552" |
184 | + gradientUnits="userSpaceOnUse" |
185 | + gradientTransform="matrix(1,0,0,0.348243,0,26.35543)" |
186 | + cx="23.5625" |
187 | + cy="40.4375" |
188 | + fx="23.5625" |
189 | + fy="40.4375" |
190 | + r="19.5625" /> |
191 | + <linearGradient |
192 | + inkscape:collect="always" |
193 | + id="linearGradient6417"> |
194 | + <stop |
195 | + style="stop-color:black;stop-opacity:1;" |
196 | + offset="0" |
197 | + id="stop6419" /> |
198 | + <stop |
199 | + style="stop-color:black;stop-opacity:0;" |
200 | + offset="1" |
201 | + id="stop6421" /> |
202 | + </linearGradient> |
203 | + <linearGradient |
204 | + inkscape:collect="always" |
205 | + id="linearGradient6407"> |
206 | + <stop |
207 | + style="stop-color:white;stop-opacity:1;" |
208 | + offset="0" |
209 | + id="stop6409" /> |
210 | + <stop |
211 | + style="stop-color:white;stop-opacity:0;" |
212 | + offset="1" |
213 | + id="stop6411" /> |
214 | + </linearGradient> |
215 | + <linearGradient |
216 | + id="linearGradient6377"> |
217 | + <stop |
218 | + style="stop-color:#fff27e;stop-opacity:1;" |
219 | + offset="0" |
220 | + id="stop6379" /> |
221 | + <stop |
222 | + style="stop-color:#edd400;stop-opacity:1;" |
223 | + offset="1" |
224 | + id="stop6381" /> |
225 | + </linearGradient> |
226 | + <linearGradient |
227 | + inkscape:collect="always" |
228 | + id="linearGradient5609"> |
229 | + <stop |
230 | + style="stop-color:white;stop-opacity:1;" |
231 | + offset="0" |
232 | + id="stop5611" /> |
233 | + <stop |
234 | + style="stop-color:white;stop-opacity:0;" |
235 | + offset="1" |
236 | + id="stop5613" /> |
237 | + </linearGradient> |
238 | + <linearGradient |
239 | + inkscape:collect="always" |
240 | + id="linearGradient2865"> |
241 | + <stop |
242 | + style="stop-color:#000000;stop-opacity:1;" |
243 | + offset="0" |
244 | + id="stop2867" /> |
245 | + <stop |
246 | + style="stop-color:#000000;stop-opacity:0;" |
247 | + offset="1" |
248 | + id="stop2869" /> |
249 | + </linearGradient> |
250 | + <linearGradient |
251 | + inkscape:collect="always" |
252 | + xlink:href="#linearGradient5609" |
253 | + id="linearGradient5615" |
254 | + x1="26.213203" |
255 | + y1="14.08672" |
256 | + x2="26.130388" |
257 | + y2="67.031342" |
258 | + gradientUnits="userSpaceOnUse" |
259 | + gradientTransform="matrix(0.90135953,0,0,0.94440581,1.9473958,1.371962)" /> |
260 | + <radialGradient |
261 | + inkscape:collect="always" |
262 | + xlink:href="#linearGradient6377" |
263 | + id="radialGradient6405" |
264 | + gradientUnits="userSpaceOnUse" |
265 | + gradientTransform="matrix(1.5050109,0,1.5345205e-8,1.9614971,-25.133441,-36.693597)" |
266 | + cx="45.150326" |
267 | + cy="35.915409" |
268 | + fx="45.150326" |
269 | + fy="35.915409" |
270 | + r="21.626934" /> |
271 | + <radialGradient |
272 | + inkscape:collect="always" |
273 | + xlink:href="#linearGradient6407" |
274 | + id="radialGradient6413" |
275 | + cx="43.875" |
276 | + cy="35.90107" |
277 | + fx="43.875" |
278 | + fy="35.90107" |
279 | + r="20.21875" |
280 | + gradientTransform="matrix(9.7241373,-1.0744104e-7,0,18.970946,-385.27052,-653.71305)" |
281 | + gradientUnits="userSpaceOnUse" /> |
282 | + <radialGradient |
283 | + inkscape:collect="always" |
284 | + xlink:href="#linearGradient6417" |
285 | + id="radialGradient6423" |
286 | + cx="39.907337" |
287 | + cy="31.780704" |
288 | + fx="39.907337" |
289 | + fy="31.780704" |
290 | + r="5.2591065" |
291 | + gradientTransform="matrix(0.90135953,0,0,0.34125633,2.1216252,26.218811)" |
292 | + gradientUnits="userSpaceOnUse" /> |
293 | + </defs> |
294 | + <sodipodi:namedview |
295 | + stroke="#c4a000" |
296 | + fill="#edd400" |
297 | + id="base" |
298 | + pagecolor="#ffffff" |
299 | + bordercolor="#666666" |
300 | + borderopacity="0.25490196" |
301 | + inkscape:pageopacity="0.0" |
302 | + inkscape:pageshadow="2" |
303 | + inkscape:zoom="8.1169643" |
304 | + inkscape:cx="24.289511" |
305 | + inkscape:cy="34.422952" |
306 | + inkscape:current-layer="layer1" |
307 | + showgrid="true" |
308 | + inkscape:grid-bbox="true" |
309 | + inkscape:document-units="px" |
310 | + inkscape:showpageshadow="false" |
311 | + inkscape:window-width="1440" |
312 | + inkscape:window-height="848" |
313 | + inkscape:window-x="0" |
314 | + inkscape:window-y="26" |
315 | + inkscape:window-maximized="1" /> |
316 | + <metadata |
317 | + id="metadata4"> |
318 | + <rdf:RDF> |
319 | + <cc:Work |
320 | + rdf:about=""> |
321 | + <dc:format>image/svg+xml</dc:format> |
322 | + <dc:type |
323 | + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
324 | + <dc:creator> |
325 | + <cc:Agent> |
326 | + <dc:title>Jakub Steiner</dc:title> |
327 | + </cc:Agent> |
328 | + </dc:creator> |
329 | + <dc:source>http://jimmac.musichall.cz</dc:source> |
330 | + <cc:license |
331 | + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> |
332 | + <dc:title>Tomboy</dc:title> |
333 | + </cc:Work> |
334 | + <cc:License |
335 | + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> |
336 | + <cc:permits |
337 | + rdf:resource="http://web.resource.org/cc/Reproduction" /> |
338 | + <cc:permits |
339 | + rdf:resource="http://web.resource.org/cc/Distribution" /> |
340 | + <cc:requires |
341 | + rdf:resource="http://web.resource.org/cc/Notice" /> |
342 | + <cc:permits |
343 | + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> |
344 | + <cc:requires |
345 | + rdf:resource="http://web.resource.org/cc/ShareAlike" /> |
346 | + <cc:requires |
347 | + rdf:resource="http://web.resource.org/cc/SourceCode" /> |
348 | + </cc:License> |
349 | + </rdf:RDF> |
350 | + </metadata> |
351 | + <g |
352 | + id="layer1" |
353 | + inkscape:label="Layer 1" |
354 | + inkscape:groupmode="layer"> |
355 | + <path |
356 | + style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:0.9226315;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" |
357 | + d="m 11.232707,15.156517 25.823278,0.333897 c 0.687356,0 1.12121,0.544588 1.240715,1.127466 l 4.010738,22.372355 -0.0015,2.428313 c 0.0924,0.624618 -0.306961,0.97347 -0.994316,0.97347 l -34.0880951,10e-7 c -0.6873559,0 -1.2099148,-0.441251 -1.2099148,-1.065869 L 5.9163968,39.24801 9.991992,16.283983 c 0.278844,-0.624617 0.553359,-1.127466 1.240715,-1.127466 z" |
358 | + id="rect1975" |
359 | + sodipodi:nodetypes="ccccccccccc" |
360 | + inkscape:connector-curvature="0" /> |
361 | + <rect |
362 | + style="opacity:0.37078654;color:#000000;fill:#f57900;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" |
363 | + id="rect2851" |
364 | + width="35.455719" |
365 | + height="2.8450425" |
366 | + x="4.0179882" |
367 | + y="39.145664" |
368 | + rx="0.58384097" |
369 | + ry="0.59698707" |
370 | + transform="matrix(1,0,0.05931008,0.99823961,0,0)" /> |
371 | + <path |
372 | + style="opacity:0.4831461;color:#000000;fill:none;stroke:url(#linearGradient5615);stroke-width:0.9226315;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" |
373 | + d="m 11.242666,16.098791 c -0.13639,0 -0.08965,-0.02526 -0.140837,0.02951 -0.04586,0.04907 -0.140443,0.259791 -0.253508,0.501716 -0.01314,0.02811 -0.01459,0.02861 -0.02817,0.05903 l -3.5668221,20.846774 -0.3920164,1.670652 0.012757,2.03327 c 0.00351,0.171334 0.096029,0.269476 0.3688096,0.269476 l 33.8009826,0 c 0.272781,0 0.36881,-0.04306 0.36881,-0.08468 0.03187,-0.695303 -0.0329,-1.665364 -0.01542,-2.250428 C 41.312909,38.776664 37.41026,16.836608 37.41026,16.836608 37.35929,16.587994 37.257412,16.42343 37.044083,16.42343 z" |
374 | + id="path4730" |
375 | + inkscape:connector-curvature="0" |
376 | + sodipodi:nodetypes="cscccccssccccc" /> |
377 | + <path |
378 | + style="opacity:0.46629214;color:#000000;fill:url(#radialGradient6423);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" |
379 | + d="M 41.956464,38.858879 C 41.614561,37.67334 41.159768,35.269477 41.159768,35.269477 l -8.046637,3.005081 c 5.178529,0 7.727958,-0.250423 8.843333,0.584321 z" |
380 | + id="path6415" |
381 | + sodipodi:nodetypes="cccc" |
382 | + inkscape:connector-curvature="0" /> |
383 | + <path |
384 | + style="opacity:0.26404497;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" |
385 | + d="m 6.4123084,39.55266 c 0,0 0.1369899,-0.458059 0.639286,-0.496231 l 34.1104656,0 c 0.684951,0 0.730614,0.648916 0.730614,0.648916 0,0 0.02143,-1.398862 -1.165817,-1.398862 l -33.0637439,0 c -0.9132654,0.07635 -1.2508047,0.673602 -1.2508047,1.246177 z" |
386 | + id="path6361" |
387 | + sodipodi:nodetypes="ccccccc" |
388 | + inkscape:connector-curvature="0" /> |
389 | + <path |
390 | + sodipodi:nodetypes="cczczcccc" |
391 | + id="path2524" |
392 | + d="M 7.0200945,6.9774567 6.1372661,37.25317 c 0,0 19.5278669,0.592911 26.5620499,0.592911 7.193362,0 10.054725,-4.770689 10.054725,-4.770689 0,0 -0.907437,-0.728821 -2.095759,-7.982249 L 38.491608,8.2174752 C 38.073881,6.3107528 37.719858,5.5437142 36.90847,5.5556366 l -25.040896,0 C 9.3704632,5.5764005 7.0992694,5.2940562 7.0200945,6.9774567 z" |
393 | + style="fill:url(#radialGradient6405);fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:1.20358479px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
394 | + inkscape:connector-curvature="0" /> |
395 | + <path |
396 | + style="opacity:0.46629214;fill:none;stroke:url(#radialGradient6413);stroke-width:1.2195574px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
397 | + d="M 9.4686749,6.7467557 C 9.2451367,6.8753027 7.9485917,6.6797393 8.2038507,7.4190734 L 7.3617145,36.108446 c 1.5140685,0.01637 18.4680775,0.512964 25.1345285,0.512964 3.45473,0 5.692862,-1.014728 7.185295,-2.166478 0.94187,-0.726863 1.343273,-1.134692 1.63294,-1.526636 -0.438402,-1.314797 -1.2052,-3.141051 -1.809428,-6.994211 -5.84e-4,-0.03466 -5.84e-4,-0.06937 0,-0.104044 0,0 -2.060472,-16.7155091 -2.12219,-17.2171936 C 37.191652,7.7010354 37.041614,7.1967546 36.964008,7.0523806 36.886396,6.9079977 36.961666,6.8001947 36.718448,6.803931 27.836215,6.5602236 17.729657,6.916824 9.4686749,6.7467557 z" |
398 | + id="path6403" |
399 | + inkscape:connector-curvature="0" |
400 | + sodipodi:nodetypes="cccssccccscc" /> |
401 | + <path |
402 | + sodipodi:nodetypes="ccccccc" |
403 | + id="path6363" |
404 | + d="m 6.5121808,40.939543 c 0,0 0.1359808,-0.472321 0.634577,-0.511681 l 33.8592122,0 c 0.679904,0 0.725231,0.669121 0.725231,0.669121 0,0 0.02127,-1.44242 -1.15723,-1.44242 l -32.8201988,0 c -0.9065384,0.07872 -1.2415914,0.694578 -1.2415914,1.28498 z" |
405 | + style="opacity:0.26404497;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" |
406 | + inkscape:connector-curvature="0" /> |
407 | + <path |
408 | + style="fill:#d40000;fill-opacity:1;stroke:#ffffff;stroke-width:1.70000005;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" |
409 | + d="m 26.40625,17.78125 c -0.0699,-0.0027 -0.125999,0.03637 -0.1875,0.0625 -0.184503,0.07839 -0.303633,0.266016 -0.3125,0.5 l -0.125,2.96875 c -1.124246,0.118287 -2.259295,0.448489 -3.375,0.96875 -1.238378,0.577466 -2.294058,1.353548 -3.15625,2.25 L 16.8125,22.625 c -0.246589,-0.19148 -0.578386,-0.158503 -0.75,0.0625 -0.171613,0.221006 -0.121589,0.558521 0.125,0.75 l 2.40625,1.84375 c -1.77245,2.265013 -2.346012,5.113828 -1.21875,7.53125 0.09478,0.203263 0.229692,0.373814 0.34375,0.5625 l 16.1875,-7.5625 c -0.07123,-0.208658 -0.123967,-0.421737 -0.21875,-0.625 -1.172353,-2.514119 -3.89038,-3.912332 -6.90625,-3.90625 l 0.125,-2.875 c 0.01182,-0.311979 -0.220385,-0.614405 -0.5,-0.625 z m 10.6875,7.1875 c -0.258365,0.0118 -0.500367,0.07109 -0.75,0.1875 -0.998535,0.465624 -1.465624,1.626465 -1,2.625 l 3.144906,7.28125 c 0.550542,-0.242899 0.790198,-0.509902 1.068172,-0.724422 0.94187,-0.726863 1.248218,-0.965077 1.537885,-1.357021 -0.346293,-1.038556 -0.848573,-2.451321 -1.362692,-4.875 L 38.96875,26.09375 c -0.349218,-0.748901 -1.099905,-1.1604 -1.875,-1.125 z M 34,26.46875 18.09375,33.875 l 0.5,1.0625 0.125,0.3125 0.606057,0.982021 c 4.914198,0.11502 9.58727,0.21875 12.652505,0.21875 2.461495,0 4.334462,-0.418841 5.731057,-1.000964 L 38.036922,34.650578 35.25,29.125 34.5,27.5 z m -17.75,8.0625 c -0.256948,0.0079 -0.531616,0.07109 -0.78125,0.1875 -0.644887,0.300715 -0.866947,0.685338 -0.950771,1.344713 1.648576,0.04204 1.778307,0.0905 3.745292,0.137308 L 18.125,35.6875 C 17.775782,34.938599 17.020844,34.50753 16.25,34.53125 z" |
410 | + id="rect5365-8" |
411 | + inkscape:connector-curvature="0" |
412 | + sodipodi:nodetypes="csccsccscccccscccssccscccscccccscccccsscccs" /> |
413 | + <g |
414 | + id="g4229"> |
415 | + <path |
416 | + id="rect5365" |
417 | + d="M 34.0625 26.46875 L 18.125 33.90625 L 18.625 34.9375 L 18.78125 35.25 L 19.3125 36.40625 C 24.2176 36.520982 29.441298 36.625 32.5 36.625 C 34.983087 36.625 36.817807 36.097521 38.21875 35.375 L 37.9375 34.8125 L 35.28125 29.125 L 34.53125 27.53125 L 34.0625 26.46875 z " |
418 | + style="fill:#97c024;fill-opacity:1;stroke:none" /> |
419 | + <path |
420 | + id="rect5394" |
421 | + d="M 16.28125 34.5625 C 16.02305 34.572156 15.749634 34.633594 15.5 34.75 C 14.865586 35.045832 14.466246 35.638811 14.375 36.28125 C 16.023035 36.323265 16.506145 36.32832 18.46875 36.375 L 18.15625 35.71875 C 17.807032 34.969849 17.05585 34.533533 16.28125 34.5625 z " |
422 | + style="fill:#97c024;fill-opacity:1;stroke:none" /> |
423 | + <path |
424 | + id="rect5394-2" |
425 | + d="M 37.125 25 C 36.8668 25.009656 36.624634 25.071094 36.375 25.1875 C 35.376465 25.653124 34.940626 26.813965 35.40625 27.8125 L 38.78125 35.0625 C 39.105205 34.867207 39.415811 34.67842 39.6875 34.46875 C 40.62937 33.741887 41.022833 33.329444 41.3125 32.9375 C 40.966207 31.898944 40.420369 30.486179 39.90625 28.0625 L 39 26.15625 C 38.650782 25.407349 37.8996 24.971033 37.125 25 z " |
426 | + style="fill:#97c024;fill-opacity:1;stroke:none" /> |
427 | + <g |
428 | + transform="matrix(0.90630778,-0.42261826,0.42261826,0.90630778,-1.2035996,29.947087)" |
429 | + id="g5481" |
430 | + style="stroke:none"> |
431 | + <path |
432 | + inkscape:connector-curvature="0" |
433 | + style="fill:#97c024;fill-opacity:1;stroke:none" |
434 | + 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" |
435 | + id="path5418" /> |
436 | + <path |
437 | + sodipodi:type="arc" |
438 | + style="fill:#ffffff;fill-opacity:1;stroke:none" |
439 | + id="path5449" |
440 | + sodipodi:cx="21.37104" |
441 | + sodipodi:cy="8.3357286" |
442 | + sodipodi:rx="0.78918165" |
443 | + sodipodi:ry="0.77339804" |
444 | + 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" |
445 | + transform="matrix(1.0212245,0,0,1.0212245,-1.4154165,-1.4231952)" /> |
446 | + <path |
447 | + sodipodi:type="arc" |
448 | + style="fill:#ffffff;fill-opacity:1;stroke:none" |
449 | + id="path5449-6" |
450 | + sodipodi:cx="21.37104" |
451 | + sodipodi:cy="8.3357286" |
452 | + sodipodi:rx="0.78918165" |
453 | + sodipodi:ry="0.77339804" |
454 | + 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" |
455 | + transform="matrix(1.0212245,0,0,1.0212245,6.7121839,-1.4238284)" /> |
456 | + <rect |
457 | + style="fill:#97c024;fill-opacity:1;stroke:none" |
458 | + id="rect5423" |
459 | + width="1.0101534" |
460 | + height="5.0507627" |
461 | + x="15.824705" |
462 | + y="9.2116003" |
463 | + rx="0.50507671" |
464 | + transform="matrix(0.88965349,-0.45663625,0.45663625,0.88965349,0,0)" |
465 | + ry="0.56354231" /> |
466 | + <rect |
467 | + style="fill:#97c024;fill-opacity:1;stroke:none" |
468 | + id="rect5423-6" |
469 | + width="1.0101534" |
470 | + height="5.0507627" |
471 | + x="-27.690969" |
472 | + y="-13.159358" |
473 | + rx="0.50507671" |
474 | + transform="matrix(-0.88965349,-0.45663625,-0.45663625,0.88965349,0,0)" |
475 | + ry="0.56354231" /> |
476 | + </g> |
477 | + </g> |
478 | + <path |
479 | + inkscape:r_cy="true" |
480 | + inkscape:r_cx="true" |
481 | + transform="matrix(0.55579,0,0,0.36676817,12.302358,11.480414)" |
482 | + d="m 43.125,40.4375 a 19.5625,6.8125 0 1 1 -39.125,0 19.5625,6.8125 0 1 1 39.125,0 z" |
483 | + sodipodi:ry="6.8125" |
484 | + sodipodi:rx="19.5625" |
485 | + sodipodi:cy="40.4375" |
486 | + sodipodi:cx="23.5625" |
487 | + id="path3008" |
488 | + style="opacity:0.34649126;color:#000000;fill:url(#radialGradient2552);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" |
489 | + sodipodi:type="arc" /> |
490 | + <g |
491 | + id="g1574" |
492 | + transform="matrix(0.93173444,-0.26158059,0.24965766,0.97623138,17.303994,-27.061356)" |
493 | + inkscape:r_cx="true" |
494 | + inkscape:r_cy="true"> |
495 | + <path |
496 | + transform="translate(-29.75546,19)" |
497 | + sodipodi:nodetypes="cccccc" |
498 | + id="path2960" |
499 | + 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" |
500 | + style="color:#000000;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;overflow:visible" |
501 | + inkscape:r_cx="true" |
502 | + inkscape:r_cy="true" |
503 | + inkscape:connector-curvature="0" /> |
504 | + <path |
505 | + transform="translate(-29.75546,19)" |
506 | + style="color:#000000;fill:url(#linearGradient2554);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;overflow:visible" |
507 | + 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" |
508 | + id="path2964" |
509 | + sodipodi:nodetypes="czcczcc" |
510 | + inkscape:r_cx="true" |
511 | + inkscape:r_cy="true" |
512 | + inkscape:connector-curvature="0" /> |
513 | + <path |
514 | + transform="translate(-29.75546,19)" |
515 | + sodipodi:nodetypes="czcczcc" |
516 | + id="path2962" |
517 | + 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" |
518 | + style="color:#000000;fill:url(#linearGradient2556);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;overflow:visible" |
519 | + inkscape:r_cx="true" |
520 | + inkscape:r_cy="true" |
521 | + inkscape:connector-curvature="0" /> |
522 | + <path |
523 | + transform="translate(-29.75546,19)" |
524 | + sodipodi:nodetypes="cccc" |
525 | + id="path2982" |
526 | + 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" |
527 | + style="color:#000000;fill:url(#radialGradient2558);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;overflow:visible" |
528 | + inkscape:r_cx="true" |
529 | + inkscape:r_cy="true" |
530 | + inkscape:connector-curvature="0" /> |
531 | + <path |
532 | + transform="translate(-29.75546,19)" |
533 | + sodipodi:nodetypes="cccc" |
534 | + id="path2992" |
535 | + 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" |
536 | + style="color:#000000;fill:url(#linearGradient2560);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;overflow:visible" |
537 | + inkscape:r_cx="true" |
538 | + inkscape:r_cy="true" |
539 | + inkscape:connector-curvature="0" /> |
540 | + <path |
541 | + transform="translate(-29.75546,19)" |
542 | + sodipodi:nodetypes="ccccc" |
543 | + id="path3002" |
544 | + 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" |
545 | + style="color:#000000;fill:#ffffff;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;overflow:visible" |
546 | + inkscape:r_cx="true" |
547 | + inkscape:r_cy="true" |
548 | + inkscape:connector-curvature="0" /> |
549 | + <path |
550 | + transform="translate(-29.75546,19)" |
551 | + sodipodi:nodetypes="ccccc" |
552 | + id="path3004" |
553 | + 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" |
554 | + style="color:#000000;fill:#000000;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;overflow:visible" |
555 | + inkscape:r_cx="true" |
556 | + inkscape:r_cy="true" |
557 | + inkscape:connector-curvature="0" /> |
558 | + </g> |
559 | + </g> |
560 | +</svg> |
561 | |
562 | === added file 'res/drawable-hdpi/ic_launcher.png' |
563 | Binary files res/drawable-hdpi/ic_launcher.png 1970-01-01 00:00:00 +0000 and res/drawable-hdpi/ic_launcher.png 2011-07-07 04:23:24 +0000 differ |
564 | === modified file 'res/drawable-hdpi/icon_actionbar_dot.png' |
565 | Binary files res/drawable-hdpi/icon_actionbar_dot.png 2010-06-11 07:12:25 +0000 and res/drawable-hdpi/icon_actionbar_dot.png 2011-07-07 04:23:24 +0000 differ |
566 | === modified file 'res/drawable-hdpi/icon_actionbar_sync.png' |
567 | Binary files res/drawable-hdpi/icon_actionbar_sync.png 2010-05-24 10:20:03 +0000 and res/drawable-hdpi/icon_actionbar_sync.png 2011-07-07 04:23:24 +0000 differ |
568 | === modified file 'res/drawable-hdpi/icon_actionbar_sync_background.png' |
569 | Binary files res/drawable-hdpi/icon_actionbar_sync_background.png 2010-07-17 21:12:01 +0000 and res/drawable-hdpi/icon_actionbar_sync_background.png 2011-07-07 04:23:24 +0000 differ |
570 | === added directory 'res/drawable-ldpi' |
571 | === added file 'res/drawable-ldpi/ic_launcher.png' |
572 | Binary files res/drawable-ldpi/ic_launcher.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/ic_launcher.png 2011-07-07 04:23:24 +0000 differ |
573 | === added file 'res/drawable-ldpi/icon_actionbar_dot.png' |
574 | Binary files res/drawable-ldpi/icon_actionbar_dot.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/icon_actionbar_dot.png 2011-07-07 04:23:24 +0000 differ |
575 | === added file 'res/drawable-ldpi/icon_actionbar_sync.png' |
576 | Binary files res/drawable-ldpi/icon_actionbar_sync.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/icon_actionbar_sync.png 2011-07-07 04:23:24 +0000 differ |
577 | === added file 'res/drawable-ldpi/icon_actionbar_sync_background.png' |
578 | Binary files res/drawable-ldpi/icon_actionbar_sync_background.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/icon_actionbar_sync_background.png 2011-07-07 04:23:24 +0000 differ |
579 | === added file 'res/drawable-mdpi/ic_launcher.png' |
580 | Binary files res/drawable-mdpi/ic_launcher.png 1970-01-01 00:00:00 +0000 and res/drawable-mdpi/ic_launcher.png 2011-07-07 04:23:24 +0000 differ |
581 | === modified file 'res/drawable-mdpi/icon_actionbar_dot.png' |
582 | Binary files res/drawable-mdpi/icon_actionbar_dot.png 2010-06-11 07:12:25 +0000 and res/drawable-mdpi/icon_actionbar_dot.png 2011-07-07 04:23:24 +0000 differ |
583 | === modified file 'res/drawable-mdpi/icon_actionbar_sync.png' |
584 | Binary files res/drawable-mdpi/icon_actionbar_sync.png 2010-05-24 10:20:03 +0000 and res/drawable-mdpi/icon_actionbar_sync.png 2011-07-07 04:23:24 +0000 differ |
585 | === modified file 'res/drawable-mdpi/icon_actionbar_sync_background.png' |
586 | Binary files res/drawable-mdpi/icon_actionbar_sync_background.png 2010-07-17 21:12:01 +0000 and res/drawable-mdpi/icon_actionbar_sync_background.png 2011-07-07 04:23:24 +0000 differ |
587 | === added file 'res/drawable/actionbar_background.png' |
588 | Binary files res/drawable/actionbar_background.png 1970-01-01 00:00:00 +0000 and res/drawable/actionbar_background.png 2011-07-07 04:23:24 +0000 differ |
589 | === modified file 'res/drawable/icon.png' |
590 | Binary files res/drawable/icon.png 2010-07-24 12:46:06 +0000 and res/drawable/icon.png 2011-07-07 04:23:24 +0000 differ |
591 | === removed file 'res/drawable/icon_about.png' |
592 | Binary files res/drawable/icon_about.png 2009-04-06 01:07:32 +0000 and res/drawable/icon_about.png 1970-01-01 00:00:00 +0000 differ |
593 | === removed file 'res/drawable/icon_actionbar_dot.png' |
594 | Binary files res/drawable/icon_actionbar_dot.png 2010-06-04 08:35:35 +0000 and res/drawable/icon_actionbar_dot.png 1970-01-01 00:00:00 +0000 differ |
595 | === removed file 'res/drawable/icon_actionbar_sync.png' |
596 | Binary files res/drawable/icon_actionbar_sync.png 2010-05-24 10:20:03 +0000 and res/drawable/icon_actionbar_sync.png 1970-01-01 00:00:00 +0000 differ |
597 | === removed file 'res/drawable/icon_actionbar_sync_background.png' |
598 | Binary files res/drawable/icon_actionbar_sync_background.png 2010-07-17 21:12:01 +0000 and res/drawable/icon_actionbar_sync_background.png 1970-01-01 00:00:00 +0000 differ |
599 | === removed file 'res/drawable/icon_close.png' |
600 | Binary files res/drawable/icon_close.png 2009-04-05 21:24:47 +0000 and res/drawable/icon_close.png 1970-01-01 00:00:00 +0000 differ |
601 | === removed file 'res/drawable/icon_load_from_web.png' |
602 | Binary files res/drawable/icon_load_from_web.png 2009-04-05 21:24:47 +0000 and res/drawable/icon_load_from_web.png 1970-01-01 00:00:00 +0000 differ |
603 | === removed file 'res/drawable/syncbutton_background.xml' |
604 | --- res/drawable/syncbutton_background.xml 2010-07-17 21:12:01 +0000 |
605 | +++ res/drawable/syncbutton_background.xml 1970-01-01 00:00:00 +0000 |
606 | @@ -1,16 +0,0 @@ |
607 | -<?xml version="1.0" encoding="utf-8"?> |
608 | -<selector |
609 | - xmlns:android="http://schemas.android.com/apk/res/android"> |
610 | - <item |
611 | - android:state_focused="true" |
612 | - android:state_pressed="false" |
613 | - android:drawable="@drawable/syncbutton_background_focus" /> |
614 | - <item |
615 | - android:state_focused="true" |
616 | - android:state_pressed="true" |
617 | - android:drawable="@drawable/syncbutton_background_pressed" /> |
618 | - <item |
619 | - android:state_focused="false" |
620 | - android:state_pressed="true" |
621 | - android:drawable="@drawable/syncbutton_background_pressed" /> |
622 | -</selector> |
623 | \ No newline at end of file |
624 | |
625 | === removed file 'res/drawable/syncbutton_background_focus.xml' |
626 | --- res/drawable/syncbutton_background_focus.xml 2010-07-17 21:12:01 +0000 |
627 | +++ res/drawable/syncbutton_background_focus.xml 1970-01-01 00:00:00 +0000 |
628 | @@ -1,4 +0,0 @@ |
629 | -<?xml version="1.0" encoding="utf-8"?> |
630 | -<shape xmlns:android="http://schemas.android.com/apk/res/android"> |
631 | - <solid android:color="#ED6400"/> |
632 | -</shape> |
633 | \ No newline at end of file |
634 | |
635 | === removed file 'res/drawable/syncbutton_background_pressed.xml' |
636 | --- res/drawable/syncbutton_background_pressed.xml 2010-07-17 21:12:01 +0000 |
637 | +++ res/drawable/syncbutton_background_pressed.xml 1970-01-01 00:00:00 +0000 |
638 | @@ -1,4 +0,0 @@ |
639 | -<?xml version="1.0" encoding="utf-8"?> |
640 | -<shape xmlns:android="http://schemas.android.com/apk/res/android"> |
641 | - <solid android:color="#EA9F00"/> |
642 | -</shape> |
643 | \ No newline at end of file |
644 | |
645 | === modified file 'res/layout/actionbar.xml' |
646 | --- res/layout/actionbar.xml 2010-09-26 19:57:31 +0000 |
647 | +++ res/layout/actionbar.xml 2011-07-07 04:23:24 +0000 |
648 | @@ -20,65 +20,67 @@ |
649 | You should have received a copy of the GNU General Public License |
650 | along with Tomdroid. If not, see <http://www.gnu.org/licenses/>. |
651 | --> |
652 | -<org.tomdroid.ui.Actionbar |
653 | - xmlns:android="http://schemas.android.com/apk/res/android" |
654 | - android:id="@+id/dhistory_row" |
655 | - android:layout_width="fill_parent" |
656 | - android:layout_height="40dip" |
657 | - android:background="#ddd" |
658 | - android:gravity="center_horizontal" |
659 | - android:orientation="horizontal"> |
660 | +<org.tomdroid.ui.Actionbar xmlns:android="http://schemas.android.com/apk/res/android" |
661 | + android:id="@+id/dhistory_row" |
662 | + android:layout_width="fill_parent" |
663 | + android:layout_height="40dip" |
664 | + android:gravity="center_horizontal" |
665 | + android:orientation="horizontal" |
666 | + android:background="@drawable/actionbar_background" |
667 | + > |
668 | <ImageView |
669 | android:id="@+id/action_icon" |
670 | - android:src="@drawable/icon" |
671 | android:layout_height="wrap_content" |
672 | android:layout_width="wrap_content" |
673 | android:scaleType="fitStart" |
674 | - android:padding="4dip" |
675 | + android:padding="1dip" |
676 | + android:src="@drawable/ic_launcher" |
677 | /> |
678 | <TextView |
679 | android:id="@+id/title" |
680 | android:text="Tomdroid" |
681 | - android:layout_marginLeft="42dip" |
682 | + android:layout_marginLeft="46dip" |
683 | android:layout_height="wrap_content" |
684 | android:layout_width="wrap_content" |
685 | android:textSize="18dip" |
686 | android:textStyle="bold" |
687 | - android:textColor="#FF555555" |
688 | android:singleLine="true" |
689 | android:ellipsize="marquee" |
690 | android:fadingEdge="horizontal" |
691 | android:fadingEdgeLength="5mm" |
692 | - android:paddingTop="10dip" |
693 | - android:paddingRight="30dip" |
694 | + android:paddingTop="8dip" |
695 | + android:paddingRight="42dip" |
696 | + android:textColor="#FF555555" |
697 | /> |
698 | <ImageView |
699 | android:id="@+id/sync" |
700 | android:src="@drawable/icon_actionbar_sync_background" |
701 | - android:background="@drawable/syncbutton_background" |
702 | android:layout_alignParentRight="true" |
703 | - android:layout_width="wrap_content" |
704 | + android:layout_width="40dip" |
705 | android:layout_height="fill_parent" |
706 | - android:scaleType="center" |
707 | android:clickable="true" |
708 | android:focusable="true" |
709 | + android:background="@android:drawable/menuitem_background" |
710 | + android:gravity="center_horizontal" |
711 | + android:scaleType="center" |
712 | /> |
713 | <ImageView |
714 | android:id="@+id/syncIcon" |
715 | android:src="@drawable/icon_actionbar_sync" |
716 | - android:background="#00000000" |
717 | android:layout_alignParentRight="true" |
718 | - android:layout_width="wrap_content" |
719 | + android:layout_width="40dip" |
720 | android:layout_height="fill_parent" |
721 | + android:gravity="center_horizontal" |
722 | android:scaleType="center" |
723 | /> |
724 | <ImageView |
725 | - android:id="@+id/sync_dot" |
726 | - android:src="@drawable/icon_actionbar_dot" |
727 | - android:layout_alignParentRight="true" |
728 | - android:layout_width="wrap_content" |
729 | - android:layout_height="fill_parent" |
730 | - android:scaleType="center" |
731 | - android:visibility="invisible" |
732 | - /> |
733 | + android:id="@+id/sync_dot" |
734 | + android:src="@drawable/icon_actionbar_dot" |
735 | + android:layout_alignParentRight="true" |
736 | + android:layout_width="40dip" |
737 | + android:layout_height="fill_parent" |
738 | + android:gravity="center_horizontal" |
739 | + android:scaleType="center" |
740 | + android:visibility="invisible" |
741 | + /> |
742 | </org.tomdroid.ui.Actionbar> |
743 | \ No newline at end of file |
744 | |
745 | === modified file 'res/layout/main.xml' |
746 | --- res/layout/main.xml 2010-09-26 19:57:31 +0000 |
747 | +++ res/layout/main.xml 2011-07-07 04:23:24 +0000 |
748 | @@ -32,10 +32,10 @@ |
749 | <ListView android:id="@android:id/android:list" |
750 | android:layout_width="fill_parent" |
751 | android:layout_height="fill_parent" |
752 | - android:divider="#00000000" |
753 | - android:dividerHeight="0px" |
754 | - android:cacheColorHint="#ffdddddd" |
755 | + android:divider="#FFCCCCCC" |
756 | + android:dividerHeight="1px" |
757 | /> |
758 | + |
759 | <TextView android:id="@+id/list_empty" |
760 | android:layout_width="wrap_content" |
761 | android:layout_height="wrap_content" |
762 | |
763 | === modified file 'res/layout/main_list_item.xml' |
764 | --- res/layout/main_list_item.xml 2010-07-24 12:56:59 +0000 |
765 | +++ res/layout/main_list_item.xml 2011-07-07 04:23:24 +0000 |
766 | @@ -21,28 +21,33 @@ |
767 | You should have received a copy of the GNU General Public License |
768 | along with Tomdroid. If not, see <http://www.gnu.org/licenses/>. |
769 | --> |
770 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
771 | - android:orientation="vertical" |
772 | - android:layout_width="fill_parent" |
773 | - android:layout_height="wrap_content" > |
774 | - <TextView android:id="@+id/note_title" xmlns:android="http://schemas.android.com/apk/res/android" |
775 | - android:layout_width="fill_parent" |
776 | - android:layout_height="fill_parent" |
777 | + |
778 | +<TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android" |
779 | + android:layout_width="fill_parent" |
780 | + android:layout_height="fill_parent" |
781 | + android:minHeight="?android:attr/listPreferredItemHeight" |
782 | + android:paddingTop="2dip" |
783 | + android:paddingBottom="2dip" |
784 | + android:paddingLeft="5dip" |
785 | + android:mode="twoLine" |
786 | +> |
787 | + |
788 | + <TextView android:id="@+id/note_title" |
789 | + android:layout_width="fill_parent" |
790 | + android:layout_height="wrap_content" |
791 | + android:layout_marginTop="6dip" |
792 | android:textStyle="bold" |
793 | android:textColor="#FF555555" |
794 | android:textSize="18dp" |
795 | - android:paddingTop="5dip" |
796 | - android:paddingLeft="5dip" |
797 | - android:paddingRight="5dip" |
798 | - /> |
799 | - <TextView android:id="@+id/note_date" xmlns:android="http://schemas.android.com/apk/res/android" |
800 | - android:layout_width="fill_parent" |
801 | - android:layout_height="fill_parent" |
802 | + /> |
803 | + |
804 | + <TextView android:id="@+id/note_date" |
805 | + android:layout_width="fill_parent" |
806 | + android:layout_height="wrap_content" |
807 | + android:layout_below="@+id/note_title" |
808 | + android:layout_alignLeft="@+id/title" |
809 | android:textColor="#FF555555" |
810 | android:textSize="14dp" |
811 | - android:paddingTop="2dip" |
812 | - android:paddingLeft="5dip" |
813 | - android:paddingRight="5dip" |
814 | - android:paddingBottom="5dip" |
815 | - /> |
816 | -</LinearLayout> |
817 | \ No newline at end of file |
818 | + /> |
819 | + |
820 | +</TwoLineListItem> |
821 | \ No newline at end of file |
822 | |
823 | === modified file 'res/layout/note_view.xml' |
824 | --- res/layout/note_view.xml 2010-12-10 18:41:25 +0000 |
825 | +++ res/layout/note_view.xml 2011-07-07 04:23:24 +0000 |
826 | @@ -27,6 +27,7 @@ |
827 | android:orientation="vertical" |
828 | > |
829 | <include android:id="@+id/actionbar" layout="@layout/actionbar" /> |
830 | + |
831 | <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" |
832 | android:id="@+id/textScroller" |
833 | android:layout_width="fill_parent" |
834 | |
835 | === modified file 'res/menu/main.xml' |
836 | --- res/menu/main.xml 2010-06-12 05:53:50 +0000 |
837 | +++ res/menu/main.xml 2011-07-07 04:23:24 +0000 |
838 | @@ -24,10 +24,9 @@ |
839 | <menu xmlns:android="http://schemas.android.com/apk/res/android"> |
840 | |
841 | <item |
842 | - android:icon="@drawable/icon_about" |
843 | android:title="@string/menuAbout" |
844 | android:id="@+id/menuAbout" |
845 | - /> |
846 | + android:icon="@android:drawable/ic_menu_info_details"/> |
847 | |
848 | |
849 | <item |
850 | |
851 | === modified file 'sdcard.img' |
852 | Binary files sdcard.img 2010-10-08 03:46:32 +0000 and sdcard.img 2011-07-07 04:23:24 +0000 differ |
853 | === modified file 'src/org/tomdroid/ui/ViewNote.java' |
854 | --- src/org/tomdroid/ui/ViewNote.java 2010-10-09 19:54:14 +0000 |
855 | +++ src/org/tomdroid/ui/ViewNote.java 2011-07-07 04:23:24 +0000 |
856 | @@ -79,7 +79,6 @@ |
857 | content.setTextColor(Color.DKGRAY); |
858 | content.setTextSize(18.0f); |
859 | title = (TextView) findViewById(R.id.title); |
860 | - title.setBackgroundColor(0xffdddddd); |
861 | title.setTextColor(Color.DKGRAY); |
862 | title.setTextSize(18.0f); |
863 | |
864 | |
865 | === modified file 'src/org/tomdroid/util/NoteListCursorAdapter.java' |
866 | --- src/org/tomdroid/util/NoteListCursorAdapter.java 2010-12-08 21:46:06 +0000 |
867 | +++ src/org/tomdroid/util/NoteListCursorAdapter.java 2011-07-07 04:23:24 +0000 |
868 | @@ -43,7 +43,6 @@ |
869 | public class NoteListCursorAdapter extends SimpleCursorAdapter { |
870 | |
871 | private int layout; |
872 | - private int[] colors = new int[] { 0xFFFFFFFF, 0xFFEEEEEE }; |
873 | private Context context; |
874 | |
875 | private DateFormat localeDateFormat; |
876 | @@ -80,9 +79,6 @@ |
877 | @Override |
878 | public View getView(int position, View convertView, ViewGroup parent) { |
879 | View view = super.getView(position, convertView, parent); |
880 | - int colorPos = position % colors.length; |
881 | - view.setBackgroundColor(colors[colorPos]); |
882 | - //view.setTextColor(Color.DKGRAY); |
883 | return view; |
884 | } |
885 |
Could you add a README to the data/icon-src/ folder to say that the icons are coming from stock android and maybe put the path to them?
Oh.. and the new icon is sooo awesome!!!!
Send me your name and email so I can add you to the contributors list and credit your work. It's _very_ appreciated! The old market graphic sucked.. (I did it)
Once you'll have the small README, I'll approve and merge.
Thanks!