From 8a1fa5db93b70be2da18107e61b4093ae76dad35 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 14 Aug 2018 10:31:32 +0200 Subject: [PATCH] resize images to support 4.x with png instead of svg Signed-off-by: tobiasKaminsky --- build.gradle | 1 - drawable_resources/first_run_files.svg | 22 +++++++++---------- drawable_resources/first_run_groupware.svg | 16 +++++++------- drawable_resources/first_run_talk.svg | 18 +++++++-------- src/main/res/drawable/first_run_files.xml | 11 +++++----- src/main/res/drawable/first_run_groupware.xml | 13 ++++++----- src/main/res/drawable/first_run_talk.xml | 16 +++++++------- 7 files changed, 49 insertions(+), 48 deletions(-) diff --git a/build.gradle b/build.gradle index 0ef1ad7b45..be0b562778 100644 --- a/build.gradle +++ b/build.gradle @@ -91,7 +91,6 @@ android { testInstrumentationRunnerArgument "TEST_SERVER_URL", "\"$System.env.OCTEST_SERVER_BASE_URL\"" multiDexEnabled true - vectorDrawables.useSupportLibrary = true versionCode versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild diff --git a/drawable_resources/first_run_files.svg b/drawable_resources/first_run_files.svg index cce515f084..6f136d3bcb 100644 --- a/drawable_resources/first_run_files.svg +++ b/drawable_resources/first_run_files.svg @@ -6,9 +6,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - height="16" - viewBox="0 0 16 16" - width="16" + height="128" + viewBox="0 0 128 128" + width="128" version="1.1" id="svg4" sodipodi:docname="first_run_files.svg" @@ -37,20 +37,20 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1600" - inkscape:window-height="835" + inkscape:window-height="871" id="namedview6" showgrid="false" inkscape:pagecheckerboard="true" - inkscape:zoom="14.75" - inkscape:cx="-3.8305085" - inkscape:cy="8" - inkscape:window-x="0" + inkscape:zoom="3.6875" + inkscape:cx="82.000293" + inkscape:cy="51.757595" + inkscape:window-x="1600" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg4"/> + style="fill:#ffffff;fill-opacity:1;stroke-width:9" + inkscape:connector-curvature="0"/> diff --git a/drawable_resources/first_run_groupware.svg b/drawable_resources/first_run_groupware.svg index a653389300..48214c142b 100644 --- a/drawable_resources/first_run_groupware.svg +++ b/drawable_resources/first_run_groupware.svg @@ -7,8 +7,8 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" viewbox="0 0 16 16" - height="16" - width="16" + height="128" + width="128" version="1.1" id="svg4" sodipodi:docname="first_run_groupware.svg" @@ -41,16 +41,16 @@ id="namedview6" showgrid="false" inkscape:pagecheckerboard="true" - inkscape:zoom="14.75" - inkscape:cx="0.54237288" - inkscape:cy="8" + inkscape:zoom="2.6074563" + inkscape:cx="-6.2650304" + inkscape:cy="38.828402" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg4"/> + style="fill:#ffffff;fill-opacity:1;stroke-width:8.98062992" + inkscape:connector-curvature="0"/> diff --git a/drawable_resources/first_run_talk.svg b/drawable_resources/first_run_talk.svg index 5c38b27b72..f5b9adee92 100644 --- a/drawable_resources/first_run_talk.svg +++ b/drawable_resources/first_run_talk.svg @@ -8,9 +8,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="16mm" - height="16mm" - viewBox="0 0 16 16" + width="128mm" + height="128mm" + viewBox="0 0 128 128" version="1.1" id="svg829" inkscape:version="0.92.2 2405546, 2018-03-11" @@ -24,9 +24,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="5.6" - inkscape:cx="-19.200952" - inkscape:cy="38.084396" + inkscape:zoom="0.98994949" + inkscape:cx="297.07973" + inkscape:cy="366.5173" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -56,11 +56,11 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-15.580506,-164.12649)"> + transform="translate(-15.580506,-52.12649)"> diff --git a/src/main/res/drawable/first_run_files.xml b/src/main/res/drawable/first_run_files.xml index 3c134cf4ae..d22a1d2637 100644 --- a/src/main/res/drawable/first_run_files.xml +++ b/src/main/res/drawable/first_run_files.xml @@ -1,11 +1,12 @@ + android:width="128dp" + android:height="128dp" + android:viewportWidth="128" + android:viewportHeight="128"> + android:strokeWidth="9" + android:pathData="M 5.5,10 C 3.25,10 1,12.25 1,14.5 v 99 c 0,2.34 2.16,4.5 4.5,4.5 h 117 c 2.34,0 4.5,-2.169 4.5,-4.5 v -81 C 127,30.25 124.75,28 122.5,28 H 64 L 46,10 Z M 84.25,41.5 A 11.25,11.25 0 0 1 95.5,52.75 11.25,11.25 0 0 1 84.25,64 11.25,11.25 0 0 1 77.0428,61.381 L 54.982,72.4195 A 11.25,11.25 0 0 1 55,73 11.25,11.25 0 0 1 54.9649,73.5805 L 77.0428,84.619 A 11.25,11.25 0 0 1 84.25,82 11.25,11.25 0 0 1 95.5,93.25 11.25,11.25 0 0 1 84.25,104.5 11.25,11.25 0 0 1 73,93.25 11.25,11.25 0 0 1 73.0351,92.674 L 50.9572,81.631 A 11.25,11.25 0 0 1 43.75,84.25 11.25,11.25 0 0 1 32.5,73 11.25,11.25 0 0 1 43.75,61.75 11.25,11.25 0 0 1 50.9572,64.369 L 73.018,53.3305 A 11.25,11.25 0 0 1 73,52.75 11.25,11.25 0 0 1 84.25,41.5 Z"/> diff --git a/src/main/res/drawable/first_run_groupware.xml b/src/main/res/drawable/first_run_groupware.xml index 38d32c2389..9a8f178409 100644 --- a/src/main/res/drawable/first_run_groupware.xml +++ b/src/main/res/drawable/first_run_groupware.xml @@ -1,11 +1,12 @@ + android:width="128dp" + android:height="128dp" + android:viewportWidth="128" + android:viewportHeight="128"> - \ No newline at end of file + android:strokeWidth="8.98062992" + android:pathData="M 73.014263,1.1355933 c -15.68018,0 -26.941889,12.8423007 -26.941889,25.1457627 0,12.572882 0.898063,21.553511 7.184504,31.432204 2.011661,2.604382 4.355605,3.14322 6.28644,5.388377 1.212385,4.490315 2.155351,8.98063 0.898063,13.470945 -3.915554,1.374036 -7.633535,2.981569 -11.405399,4.490314 -4.580121,-2.451711 -9.878693,-4.490314 -14.458814,-6.28644 -0.628644,-2.514577 -0.179612,-4.373567 0.449032,-6.735472 1.077675,-1.122579 2.065545,-1.616514 3.233026,-2.694189 3.322833,-4.041284 3.502446,-10.866562 3.502446,-15.716102 0,-7.184504 -6.466053,-12.572881 -13.470944,-12.572881 -7.813148,0 -13.470945,6.466053 -13.470945,12.572881 h -0.179612 c 0,6.286441 0.449031,10.776755 3.592252,15.716102 0.898062,1.347094 2.173312,1.57161 3.14322,2.694189 0.605294,2.245157 1.086656,4.490314 0.449031,6.735472 -5.747603,2.00268 -11.171903,4.490315 -16.1651327,7.184503 -3.7718644,2.694189 -2.0924867,1.634475 -4.4903148,10.327724 -1.11359806,4.490315 11.6748185,6.55586 20.8350605,7.27431 -0.449032,2.469677 -1.077676,5.747607 -2.873802,12.034047 -2.873801,11.22579 39.092681,15.26707 53.883778,15.26707 21.822929,0 56.694707,-4.09517 53.704157,-15.26707 C 122.0485,94.174916 124.85045,96.24046 117.91741,90.941889 108.12852,85.068557 95.896907,80.461494 85.587144,76.572882 84.24005,71.570671 85.227919,67.861671 86.485207,63.101937 c 2.110448,-2.245157 4.490315,-3.233026 6.466053,-5.388377 6.196635,-7.938877 7.004891,-21.769046 7.004891,-31.432204 0,-14.243278 -12.8423,-25.1457627 -26.941888,-25.1457627 z"/> + diff --git a/src/main/res/drawable/first_run_talk.xml b/src/main/res/drawable/first_run_talk.xml index 9958a72452..390275d2bf 100644 --- a/src/main/res/drawable/first_run_talk.xml +++ b/src/main/res/drawable/first_run_talk.xml @@ -1,16 +1,16 @@ + android:width="128dp" + android:height="128dp" + android:viewportWidth="128" + android:viewportHeight="128"> + android:translateY="-52.12649"> + android:strokeWidth="1.26614535" + android:pathData="M 79.572589,52.815123 a 63.300934,63.301842 0 0 0 -63.300038,63.303717 63.300934,63.301842 0 0 0 63.300038,63.3018 63.300934,63.301842 0 0 0 32.836581,-9.26097 c 7.77991,3.09162 25.20623,12.26357 29.35376,8.30176 4.33401,-4.13896 -5.08818,-23.61904 -7.34707,-30.85775 A 63.300934,63.301842 0 0 0 142.8719,116.11826 63.300934,63.301842 0 0 0 79.572762,52.817324 Z m 0.0074,24.06677 A 39.250508,39.251409 0 0 1 118.83033,116.13329 39.250508,39.251409 0 0 1 79.579825,155.382 39.250508,39.251409 0 0 1 40.329319,116.13329 39.250508,39.251409 0 0 1 79.579825,76.881893 Z"/> - \ No newline at end of file +