openlp-android team mailing list archive
-
openlp-android team
-
Mailing list archive
-
Message #00110
[Merge] lp:~johanmynhardt/openlp/android into lp:openlp/android
Johan Mynhardt has proposed merging lp:~johanmynhardt/openlp/android into lp:openlp/android.
Requested reviews:
OpenLP Android Developers (openlp-android)
For more details, see:
https://code.launchpad.net/~johanmynhardt/openlp/android/+merge/95798
Icon resources update, for low, medium and high density displays.
--
https://code.launchpad.net/~johanmynhardt/openlp/android/+merge/95798
Your team OpenLP Android Developers is requested to review the proposed merge of lp:~johanmynhardt/openlp/android into lp:openlp/android.
=== added file 'res/drawable-hdpi/alert.png'
Binary files res/drawable-hdpi/alert.png 1970-01-01 00:00:00 +0000 and res/drawable-hdpi/alert.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-hdpi/blank.png'
Binary files res/drawable-hdpi/blank.png 1970-01-01 00:00:00 +0000 and res/drawable-hdpi/blank.png 2012-03-04 20:30:24 +0000 differ
=== removed file 'res/drawable-hdpi/general_zoom_in.png'
Binary files res/drawable-hdpi/general_zoom_in.png 2012-03-03 11:00:27 +0000 and res/drawable-hdpi/general_zoom_in.png 1970-01-01 00:00:00 +0000 differ
=== added file 'res/drawable-hdpi/live.png'
Binary files res/drawable-hdpi/live.png 1970-01-01 00:00:00 +0000 and res/drawable-hdpi/live.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-hdpi/next.png'
Binary files res/drawable-hdpi/next.png 1970-01-01 00:00:00 +0000 and res/drawable-hdpi/next.png 2012-03-04 20:30:24 +0000 differ
=== removed file 'res/drawable-hdpi/openlp_logo_android_source.svg'
--- res/drawable-hdpi/openlp_logo_android_source.svg 2012-03-03 11:00:27 +0000
+++ res/drawable-hdpi/openlp_logo_android_source.svg 1970-01-01 00:00:00 +0000
@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="467.39001"
- height="700"
- id="svg5740"
- sodipodi:version="0.32"
- inkscape:version="0.48.2 r9819"
- version="1.0"
- sodipodi:docname="openlp_logo_android_source.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-filename="/home/johan/workspace/openlp-android-working/res/drawable-hdpi/openlp_logo_android.png"
- inkscape:export-xdpi="91.860847"
- inkscape:export-ydpi="91.860847"
- style="display:inline">
- <defs
- id="defs5742">
- <linearGradient
- id="linearGradient3208">
- <stop
- style="stop-color:#ffffff;stop-opacity:0.25098041;"
- offset="0"
- id="stop3210" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop3212" />
- </linearGradient>
- <linearGradient
- id="linearGradient3195">
- <stop
- style="stop-color:#cdcdff;stop-opacity:1;"
- offset="0"
- id="stop3197" />
- <stop
- style="stop-color:#ebebff;stop-opacity:1;"
- offset="1"
- id="stop3199" />
- </linearGradient>
- <linearGradient
- id="linearGradient6359">
- <stop
- style="stop-color:#000d26;stop-opacity:1;"
- offset="0"
- id="stop6361" />
- <stop
- style="stop-color:#507fda;stop-opacity:1;"
- offset="1"
- id="stop6363" />
- </linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective5748" />
- <filter
- inkscape:collect="always"
- id="filter6926"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="3.5771872"
- id="feGaussianBlur6928" />
- </filter>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3214"
- x1="470.25891"
- y1="276.68851"
- x2="463.2301"
- y2="14.822601"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3229"
- gradientUnits="userSpaceOnUse"
- x1="470.25891"
- y1="276.68851"
- x2="463.2301"
- y2="14.822601" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3279"
- gradientUnits="userSpaceOnUse"
- x1="470.25891"
- y1="276.68851"
- x2="463.2301"
- y2="14.822601" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3287"
- gradientUnits="userSpaceOnUse"
- x1="470.25891"
- y1="276.68851"
- x2="463.2301"
- y2="14.822601"
- gradientTransform="matrix(1.1122448,0,0,1.2037738,-57.29825,4.8849318)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient3196"
- gradientUnits="userSpaceOnUse"
- x1="117.59262"
- y1="384.05795"
- x2="418.20981"
- y2="436.03787" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient3198"
- gradientUnits="userSpaceOnUse"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3200"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.1122448,0,0,1.2037738,-57.29825,4.8849318)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient3215"
- gradientUnits="userSpaceOnUse"
- x1="117.59262"
- y1="384.05795"
- x2="418.20981"
- y2="436.03787" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient3217"
- gradientUnits="userSpaceOnUse"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3219"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.1122448,0,0,1.2037738,-57.29825,4.8849318)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient4010"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.7247086,0,0,0.7843464,-109.42065,-2.1325924)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient4013"
- gradientUnits="userSpaceOnUse"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938"
- gradientTransform="matrix(0.6515729,0,0,0.6515729,-72.086668,-5.3154816)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient4047"
- gradientUnits="userSpaceOnUse"
- x1="117.59262"
- y1="384.05795"
- x2="418.20981"
- y2="436.03787" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient4049"
- gradientUnits="userSpaceOnUse"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient4051"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.1122448,0,0,1.2037738,-57.29825,4.8849318)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient4053"
- gradientUnits="userSpaceOnUse"
- x1="117.59262"
- y1="384.05795"
- x2="418.20981"
- y2="436.03787" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient4055"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6515729,0,0,0.6515729,-72.086668,-5.3154816)"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient4057"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.7247086,0,0,0.7843464,-109.42065,-2.1325924)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.35778482"
- inkscape:cx="-323.52954"
- inkscape:cy="632.67267"
- inkscape:document-units="px"
- inkscape:current-layer="layer6"
- showgrid="false"
- inkscape:window-width="1600"
- inkscape:window-height="846"
- inkscape:window-x="0"
- inkscape:window-y="26"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata5745">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Shadow"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline"
- transform="translate(-11.872025,219.43636)" />
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Border"
- style="display:inline"
- transform="translate(-11.872025,219.43636)" />
- <g
- inkscape:groupmode="layer"
- id="layer3"
- inkscape:label="Rays Background"
- style="display:inline"
- transform="translate(-11.872025,219.43636)" />
- <g
- inkscape:groupmode="layer"
- id="layer2"
- inkscape:label="Rays Foreground"
- style="display:inline"
- transform="translate(-11.872025,219.43636)" />
- <g
- inkscape:groupmode="layer"
- id="layer6"
- inkscape:label="Reflection"
- style="display:inline"
- transform="translate(-11.872025,219.43636)">
- <g
- id="g4018"
- transform="matrix(2.0943295,0,0,2.0943295,-464.64725,-273.21634)"
- style="opacity:0.7">
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- transform="matrix(0.6379835,0,0,0.6379835,-67.554612,-15.189295)"
- d="m 833.03006,395.26932 c 0,197.56259 -160.15613,357.71872 -357.71872,357.71872 -197.56259,0 -357.71872,-160.15613 -357.71872,-357.71872 0,-197.5626 160.15613,-357.718722 357.71872,-357.718722 197.56259,0 357.71872,160.156122 357.71872,357.718722 z"
- sodipodi:ry="357.71872"
- sodipodi:rx="357.71872"
- sodipodi:cy="395.26932"
- sodipodi:cx="475.31134"
- id="path6903"
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter6926)"
- sodipodi:type="arc" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- sodipodi:type="arc"
- style="fill:#051e52;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
- id="path6900"
- sodipodi:cx="475.31134"
- sodipodi:cy="395.26932"
- sodipodi:rx="357.71872"
- sodipodi:ry="357.71872"
- d="m 833.03006,395.26932 c 0,197.56259 -160.15613,357.71872 -357.71872,357.71872 -197.56259,0 -357.71872,-160.15613 -357.71872,-357.71872 0,-197.5626 160.15613,-357.718722 357.71872,-357.718722 197.56259,0 357.71872,160.156122 357.71872,357.718722 z"
- transform="matrix(0.6379835,0,0,0.6379835,-67.554612,-15.189295)" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- transform="matrix(0.6317287,0,0,0.6317287,-64.581662,-12.716988)"
- d="m 833.03006,395.26932 c 0,197.56259 -160.15613,357.71872 -357.71872,357.71872 -197.56259,0 -357.71872,-160.15613 -357.71872,-357.71872 0,-197.5626 160.15613,-357.718722 357.71872,-357.718722 197.56259,0 357.71872,160.156122 357.71872,357.718722 z"
- sodipodi:ry="357.71872"
- sodipodi:rx="357.71872"
- sodipodi:cy="395.26932"
- sodipodi:cx="475.31134"
- id="path6317"
- style="fill:url(#linearGradient4053);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
- sodipodi:type="arc" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- id="path6327"
- d="m 235.67972,13.233984 c -35.92776,0 -69.88078,8.488655 -99.97572,23.558433 L 296.72396,165.96674 452.81639,291.19091 c 4.32451,-17.35817 6.61754,-35.51197 6.61754,-54.20272 0,-123.50655 -100.24766,-223.754205 -223.75421,-223.754206 z M 79.118968,77.210299 C 71.146114,85.023824 63.764822,93.431949 57.026574,102.35694 L 274.63156,209.66285 434.20584,288.36064 275.3035,193.86221 79.118968,77.210299 z M 24.488653,162.95322 c -3.62786,10.33827 -6.504275,21.02069 -8.592618,31.98816 L 260.17479,255.29332 422.98657,295.52794 260.21551,241.36595 24.488653,162.95322 z M 13.513722,263.49906 c 1.305042,11.03747 3.397359,21.8274 6.251027,32.31395 l 228.539191,6.51573 173.46093,4.96824 L 253.55725,289.23619 13.513722,263.49906 z M 428.50457,317.76287 249.79034,336.84174 47.782384,358.40473 c 5.959201,9.19899 12.564704,17.94104 19.771165,26.14436 L 244.45559,351.80755 428.50457,317.76287 z m 13.78484,5.21258 -188.36565,62.18449 -133.00232,43.89972 c 33.5632,20.10936 72.81152,31.66237 114.75828,31.66238 93.04288,0 172.8858,-56.87905 206.60969,-137.74659 z"
- style="fill:url(#linearGradient4055);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
- inkscape:connector-curvature="0" />
- <path
- id="path3203"
- d="m 235.67972,13.233984 c -35.92776,0 -69.88078,8.488655 -99.97572,23.558433 l 161.01996,129.174323 52.55342,42.16899 c 39.1477,-4.87501 74.57645,-12.22557 104.45528,-21.44082 C 430.89209,87.375898 341.89666,13.233985 235.67972,13.233984 z M 79.118968,77.210299 c -7.972854,7.813525 -15.354146,16.22165 -22.092394,25.146641 l 217.604986,107.30591 8.32792,4.11306 c 7.91353,-0.38016 15.72478,-0.85776 23.43626,-1.42532 L 275.3035,193.86221 79.118968,77.210299 z M 24.488653,162.95322 c -2.661786,7.58527 -4.921793,15.36128 -6.760069,23.29373 42.624133,13.3171 96.712956,22.78306 156.947626,26.67377 L 24.488653,162.95322 z"
- style="fill:url(#linearGradient4057);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
- inkscape:connector-curvature="0" />
- </g>
- </g>
-</svg>
=== removed file 'res/drawable-hdpi/plugin_alerts.png'
Binary files res/drawable-hdpi/plugin_alerts.png 2012-03-03 11:00:27 +0000 and res/drawable-hdpi/plugin_alerts.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'res/drawable-hdpi/plugin_bibles.png'
Binary files res/drawable-hdpi/plugin_bibles.png 2012-03-03 11:00:27 +0000 and res/drawable-hdpi/plugin_bibles.png 1970-01-01 00:00:00 +0000 differ
=== added file 'res/drawable-hdpi/preferences.png'
Binary files res/drawable-hdpi/preferences.png 1970-01-01 00:00:00 +0000 and res/drawable-hdpi/preferences.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-hdpi/previous.png'
Binary files res/drawable-hdpi/previous.png 1970-01-01 00:00:00 +0000 and res/drawable-hdpi/previous.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-hdpi/search.png'
Binary files res/drawable-hdpi/search.png 1970-01-01 00:00:00 +0000 and res/drawable-hdpi/search.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-hdpi/service.png'
Binary files res/drawable-hdpi/service.png 1970-01-01 00:00:00 +0000 and res/drawable-hdpi/service.png 2012-03-04 20:30:24 +0000 differ
=== removed file 'res/drawable-hdpi/slide_blank.png'
Binary files res/drawable-hdpi/slide_blank.png 2012-03-03 11:00:27 +0000 and res/drawable-hdpi/slide_blank.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'res/drawable-hdpi/slide_next.png'
Binary files res/drawable-hdpi/slide_next.png 2012-03-03 11:00:27 +0000 and res/drawable-hdpi/slide_next.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'res/drawable-hdpi/slide_previous.png'
Binary files res/drawable-hdpi/slide_previous.png 2012-03-03 11:00:27 +0000 and res/drawable-hdpi/slide_previous.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'res/drawable-hdpi/song_author_edit.png'
Binary files res/drawable-hdpi/song_author_edit.png 2012-03-03 11:00:27 +0000 and res/drawable-hdpi/song_author_edit.png 1970-01-01 00:00:00 +0000 differ
=== added file 'res/drawable-hdpi/stage.png'
Binary files res/drawable-hdpi/stage.png 1970-01-01 00:00:00 +0000 and res/drawable-hdpi/stage.png 2012-03-04 20:30:24 +0000 differ
=== removed file 'res/drawable-hdpi/system_live.png'
Binary files res/drawable-hdpi/system_live.png 2012-03-03 11:00:27 +0000 and res/drawable-hdpi/system_live.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'res/drawable-hdpi/tab_background.png'
Binary files res/drawable-hdpi/tab_background.png 2012-03-03 11:00:27 +0000 and res/drawable-hdpi/tab_background.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'res/drawable-hdpi/tab_bottom.png'
Binary files res/drawable-hdpi/tab_bottom.png 2012-03-03 11:00:27 +0000 and res/drawable-hdpi/tab_bottom.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'res/drawable-hdpi/tab_top.png'
Binary files res/drawable-hdpi/tab_top.png 2012-03-03 11:00:27 +0000 and res/drawable-hdpi/tab_top.png 1970-01-01 00:00:00 +0000 differ
=== added file 'res/drawable-ldpi/alert.png'
Binary files res/drawable-ldpi/alert.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/alert.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-ldpi/blank.png'
Binary files res/drawable-ldpi/blank.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/blank.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-ldpi/live.png'
Binary files res/drawable-ldpi/live.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/live.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-ldpi/next.png'
Binary files res/drawable-ldpi/next.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/next.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-ldpi/preferences.png'
Binary files res/drawable-ldpi/preferences.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/preferences.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-ldpi/previous.png'
Binary files res/drawable-ldpi/previous.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/previous.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-ldpi/search.png'
Binary files res/drawable-ldpi/search.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/search.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-ldpi/service.png'
Binary files res/drawable-ldpi/service.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/service.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-ldpi/stage.png'
Binary files res/drawable-ldpi/stage.png 1970-01-01 00:00:00 +0000 and res/drawable-ldpi/stage.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-mdpi/alert.png'
Binary files res/drawable-mdpi/alert.png 1970-01-01 00:00:00 +0000 and res/drawable-mdpi/alert.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-mdpi/blank.png'
Binary files res/drawable-mdpi/blank.png 1970-01-01 00:00:00 +0000 and res/drawable-mdpi/blank.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-mdpi/live.png'
Binary files res/drawable-mdpi/live.png 1970-01-01 00:00:00 +0000 and res/drawable-mdpi/live.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-mdpi/next.png'
Binary files res/drawable-mdpi/next.png 1970-01-01 00:00:00 +0000 and res/drawable-mdpi/next.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-mdpi/preferences.png'
Binary files res/drawable-mdpi/preferences.png 1970-01-01 00:00:00 +0000 and res/drawable-mdpi/preferences.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-mdpi/previous.png'
Binary files res/drawable-mdpi/previous.png 1970-01-01 00:00:00 +0000 and res/drawable-mdpi/previous.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-mdpi/search.png'
Binary files res/drawable-mdpi/search.png 1970-01-01 00:00:00 +0000 and res/drawable-mdpi/search.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-mdpi/service.png'
Binary files res/drawable-mdpi/service.png 1970-01-01 00:00:00 +0000 and res/drawable-mdpi/service.png 2012-03-04 20:30:24 +0000 differ
=== added file 'res/drawable-mdpi/stage.png'
Binary files res/drawable-mdpi/stage.png 1970-01-01 00:00:00 +0000 and res/drawable-mdpi/stage.png 2012-03-04 20:30:24 +0000 differ
=== modified file 'res/layout/main.xml'
--- res/layout/main.xml 2012-03-03 11:00:27 +0000
+++ res/layout/main.xml 2012-03-04 20:30:24 +0000
@@ -29,13 +29,13 @@
android:id="@+id/buttonService"
android:text="@string/tabService"
style="@style/ButtonStyle"
- android:drawableLeft="@drawable/plugin_bibles"
+ android:drawableLeft="@drawable/service"
/>
<Button
android:id="@+id/buttonLive"
android:text="@string/tabLive"
style="@style/ButtonStyle"
- android:drawableLeft="@drawable/system_live"
+ android:drawableLeft="@drawable/live"
/>
</TableRow>
<TableRow
@@ -45,13 +45,13 @@
android:id="@+id/buttonDisplay"
android:text="@string/tabDisplay"
style="@style/ButtonStyle"
- android:drawableLeft="@drawable/slide_blank"
+ android:drawableLeft="@drawable/blank"
/>
<Button
android:id="@+id/buttonStage"
android:text="@string/tabStage"
style="@style/ButtonStyle"
- android:drawableLeft="@drawable/song_author_edit"
+ android:drawableLeft="@drawable/stage"
/>
</TableRow>
<TableRow
@@ -61,13 +61,13 @@
android:id="@+id/buttonAlert"
android:text="@string/tabAlert"
style="@style/ButtonStyle"
- android:drawableLeft="@drawable/plugin_alerts"
+ android:drawableLeft="@drawable/alert"
/>
<Button
android:id="@+id/buttonSearch"
android:text="@string/buttonSearchText"
style="@style/ButtonStyle"
- android:drawableLeft="@drawable/general_zoom_in"
+ android:drawableLeft="@drawable/search"
/>
</TableRow>
</TableLayout>
=== modified file 'res/values/styles.xml'
--- res/values/styles.xml 2012-03-03 11:00:27 +0000
+++ res/values/styles.xml 2012-03-04 20:30:24 +0000
@@ -1,14 +1,9 @@
<resources>
<style name="OpenLPStyle" parent="android:Theme.Black.NoTitleBar.Fullscreen">
<item name="android:windowBackground">@drawable/openlp_logo_android</item>
- <item name="android:tabWidgetStyle">@style/TabStyle</item>
<item name="android:backgroundDimEnabled">false</item>
</style>
- <style name="TabStyle" parent="android:TextAppearance.Widget.TabWidget">
- <item name="android:background">@drawable/tab_background</item>
- <item name="android:textColor">@android:color/white</item>
- </style>
<style name="ButtonStyle" parent="android:TextAppearance.Widget.Button">
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">wrap_content</item>
@@ -16,10 +11,10 @@
<item name="android:layout_weight">1</item>
</style>
<style name="ButtonStylePrevious" parent="ButtonStyle">
- <item name="android:drawableLeft">@drawable/slide_previous</item>
+ <item name="android:drawableLeft">@drawable/previous</item>
</style>
<style name="ButtonStyleNext" parent="ButtonStyle">
- <item name="android:drawableRight">@drawable/slide_next</item>
+ <item name="android:drawableRight">@drawable/next</item>
</style>
<style name="SlideServiceListView" parent="android:Widget.ListView">
<item name="android:layout_gravity">top</item>
Follow ups