Refactoring

This commit is contained in:
Hilmer, Carsten 2016-09-29 21:25:30 +02:00
parent 81171acc8e
commit 9d8c66c9de
42 changed files with 172 additions and 10 deletions

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<widget id="com.raataar.pokedexhelper" android-versionCode="13" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Pokedex Helper</name>
<widget id="com.raataar.cotrainergo" android-versionCode="13" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Co-Trainer GO</name>
<description>&#xD;&#xD;
Pokedex Helper - Das Trainertool Deluxe&#xD;&#xD;
Co-Trainer GO - Dein Trainertool deluxe&#xD;&#xD;
</description>
<author email="info@raataar.de" href="http://www.raataar.de">&#xD;&#xD;
Ionic Up Team&#xD;&#xD;

View File

@ -55,7 +55,6 @@
}
],
"cordovaPlatforms": [
"ios",
"android"
"ios"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 236 KiB

After

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 362 KiB

After

Width:  |  Height:  |  Size: 163 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 509 KiB

After

Width:  |  Height:  |  Size: 219 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 KiB

After

Width:  |  Height:  |  Size: 112 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 349 KiB

After

Width:  |  Height:  |  Size: 157 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 495 KiB

After

Width:  |  Height:  |  Size: 211 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 MiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 MiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 37 KiB

BIN
stuff/Store/Store-Icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 293 KiB

After

Width:  |  Height:  |  Size: 354 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

View File

@ -1 +1,164 @@
<svg xmlns:x="http://ns.adobe.com/Extensibility/1.0/" xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns:graph="http://ns.adobe.com/Graphs/1.0/" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve"><switch><foreignObject requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" x="0" y="0" width="1" height="1"></foreignObject><g i:extraneous="self"><circle cx="49.926" cy="57.893" r="10.125"></circle><path d="M50,78.988c-19.872,0-35.541-16.789-36.198-17.503l-1.95-2.12l1.788-2.259c0.164-0.208,4.097-5.142,10.443-10.102 C32.664,40.296,41.626,36.751,50,36.751c8.374,0,17.336,3.546,25.918,10.253c6.346,4.96,10.278,9.894,10.443,10.102l1.788,2.259 l-1.95,2.12C85.541,62.2,69.872,78.988,50,78.988z M20.944,59.019C25.56,63.219,36.99,72.238,50,72.238 c13.059,0,24.457-9.013,29.061-13.214C74.565,54.226,63.054,43.501,50,43.501C36.951,43.501,25.444,54.218,20.944,59.019z"></path><path d="M44.305,30.939L50,21.075l5.695,9.864c3.002,0.427,6.045,1.185,9.102,2.265L50,7.575L35.203,33.204 C38.26,32.124,41.303,31.366,44.305,30.939z"></path><path d="M81.252,74.857L87.309,85H12.691l6.057-10.143c-2.029-1.279-3.894-2.629-5.578-3.887L1,92h98L86.83,70.97 C85.146,72.228,83.28,73.578,81.252,74.857z"></path></g></switch></svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<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"
version="1.1"
x="0px"
y="0px"
viewBox="0 0 100 100"
enable-background="new 0 0 100 100"
xml:space="preserve"
id="svg2"
inkscape:version="0.91 r13725"
sodipodi:docname="noun_24673.svg"
inkscape:export-filename="C:\_IONIC_\pokedex\stuff\Store\Icon.png"
inkscape:export-xdpi="470.00439"
inkscape:export-ydpi="470.00439"><metadata
id="metadata20"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs18"><linearGradient
id="linearGradient4384"><stop
style="stop-color:#ffffff;stop-opacity:0.77513230;"
offset="0.0000000"
id="stop4385" /><stop
style="stop-color:#ffffff;stop-opacity:0.0000000;"
offset="1.0000000"
id="stop4386" /></linearGradient><linearGradient
id="linearGradient4376"><stop
style="stop-color:#000000;stop-opacity:0.52645504;"
offset="0.0000000"
id="stop4377" /><stop
style="stop-color:#000000;stop-opacity:0.0000000;"
offset="1.0000000"
id="stop4378" /></linearGradient><linearGradient
id="linearGradient4358"><stop
style="stop-color:#000;stop-opacity:1;"
offset="0"
id="stop4359" /><stop
style="stop-color:#fff;stop-opacity:1;"
offset="1"
id="stop4360" /></linearGradient><linearGradient
y2="72.52414"
y1="59.803823"
xlink:href="#linearGradient4376"
x2="54.228146"
x1="52.53122"
inkscape:collect="always"
id="linearGradient2925"
gradientTransform="scale(1.2544523,0.79716066)"
gradientUnits="userSpaceOnUse" /><radialGradient
xlink:href="#linearGradient4384"
r="24.409792"
inkscape:collect="always"
id="radialGradient2927"
fy="32.697737"
fx="41.394096"
cy="32.697737"
cx="41.394096"
gradientTransform="scale(1.2476579,0.80150173)"
gradientUnits="userSpaceOnUse" /><radialGradient
xlink:href="#linearGradient4384"
r="27.318647"
inkscape:collect="always"
id="radialGradient2929"
fy="95.456122"
fx="46.52787"
cy="95.456122"
cx="46.163622"
gradientTransform="scale(1.0960965,0.91232839)"
gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1300"
inkscape:window-height="878"
id="namedview16"
showgrid="false"
inkscape:zoom="2.36"
inkscape:cx="50"
inkscape:cy="50"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" /><path
d="m 50,78.988 c -19.872,0 -35.541,-16.789 -36.198,-17.503 l -1.95,-2.12 1.788,-2.259 C 13.804,56.898 17.737,51.964 24.083,47.004 32.664,40.296 41.626,36.751 50,36.751 c 8.374,0 17.336,3.546 25.918,10.253 6.346,4.96 10.278,9.894 10.443,10.102 l 1.788,2.259 -1.95,2.12 C 85.541,62.2 69.872,78.988 50,78.988 Z M 20.944,59.019 C 25.56,63.219 36.99,72.238 50,72.238 63.059,72.238 74.457,63.225 79.061,59.024 74.565,54.226 63.054,43.501 50,43.501 c -13.049,0 -24.556,10.717 -29.056,15.518 z"
id="path10"
inkscape:connector-curvature="0" /><path
d="M 44.305,30.939 50,21.075 l 5.695,9.864 c 3.002,0.427 6.045,1.185 9.102,2.265 L 50,7.575 35.203,33.204 c 3.057,-1.08 6.1,-1.838 9.102,-2.265 z"
id="path12"
inkscape:connector-curvature="0" /><path
d="M 81.252,74.857 87.309,85 12.691,85 18.748,74.857 C 16.719,73.578 14.854,72.228 13.17,70.97 L 1,92 99,92 86.83,70.97 c -1.684,1.258 -3.55,2.608 -5.578,3.887 z"
id="path14"
inkscape:connector-curvature="0" /><path
id="path10-6"
d="m 50,79.2005 c -19.872,0 -35.541,-16.789 -36.198,-17.503 l -1.95,-2.12 1.788,-2.259 c 0.164,-0.208 4.097,-5.142 10.443,-10.102 8.581,-6.708 17.543,-10.253 25.917,-10.253 8.374,0 17.336,3.546 25.918,10.253 6.346,4.96 10.278,9.894 10.443,10.102 l 1.788,2.259 -1.95,2.12 C 85.541,62.4125 69.872,79.2005 50,79.2005 Z M 20.944,59.2315 c 4.616,4.2 16.046,13.219 29.056,13.219 13.059,0 24.457,-9.013 29.061,-13.214 C 74.565,54.4385 63.054,43.7135 50,43.7135 c -13.049,0 -24.556,10.717 -29.056,15.518 z"
inkscape:connector-curvature="0" /><path
style="fill:#ff1a1a;fill-opacity:1"
id="path12-0"
d="m 44.305,31.1515 5.695,-9.864 5.695,9.864 c 3.002,0.427 6.045,1.185 9.102,2.265 L 50,7.7875 35.203,33.4165 c 3.057,-1.08 6.1,-1.838 9.102,-2.265 z"
inkscape:connector-curvature="0" /><path
style="fill:#d60909;fill-opacity:1"
id="path14-2"
d="m 81.252,75.0695 6.057,10.143 -74.618,0 6.057,-10.143 c -2.029,-1.279 -3.894,-2.629 -5.578,-3.887 L 1,92.2125 l 98,0 -12.17,-21.03 c -1.684,1.258 -3.55,2.608 -5.578,3.887 z"
inkscape:connector-curvature="0" /><g
id="g4251"
transform="matrix(0.40217174,0,0,0.33990109,23.349925,31.474176)"><path
transform="translate(-4.662453,2.913844)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
sodipodi:nodetypes="cccc"
id="path9383"
d="m 65.30539,72.630083 c 4.749401,5.183562 7.771748,14.470776 14.464087,14.470777 6.476457,-1.799849 7.339985,-17.206546 8.203512,-20.518265 -7.339984,5.039573 -14.89585,7.919329 -22.667599,6.047488 z"
inkscape:connector-curvature="0" /><ellipse
transform="matrix(0.440859,0,0,0.441062,-1.414299,19.12195)"
style="fill:#eaab78;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:8.50416374;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
id="path3713"
cx="150.27701"
cy="70.290855"
rx="60.94183"
ry="57.825485" /><path
transform="translate(-4.662453,2.913844)"
style="fill:#9b241d;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
sodipodi:nodetypes="ccssssc"
id="path4369"
d="m 36.307019,99.436753 c -0.390641,25.196257 64.238761,28.077617 64.082461,0 C 101.93426,77.108006 90.829033,64.412306 88.069362,66.570776 86.668121,67.666753 86.147486,92.006539 76.679554,86.407897 72.076674,83.686098 66.928216,73.231034 64.675609,72.884169 61.276534,72.360765 54.767786,69.608667 48.790072,64.457958 47.221779,63.106638 36.836468,76.996947 36.307019,99.436753 Z"
inkscape:connector-curvature="0" /><path
transform="translate(-4.662453,2.913844)"
style="fill:#869dac;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
sodipodi:nodetypes="ccscc"
id="path14564"
d="M 66.749528,4.2474209 C 51.981963,4.0750252 35.839292,11.936424 38.928827,36.22033 c 2.09949,18.454714 9.812752,6.130737 17.085108,9.658166 C 72.624134,53.935212 131.21643,26.807818 88.77648,20.952835 85.831867,7.9559566 74.810052,4.4372446 66.749528,4.2474209 Z"
inkscape:connector-curvature="0" /><path
style="fill:url(#linearGradient2925);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8.50416374;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
id="path2922"
d="m 90.25589,41.268958 c -11.40474,6.548501 -30.28503,11.389026 -38.625,7.34375 -4.82895,-2.34226 -9.83615,2.141068 -13.28125,0.125 -0.01995,0.402906 -0.125,0.779936 -0.125,1.1875 0,14.078553 12.04455,25.5 26.875,25.5 14.83044,0 26.875,-11.421448 26.875,-25.5 0,-3.059799 -0.67655,-5.937105 -1.71875,-8.65625 z"
inkscape:connector-curvature="0" /><path
style="fill:url(#radialGradient2927);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
id="path2926"
d="m 56.15625,10.53125 c -12.311799,0.816029 -22.242394,12.100815 -20.850731,24.466428 0.586462,4.265559 -0.66969,14.025653 5.667984,13.367397 8.40309,-3.283363 16.682558,3.355885 25.265923,0.198233 C 76.873633,46.010371 88.86705,42.898848 96.0625,34.09375 96.605107,27.945782 87.288208,28.19537 82.96875,26.90625 79.515465,22.808239 78.845113,16.133172 73.25,13.5 68.153163,10.424577 61.951546,9.937162 56.15625,10.53125 Z"
inkscape:connector-curvature="0" /><path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.34654903;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
sodipodi:nodetypes="cc"
id="path2932"
d="M 38.670267,111.66648 C 37.622794,96.777362 42.86016,84.015252 48.726011,75.203312"
inkscape:connector-curvature="0" /><path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.31650162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
sodipodi:nodetypes="cc"
id="path2933"
d="M 45.97524,115.468 C 44.955763,100.44349 50.05315,87.565331 55.762224,78.673271"
inkscape:connector-curvature="0" /><path
style="fill:url(#radialGradient2929);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
id="path2928"
d="m 43.375001,71.55999 c -7.036292,10.259813 -10.119508,23.396957 -8.875,35.6875 6.181171,12.7383 22.664647,14.64693 35.343752,14 10.96752,-0.56345 25.47425,-6.70599 24.19543,-19.84373 0.25907,-9.976161 -1.42155,-21.211055 -8.82043,-28.50002 -2.22841,6.872909 -1.34354,17.976193 -9.875,20.3125 C 65.411497,92.41493 64.375227,78.351052 54.627427,77.154269 50.683656,76.449679 46.366645,70.930639 43.375001,71.55999 Z"
inkscape:connector-curvature="0" /></g></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 411 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 240 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 446 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 306 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 399 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 465 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 384 KiB

BIN
stuff/Store/store-icon.psd Normal file

Binary file not shown.

View File

@ -1,9 +1,9 @@
<ion-view view-title="Pokedex Helper">
<ion-view view-title="Co-Trainer GO">
<ion-content class="padding smallfont">
<h2>Pokemon Bilder Download</h2>
<p>
Pokedex Helper wird aus rechtlichen Gründen ohne Pokemon &#0153; Bilder angeboten. Wenn du möchtest kann Pokedex Helper aber versuchen diese für dich von den offiziellen Pokemon &#0153; Webseiten herunterzuladen. Da diese Bilder urheberrechtlich geschützt sind, lies dir bitte vorher die entsprechenden <a href="http://www.pokemon.com/de/nutzungsbedingungen/" target="_blank">Nutzungsbedingungen</a> von © 2016 Pokémon/Nintendo aufmerksam durch. Nur wenn du mit diesen einverstanden bist, darfst du die Bilder downloaden.
Co-Trainer GO wird aus rechtlichen Gründen ohne Bilder angeboten. Wenn du möchtest kann Co-Trainer GO aber versuchen diese für dich von den offiziellen Webseiten herunterzuladen. Da diese Bilder urheberrechtlich geschützt sind, lies dir bitte vorher die entsprechenden <a href="http://www.pokemon.com/de/nutzungsbedingungen/" target="_blank">Nutzungsbedingungen</a> von © 2016 Pokémon/Nintendo aufmerksam durch. Nur wenn du mit diesen einverstanden bist, darfst du die Bilder downloaden.
</p>
<p>
Wichtiger Tipp: <br><b>Bitte bedenke, dass der Download der Bilder einiges an Internet-Traffic verursacht. Um deinen mobilen Datentarif zu schonen solltest du den Download am besten per Wlan durchführen.</b>

View File

@ -5,7 +5,7 @@
<!--State name : app.pokemonlist-->
<!--URL : #app/pokemonlist-->
<ion-view view-title="Pokedex Helper">
<ion-view view-title="Co-Trainer GO">
<!--right button on navigation bar-->
<ion-nav-buttons side="right">
<md-button ng-disabled="isLoading" class="md-icon-button ion-nav-button-right" ng-click="navigateTo('app.pokemonsetting')"

View File

@ -5,7 +5,7 @@
<!--State name : app.contractsetting-->
<!--URL : #app/contractsetting-->
<ion-view title="PokedexHelper - Einstellungen">
<ion-view title="Co-Trainer GO - Einstellungen">
<!--left button on navigation bar-->
<ion-nav-buttons side="left">
<a ng-click="$ionicGoBack()" class="button back-button buttons button-clear header-item nav-back-btn">