From cdb2cc92c1de79f5b3dab9f366c094cc1a3c8b08 Mon Sep 17 00:00:00 2001 From: praticamentetilde Date: Tue, 25 Dec 2018 21:24:18 +0100 Subject: [PATCH] Dangling edits --- .gitignore | 3 ++ config.xml | 17 +++----- package-lock.json | 40 +++++++++--------- package.json | 5 +-- resources/android/icon/drawable-hdpi-icon.png | Bin 2875 -> 0 bytes resources/android/icon/drawable-ldpi-icon.png | Bin 1155 -> 0 bytes resources/android/icon/drawable-mdpi-icon.png | Bin 1802 -> 0 bytes .../android/icon/drawable-xhdpi-icon.png | Bin 4317 -> 0 bytes .../android/icon/drawable-xxhdpi-icon.png | Bin 7793 -> 0 bytes .../android/icon/drawable-xxxhdpi-icon.png | Bin 11783 -> 0 bytes .../android/icon/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2267 bytes .../android/icon/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1411 bytes .../android/icon/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 2654 bytes .../icon/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 4614 bytes .../icon/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 5907 bytes src/app/app.html | 2 +- src/components/subject/subject.ts | 2 +- src/pages/config/config.html | 25 +++++++---- src/pages/config/config.scss | 4 +- src/pages/home/home.html | 2 +- src/pages/home/home.ts | 19 ++++++--- src/theme/variables.scss | 10 ++--- 22 files changed, 73 insertions(+), 56 deletions(-) delete mode 100644 resources/android/icon/drawable-hdpi-icon.png delete mode 100644 resources/android/icon/drawable-ldpi-icon.png delete mode 100644 resources/android/icon/drawable-mdpi-icon.png delete mode 100644 resources/android/icon/drawable-xhdpi-icon.png delete mode 100644 resources/android/icon/drawable-xxhdpi-icon.png delete mode 100644 resources/android/icon/drawable-xxxhdpi-icon.png create mode 100644 resources/android/icon/mipmap-hdpi/ic_launcher.png create mode 100644 resources/android/icon/mipmap-mdpi/ic_launcher.png create mode 100644 resources/android/icon/mipmap-xhdpi/ic_launcher.png create mode 100644 resources/android/icon/mipmap-xxhdpi/ic_launcher.png create mode 100644 resources/android/icon/mipmap-xxxhdpi/ic_launcher.png diff --git a/.gitignore b/.gitignore index faf0575..c621545 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,9 @@ plugins/ios.json www/ $RECYCLE.BIN/ +**/*.keystore +**/*.apk + .DS_Store Thumbs.db UserInterfaceState.xcuserstate diff --git a/config.xml b/config.xml index eda9af9..c254c87 100644 --- a/config.xml +++ b/config.xml @@ -21,19 +21,16 @@ - - - - - - - + + + + + - @@ -82,6 +79,6 @@ - - + + diff --git a/package-lock.json b/package-lock.json index bd1efad..8610e1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -912,11 +912,12 @@ "dev": true }, "cordova-android": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-6.2.3.tgz", - "integrity": "sha1-JJ8hts5fHxyEenq4OxaQnb7Vqig=", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-6.4.0.tgz", + "integrity": "sha1-VK6NpXKKjX5e/MYXLT3MoXvH/n0=", "requires": { - "cordova-common": "2.0.2", + "android-versions": "1.2.1", + "cordova-common": "2.1.0", "elementtree": "0.1.6", "nopt": "3.0.6", "properties-parser": "0.2.3", @@ -928,12 +929,16 @@ "version": "1.1.0", "bundled": true }, + "android-versions": { + "version": "1.2.1", + "bundled": true + }, "ansi": { "version": "0.3.1", "bundled": true }, "balanced-match": { - "version": "0.4.2", + "version": "1.0.0", "bundled": true }, "base64-js": { @@ -941,21 +946,21 @@ "bundled": true }, "big-integer": { - "version": "1.6.22", + "version": "1.6.25", "bundled": true }, "bplist-parser": { "version": "0.1.1", "bundled": true, "requires": { - "big-integer": "1.6.22" + "big-integer": "1.6.25" } }, "brace-expansion": { - "version": "1.1.7", + "version": "1.1.8", "bundled": true, "requires": { - "balanced-match": "0.4.2", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -964,7 +969,7 @@ "bundled": true }, "cordova-common": { - "version": "2.0.2", + "version": "2.1.0", "bundled": true, "requires": { "ansi": "0.3.1", @@ -972,11 +977,11 @@ "cordova-registry-mapper": "1.1.15", "elementtree": "0.1.6", "glob": "5.0.15", - "minimatch": "3.0.3", + "minimatch": "3.0.4", "osenv": "0.1.4", "plist": "1.2.0", "q": "1.5.0", - "semver": "5.3.0", + "semver": "5.4.1", "shelljs": "0.5.3", "underscore": "1.8.3", "unorm": "1.4.1" @@ -999,7 +1004,7 @@ "requires": { "inflight": "1.0.6", "inherits": "2.0.3", - "minimatch": "3.0.3", + "minimatch": "3.0.4", "once": "1.4.0", "path-is-absolute": "1.0.1" } @@ -1021,10 +1026,10 @@ "bundled": true }, "minimatch": { - "version": "3.0.3", + "version": "3.0.4", "bundled": true, "requires": { - "brace-expansion": "1.1.7" + "brace-expansion": "1.1.8" } }, "nopt": { @@ -1084,7 +1089,7 @@ "bundled": true }, "semver": { - "version": "5.3.0", + "version": "5.4.1", "bundled": true }, "shelljs": { @@ -1120,9 +1125,6 @@ } } }, - "cordova-plugin-argo-api": { - "version": "git+https://git.maggioni.xyz/praticamentetilde/cordova-plugin-argo-api#c17330f5040b4166021a891e500a626a26566b51" - }, "cordova-plugin-device": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-1.1.7.tgz", diff --git a/package.json b/package.json index c95ed86..a9d664b 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,7 @@ "@ionic-native/splash-screen": "4.4.0", "@ionic-native/status-bar": "4.4.0", "@ionic/storage": "^2.1.3", - "cordova-android": "^6.2.3", - "cordova-plugin-argo-api": "git+https://git.maggioni.xyz/praticamentetilde/cordova-plugin-argo-api", + "cordova-android": "6.4.0", "cordova-plugin-device": "^1.1.7", "cordova-plugin-ionic-webview": "^1.1.16", "cordova-plugin-splashscreen": "^4.1.0", @@ -59,4 +58,4 @@ "android" ] } -} \ No newline at end of file +} diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png deleted file mode 100644 index b9100934dac7ce92fd44c4c90aa50b1469d67c04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2875 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 diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png deleted file mode 100644 index 16cd5dba33faeda3f256eaba98fab310ba722778..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1155 zcmV-}1bq96P)+IR_U)hrQpZkgDu!*Y1Zm{gYI7jmFJso)@ zrJhpSIcJQCT^2&nO&3ng=8}n@yMP6}E;Gi0N2tfYeOclG^^c7fYhA5WjIel$wtlbT zqOcSks?rVs7~oD4r4$m*`<}Iy%6h#qjahSVIu-A=Qq^p2K91GdP`$s_A8-A|jiumF zrI9WGzyQlA87_o4kRyRmk1&zfSl2vE)}cQ%zkUw$B3jomjl@P50APS=316)O+=NI~ z#JovLb*=an#ZrZzfA^pMa=XerTpl`E0!nzikiY;lq}0JWhQ~|@d0R}Js#cIpH{tEj zZL5e+$Sq#hhSGWhV7Nscf4p?BFWs9fcQIBHXQ!AjhS5~LA30%nUa}GE7Rv^VXmR@2 z{`1oBOO0Nsq^nCz7U>Knr%_Gv-yz16;d~goUq&^0gvg3^L?(>8I=me)gq9|iL$WkK zF+USlRW$`CvtYo|YKO8`AI6@=LyU!Qx;n+qMt-#qIgymsB9J68W7DHLXDK+=c^c`E zEO5>@Ly%0i+y@9BiOJ4o-foxS;>MvuXbiwW5J6d1vSD*N6qTdk$w|`WArG{WA0kV2 z-yiB$SO!Z;!NM?I1aY_ZlZ7H6#3(pa(W47Me^^66aI97rOawL*ia9mDY8SEcIv8iAwk1Z)q;*k!`I-!xu zcv_67JMn3x3ji>{-Zujw5FQAjg&YZlo-J13NI6ApDPrF_jp3vlA1fGxc4Q`sR@Omxt6xk5Fbg^|vYY>sIQ!?$kfBsd<33sR!TQ)P-#7>FJwV zj;q_Rjw^!0(s9L^bmX|w-NzNQ`M5giAXXd1>u>m1(*zk1S$w$>V*fe z3}HAVP*FYdDtA3mXU}?-11uyAha~AfB^JKCqz<0*lFASUG8`W&2u1A0UcXfkB(xBA zh@JFd;ZORoh);Z2!ZC~hPkdbsDfuBEf?f>wZ`!BPG Vw>q6-My3D&002ovPDHLkV1m}399{qb diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png deleted file mode 100644 index 64a6cbc52de2a6cad2d8a0f23c19ede85d62b7a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1802 zcmV+l2le=gP)JE*h*^4PMX*bY*~&inY1Kw$-T_7A30)8&}?j= zT?~lb*)wyFW^Wp0c^+eQb@SC%oAcf}*Y(6$NvvX3mDXc)7~(Tqh@iP7*qJV@9s8yOy#CnXC{h=rHU>u z+(lxKFT?wbI6iS09fmlW0sss!A-QID0}VQ+j4=qH&tSwS1j&s_lGHa1Z?Ay?pTh1_UzVSd_Rlp@}4CF01Pl81h#qlO(a69%c7o*AYByHa1rPrh1&K6IXw#sGBxNQHIu3QH1?M( zraUP14;>TVb1IAw0tqL{;kg8%a&j_{K_bfpou1!rh5Bbfg-es~x+z zLD~qh?bNFe;oFyP`-o!uM{f*Nz4JRPh!&&RvUvQC4XdTnv!=6L;4_D@5yG-#qutlj;Bl>Ws*I5-C_^~Dq8y@J@1 z*jEH;Kh5O3S2>!f(>Ghrh3Y{S`twwN`w&!|?s1XW+j_JhQr{FsNn2+bMyDQH8$uo4 zJ1!xx4NRH~b=o@<_7lhDUj^CrElcyrafqGs*&a^9Hk;aqz_kuH9@WaW#TszLiK^z_ z54x#uFBHyHr#%{b=o-;O$6hl&+m~t5xiDHya1f)de}4{Li~!2^#^Xx}TDun*4I=3D z_uN*9OjMZXCb;74Iy~L8hLX80M07kaKvU$Z9OrIw%it9bG3_+9nYQAU}u6|jcye)p%E}rk# z?-xdgAx@?MG)eq?z90}ajCwgCf(}xs5uo?=X2~SD#mYZz3K-+y{bt!V&9?;d$8r2| zC;W90m!>kdy2%_yhapa;0009FanS_c&8b9?LM@@QhZ?_ob7c3Yaqwk8J6l+PCGekj z@~ugLp66+?ii>r1kvNPFL!3;#n0R1-2_caE-f*W?;C8UdELki z?DwMx*>YW6E#-P0u_UW5Q-{%MJQY*i#aj~(m=NolQ)Y&D(+<(i4=dBTlB!1Pm}C1QK1>ID|n8sPm!~qzlP5+?v?I^=i($ zR@*-w7i8Uf9)6?8Zg9d_(9pdhFbun|-?7u5K3{ij&3 zMCWde)#8z|uEucnaoKRZIZ#@XFYWi!G(DQ8T_*+%Fd+mIPLetm8GR>z!wxk9=pg2Q z5QKd?`@1>wX=xaY!T9(8Jc1r~^{59u?IsLSaHr9iw_EU+r3nD1YOC3in*YuFgMK1Uj3n`n#~=r|0aW24Z4OYMFkbkN7amd)$& zaeILdjO3vs1+HZPuE1FeT#Ydv&)`~X9$fSEqfVk9O-DaUNz;!MK{E;g&w_2$nk8sv z1AfMfxJVMTJcVsxqL}8}<|%9`D)jK8naWVuB*~Yi$Jn`*gkWVlSg5N=O!DI~Nbce> zNPG<9M#rF{{6=Ij2JxsrOg9F#KgS>u4@iPBC_5+y8U=rLBA~%=P~jvehOX-B#uBB33L?(9OFhX zh^~V1e$})Y!3r&5b-@Z#7&PI*3MC9ENIm{vL(;>Pe;(^9vFJ%OR}eih;sygSwyaFyXQWMT?wNODEVw$;H*j-i&yP2y6l8FFp s0c6XUQvQ1RLIhkQ@{iV2q%XmI13E<~2UyF)asU7T07*qoM6N<$g3Y%^s{jB1 diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png deleted file mode 100644 index 1605f695fa85116686adfcc5bb760879c6b40dd8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4317 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 LNkvXXu0mjfw_ymi diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png deleted file mode 100644 index 56fb29e64e62d8afc5488de5f4ab6119becc6901..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7793 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 diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png deleted file mode 100644 index e4a915254b11c257a9803d2e543b9f8358911e1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11783 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 literal 0 HcmV?d00001 diff --git a/resources/android/icon/mipmap-mdpi/ic_launcher.png b/resources/android/icon/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..039186c3b60f0579bb1791b8438b0b4970ecddf4 GIT binary patch literal 1411 zcmV-}1$_F6P)v1Q(J{R=+E}$StS%Cb~3)o%KiQOfg$P>u51nEGo#rde9 z%z1kIcH8f*bs*Q$ft=z1*?WUHk+mm4ra3@{xjld>fX)~|TjYSY$bobL zjlls;;dy8Z&m&DBbI;dJ6!?q8eQn4u>-5JK;EX#!V~`Kf6t+Diq7CuNClS%+mF#}3 z0kXR<6R=C)1|r%_alRj(Bcc?se4+sn$45CJMR18LAeHs*#~QFp-xdr=O(;MruXaG1 z8UgXhvzUJ-0g>g^86Q;wg7S&%{z~V6X91&tSmdRoM^s@6U{eaeY-2J-DeUI zX>626=cD68@OnA$JP)4d;q!6$`1sI&7oa3xQgsOj-uo5@-d(2p0}p0qec*W>L-i34%B#Cz6R;lYg1OSID9ouwU?V`j#Of_v{b>EQs6sr? zV`|!qsVKW2q^52#JRqM@fcT_YNx({|sT)uyK<=2VjS|3dJO;0i!G7un8cyB7!0<2N zxYz>3^2`Fn|Dd7;a2$^_Ew{ps%;qn?Q;gs^4mEWHA+ygcKq{YMZbxnXpkl!7k^5ot z!88BXor%~21o<8Lt?UApJ{m*`XzjQwE3Yv)(BcR`dO3~*$8q@Z*g%LpvjDMp@Uu;A zopM0OrSE0sH3kP9t`S*zxquz{t!x7F%6gGk){9&b_U2J2U2~5YU_Lm2Y)cQaL>Mdk z@#oxv;(hj}QRvJb=*%8y&D~2R9FQxK&n@kRy-7I$0Dc~Sgp#+eEy-J|1~EGJFycM- z#_)i26U%_oWugTDz{1~)82RZBjEw${g@vb4Umpw*%d-h64VBL+>4m*9dcaCAd*f)x z=r9e)DG5a>V1E87`mXzM?9`92y)z8GwGVphRag%X;ggd;;OdYUf6f0RdvAj%ASlly zKq{YY=|O`eU~%yo+AmGQP|=U9;+`ck_j;Dd5YXGMqRn+5PZyub28iXE1!P-#LXZZW zZ5a_pAD?|Sh8E{UM80en^J^H*En_IO^~uUJ z36RdV+>A$>b-B+sO0ud4M3t727mKe{o=Je5bS&bD?7C_JveHq+6Om^U5UVt6adiS@ zq}38<7N9kE$0W^KJl)idbmNtTz9UN_qLg&wH-05y)x-tT443^vKwRHaCK1u5H?lu( zT}^2*uV|6zQ6gd5_YEQN$C#P;DqIL1g z69r~(JrQjoqL+zi8xg&tGTVf;wg_t{{G*Q~B6>l1*hV6HQDrs?Ypsn%{$Iwnb|DZ8 Rg(d(1002ovPDHLkV1nrmqoe=; literal 0 HcmV?d00001 diff --git a/resources/android/icon/mipmap-xhdpi/ic_launcher.png b/resources/android/icon/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..45a2582a629487007a88d91c0760a9c485fe1eaa GIT binary patch literal 2654 zcmV-k3ZeChP) zdr(x@9mjtltJc_(38b}+w#nGqIMeAQ(Wp%nPy~D;Eb>TbjAB4zS~JG@=%{G}(LqPk zv1zKU(}qMLi-^2r*9?zXrGX$smxsm#b`jjIsdc7md?m2I{&Dv%yLa#7+}*o-&s{w; z-@lmI-SheU?(dv?E;AS4{(Z~%w^0385~1b|ThFgips$~h+; z0E}?Xm6{O-01;EBq(|nxR=IZBD>W_ItE+Bgudc@Dxmi_>&#kI*B`eP}nYr9lx{~n{ zCo6}O&X=6wEL}02v=tSYwtP5xPEudw<|vb8NIJB&K^NVX1oz9+{iwnRxwh=IB54OsZ#Qrwk`< zNr^{dIf+T;WO1=8vlbWQ?9>v}FE2OGPbruP%oU;9)er^%y2l@nkIKreJU2h9%mcn$ z0iN*11-Qcxr~o(ktN=F2zb-rT;G<7G2u#~m20kbGYCcj|lQeFUg`;ijh4qr-uSo`4$n7QZ>#;3mD3;>b9w4$J1 z1>wN#4x$%6Uv`rVUsVAj)vvUGxFyB^1Au5Ji=eIrBLLt502mkO_M_wi%oQMK0p=4h zbI~CLfN=mY27=s%MgYKA0C+_C>ZhdtlM8sn$s(u%A^_mK05D!I{9yKfrMI900>(R8 zM5rNPf*AZjw;v@JV7WUWO$eZ=`juXQ-2_aaLI7>mAB_G_jR0TZ-xr{e0226WSAU=u zU@8TWz*k#gNwI59g;Db-r_qA31R0<%49}3ma74Ymr3I*_i zR|>w`0=U&rod6}_`%?YEZa-8BAcrsA_r>7rmzU%Iq89AvvS6>JAA2qR*wJOdzrFt{ z>X(<_djf>OlfswNdN%%{4tsk0(Qdc%#$p-3&G~gi@Revk)C%AS?_cX#v(bnb`!5N? zXVc$*34gQ66qM?xQh?I%?+VW|PLS6AVd z?G5<*osGjO^v)ZFjrf7#v=?M+-vHK_Iwt)}R2n z@T-hwzd+gTcI-N5_1bo}pXu@Yb8C)wVB8XN_>>CZZ#fA|4Y)bK-fu{DyB$Bj(C4-1 zH+NbT`Rq+^)@fM)KX`V5H5~m+5lA+h4d2}Lu?zmz9SwNNW>e&|ODjGjhEI_I;i`Av z;T*5;QUns4wlh80+Ww`YpILvRn_R#GDg=xbQV4fNy`Vbpd?v zsS_Xsp1r|3t`PyG)lZE8G4Sqpw@M1I_6=ZD^95{bzQB7UrlbHN_*4iW0k4z*o6U}m zC(q$48%;Pn#q+G^Sbz|Ce+AfVc06>rO%gtv_exrQl3=shJOoHpKQ#iRz_Slie7z6oK5xZ%JsEuV zq|@BlD;vI~01o_T793Px04aQb1QhN)DGPo~atRjfIpLQ8lIo{gfY9K6L`bpu7JEgRcT|UagV$bSt?8 zvsYL7B%tnNX#p&JDg=;#XXC4Y-{sc}!WR;-e%nW~;qwX*flq~idCwh3z9jLa&3pxY z8O`lqVM2z9H*@)tZo-o-mwoy!bN5x8on~aB_fDL?)+5vj-~;ckfFXwiw-mNXgLlH; zSkQ_?Lk`6SaN$!UKn%JP0uT{zeEkjPu0JISKWE)3ymtMr&)?$`Kv4a$sT2qxf}h32 z9|4GnckT}2-UD5N@OSU)z?-+e_3Jy#-B*d>(=8y&JN^nlM07Y1ul)Bm9yw;k-TOLm z_r4B1Ty4S2|G9+@-@1;Z0KV2kuK*tKN(u<{;0h3fPmcf*=xh=*k7L_e?F(>+Plo^k z@NBduK&tww72pnC2?0Yx4z%`P$4XNl7QSP~yw{sBGp`ZTa_TWHryeu%8ZmeMDcrI5 zELIr%&~ouQ4*IhVC4^6%03qHVGLfJWVLzZ1+`MyR{h;GEJi3h2YO|OMJQ!*KGb5ws#PIcbB&SA^4gQ z;C}ZiCE(88LEQOgv)BHf6g(F`8}`n&;E!kU)@||o1g-!v_|yszI=2xMFf`=A4f(B- z;7O{U4?de$w>9J7pz!*jSph=ONd;7z`T`E0jiIuaNPrZ4Dg=;#ClQeU_8HmWWy5!F zFE_t+T2cTBd`$>&@8@CyR&8hs3jEo6BfhxypP~Xt;ZrL>=(JL<07by_oNR`q0Kp?- z9|Q=2R|0;>2_ON_rltKW!HGA0dKrxk1EQ&|_a*&aIq}KA1%F4o`AUchaBC^0RTjaC z(=y7cEg>L4U@={}?i7AIIHWdX!7(`Kz?H9^(x?EDEu?#Pz1!jQ^V&d;A%_F^?C+EX zpAG?p;N2J3O$Dv^rR5slzB7n-zZp_Bx9<#MkM$aEDrl7rUlRhvb~K5ZCQQmSVWLD5 zG9~Uc1i#k7w}XI5Q9##rIg%Sifl23&hq8l-D*w%DR2_#MDPW`2OB;W0)h&j zGWgUBPz<_{-~$bxIsv4>LjgQB0s;bE0z577H6(A_dCx$xVQ~kj^e)K}z`Q|p+>20d6_X&?3JK+~I=DpW*Pe6Cew8X!EK5}H#WKijS!ePL?MLH4y zCVc-#u?f=>4)n&PRE0G3*wk8_wWJE4p8MA?qJHqq9AI`ps=QGfV7LuM1HfatF;P$d z{Hb-jrp|e{bNalZTfdrr5NCu?rY9BMd}_|0%#)s6yF;goo&o@mIp?m*JLLg}uYv~v z;9&rG6aXdzz!Ly46#%9Iz;pnZq47+2&Sk1|Zj+sJeb_no2vDK=*%1zmgfRf{5CHrT z0Db}h69M37&P>vH*m+C@fFC>O_>gnXItX&_=Nn^PeyAZYBzA;%&rlWzxw0k`8z+H{!Zq}8Gka~obe|k>}C1_Bc?CN zYLaOSvM}wPmYMoa7N)+nKMH}x#JhYl_bvi26M;9&@yis61g*`WrhT`%;3=pobk31uTeG)p1XSPu;R@MAR0@1xQ%+(HY2sHDu7`%mdX%tD)86M4*NP0V8M;o)QcCm<+#YqiqVM<^g6?aR{u4ICK{pWuX= zK>>gFC!)^OxUlw!(NKMes7qMPrVYa)Qe~??p1A%I3P{ZQr#Ya3BjYhF^vl&m^e8c{ z%wwuhD`FOJor$P>P;^R>rvMUEeLMh=UvS(>BI-^=4^!iU+U-XxVs0ZJA)+TnMkU{| zhsPCwoZY@$1!&0V_!~s@gymYaCl3MCnk?;$h<@#Ec$92kLIEkU{;>u$C@>yG^fVE5 zB@bFmw;`tIb|s=7Vp^A{wl8;BKwASEI5HkY)Psl~qsCi$w+6&6pgR#!HzMlky6U4~ z`%(~)koLtBP*2OX=tLd}sFz%LT+zOi1SIDUv;#oBh*?N?CJzDBmKZ?YNk%|QZXRj~ zklWvhH3!t&HESQ&0CI=*4+o&$q$WUO@TjeQIcxo61?b;M4S?jvHtY= zTgt9`0>YEA=8JBwcxMWsH_xTdARc4@*L^aM+Zbi zJOD|>;}?>Iu`_mH`RY7uOgfJEl>C-Sww+CuoGK`>38JFHgq+;-_;^homVder8Q*+| zvhqrs|NiW`Qfx}fZ%ACyahuuLEMF%a!$)iK5H)?f?Cnc6fcUj5$9RIGx8So4hh?c6 z_SQCO=>_l&Y1}aMF(e``={PDX`DwhDQ~Ex@hx} z#m=nn6#x5`l_q3npMj4dQF8TBIUvVXhg~rL?UP)^FC3fWCyQ)8uK0HEIj6mjRqOI} zKx7jTe>}s&laagsg3~TsNl7_^W71mS2^^b>a~DdT_BxK{7r`$iNe3hak8f}iBByP~ z>F<-YmaC0yq!3E z-g%#VHpM07NZEc0327&AUc{pgsVOQh!|X*_lJLAaTor)C<6!}va{(Y%r>M9La~4Yg zG+bkVZ0#!RfP~+=YX*>`M-n<9`+ywbQ8gewcyvHIAWlGh@%R{$Flnx97SXN_3rI@) zQVk%!V7Q*9y8@8OWWtrQ3Y1(fN6F=KlwPTD>MeXDpiD`4Q~^i|9%lkFnW|8DsSKIf zXR!AF4&lA!Ihg+!BjznNV(ACFvF7uGNY5(3xeKLE!BkXShS@d%@x`M#KwRf{oB_yW zs>0!8g_yZ86QjnaVu+0sh9jaj&vi&_!{%eSTw0+Rq)SBt0de3_H6Vuv-kkubtgI4WZajj3uw+4ayhkU%CpZx+ z{*i~vmn#&2ZPEde9YB2XC<(}9s=~el7ce{`#bNcabv)HCGzl5sd?#xaGMP*^0SRqi zssbbgjrG~(7=-{`Dk_7&h|0rtzFDq)Di#kHATf9b4BzDWfP}(n{*6&30GUiCe6n`G zLp*!|E&C`(mIL~>0Exk)SwPLdtF8o~a~DbxIc>Wvc)Ug>AaGnN@=q1J6`%pbH)#iu z&0oh*2+;n+7ZDV_MHC#aujcrNB_mzpaaU_Rya74Dqk2I0;3x?wd(SzHj7pL1JMF$9 zNl4goLN+|sfTUC(RRiLKM=3x%G7D_px{LWn>05?GtdBn`8y;SO9ISm*2Z%42=0EVH z1fZpQh|b#5TBASKcGc60P)153P7UZSp7O!%p3*QK!;kcfyCmGvIeq+ zhXoYN1xNrMZ31fcQ*ufGI(xnp;ZwHBQhmHeB_J>=1^FlV|GtnTJYoQG;ZX&kfJh@8 z#otb1mmI=R*J~i>Fq_R-w(dHn z1{-#9hSUtm9vmeB0l*JGR>Lr9w>UUfct(uN#+8cOvcEnZkOM$`@F)q$Y&PTg=^qgg zX%vpf0?02c3pod>P;ZvE`T!h&MBq^sAiiLn1qc9YYwNKgu@C_fM!}WGFDwfmuPs1z zO`RgItqCBJc)Z7`0FYQX{*gxbM;I|{$szox5FoP|_~mvjHl-FJc=B%Ect%h77GK0& zz)wHlg960|06##E@MsrML}O+xRt^w5YU}E8q38x;mmYEmXu_O*ICZ1)ncJMe8ko7Q|&A3}#hwradzz4oKj-M_qs<;29cj#H>X+ATg~=vw&DQI-sV2gtjit z0BR1#S%A!DGw$7gfLpikc!LEbrTVA> zkWetz@e9k61n9v7Gk(5#56L?&V{B|L=VJ*ec;2#+;3+xSkaP(@-KarbUA<^Pi~eRC z5Fb362E;zxoGB8}-Re4|?JC8T1^aD2(~?qkY~iua_}RJGm~sg>Z{3#_5MMl+1l0U! zg&08BZ`5Gkdq*&Ge6}KZ_yA&$VGNBhV&7P5{gH4fcT;j3#i<52csr@E4cC~U45+ES;6`1q5z4(qY6M`(1-<;cjT(9 zElVyq){i4n(k}}JBo>dR0kKs?2%uG;pK)tELkyXCcSXJ+KvM8%5>WHIrWpbN{nx6K zZjEP%ArtSse}p%nKkI-T19Ef@Sx!JsgJb6$vku7q;0=h^S7&4b#0QQu@aTXX54(W) zqLCAjJK@m*IUX&4BT*!r20(v4z#CBVj>~v|<;jNpm1mZHEMMMRal&pkBo*=owD7-m zK;i*eD#+Mbdj&rRP{X)!^FF37*slW;3x`cWq!H&Y-Ej5wbo!_;-GP6EQ3oUx3|Bt= z;;ihye&NoezTS+lHWy09qh3G)9x?caW?|&`Y-H`JP~_;SyA8A1jNC(27%}b}9S}7K zBoK~uLZ;*(@5ohEBQl%KC^&Z=ku&znf=3;IB%o=28y+?_2idum_~mvj>K@dizTT{g zJa|x#+jnY_clavC#pcR}N7I1p?b*zG_b}FNIFI!Sh4?z@lIUzmlsknEvp%6|zS?{d z>o%On+slqfesHP-60q^d9%g6bBQSh64jU5eILt=kF8h&qzF7w(0gITOV^KTFJa?4& ze&J7PAesau1&)qKqkvq2M(cP~0mviJs1S~30XY?o063nAM^k{Lz;PEmIw0x8At0$x zbTk?SBqthYz!8E+2PE%k`Jb)05{<%mT#Z8q5swZ?1~giQqXUuvMhqIY!O<=t7r;>~9_;{z6usJL36RWaq`=V{9yI{!HF(S}m!r`l9Pcr^;2o5~0_sj42&fwo_3|3E{f-XC zH5oK&+Z`h6MIHvI4K)JlIdDWmp|jBFc$#Lw@XeQ~DWEo%Yvk6W4H0!DqQ{8nnf`wN zh;s%S9Zt*i^ZnlhBI-%Zhq)7Z2%y$P)Pab)5K)ik`_2v@G&-$TPAEDU2MNl+z)@Rk zU+nkx1S0A|L|uvbP`4%z0`w>mJ=M8OpI2V(Ksjl{Wsot_QgrjMD(oX8vM#~ zP273`%?|53vB!uhp?!Y$%FIRm{ny|03Q9M7kIB%n$Q-Yr3=A5bZtgd9{mtLLG-Ck~ z^|8$TW7K#D=JxH2hE{d+AMWxW z-bD1GWv-vH%zY>Ffc>B5gRMgCh$)|4iFrf4iRj;n==Vg_mxx{?qW(nm1`!Rg=9b07wyt*MVbzBnT!@|^rZ4}7m>&HC5xqprn}3;zUeUuVFI(p9 zCCeQ4vCQc+mO1Wfne+DKp?KKQiW(7hBIee<8!>P4X<|0HdK2@h`HdyN)nhm8JUwff zyPlT0e9|(vk67lKtvnvpy0`{giP{pgnCnc;o9s%=8}3fbV($s7JgJ8>)^qeYF;CgM zS?2N)%iMOb%(W`;SdUi3Y^Ap)rnGh>=9AKyn0*R8!qeF@haD|*+SW41t;mDhmc8*1 wHMX_Z)Cj6AF(p?I|FHAc#%ewvA}7Q77b2q}C-1e*O8@`>07*qoM6N<$f^MRN%m4rY literal 0 HcmV?d00001 diff --git a/resources/android/icon/mipmap-xxxhdpi/ic_launcher.png b/resources/android/icon/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..946b7eeca5f918351cfa40be6833fdbea22bb9a9 GIT binary patch literal 5907 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 A6#xJL literal 0 HcmV?d00001 diff --git a/src/app/app.html b/src/app/app.html index 3315f88..be48661 100644 --- a/src/app/app.html +++ b/src/app/app.html @@ -18,7 +18,7 @@ - + Menu diff --git a/src/components/subject/subject.ts b/src/components/subject/subject.ts index ed65404..b933d22 100644 --- a/src/components/subject/subject.ts +++ b/src/components/subject/subject.ts @@ -66,7 +66,7 @@ export class SubjectComponent { } } - console.log(this); + console.debug("SubjectComponent is: " + JSON.stringify(this)); this.loaded = true; } diff --git a/src/pages/config/config.html b/src/pages/config/config.html index e99da98..2ca8e90 100644 --- a/src/pages/config/config.html +++ b/src/pages/config/config.html @@ -17,7 +17,7 @@ --> - + @@ -26,21 +26,30 @@ + + + Dati di accesso + +
+ Nome utente - Nome utente - + + Password - Password - + + Codice scuola - Codice scuola - +
+
+
- +
diff --git a/src/pages/config/config.scss b/src/pages/config/config.scss index 098604a..f2358f5 100644 --- a/src/pages/config/config.scss +++ b/src/pages/config/config.scss @@ -21,7 +21,7 @@ page-config { padding-left: 0; } - input { - text-align: right; + .card-title { + text-align: center; } } diff --git a/src/pages/home/home.html b/src/pages/home/home.html index 3e09b04..2f0c353 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -17,7 +17,7 @@ --> - + diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index 981c30b..3dbc0ab 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -19,6 +19,7 @@ import { Component } from '@angular/core'; import { NavController, AlertController, ToastController } from 'ionic-angular'; import { Storage } from '@ionic/storage'; +import { ConfigPage } from '../config/config'; export interface ArgoUser { username: string; @@ -58,9 +59,10 @@ export class HomePage { warnNoData(): void { this.toastCtrl.create({ - message: "Inserire i propri dati di accesso nella pagina \"Impostazioni\"", - duration: 3000 + message: "Inserire i propri dati di accesso.", + duration: 5000 }).present(); + this.navCtrl.setRoot(ConfigPage); } doRefresh(refresher): void { @@ -70,19 +72,23 @@ export class HomePage { private getMarks(): Promise { return new Promise((resolve, _) => { this.storage.get('user').then((user: ArgoUser) => { + console.debug("ArgoUser is: " + JSON.stringify(user)); if (user == null) { + console.debug("User in storage is null"); this.warnNoData(); resolve(); } window["cordova"].plugins.ArgoAPIPlugin.getMarks({ - username: "maggioni", - password: "huuu273j", - schoolCode: "SG26426" + username: user.username, + password: user.password, + schoolCode: user.schoolCode, }).then((marks: ArgoMarks) => { + console.debug("Got mark data: " + JSON.stringify(marks)); this.data = marks; resolve(); }).catch((err: ArgoMarks) => { + console.debug("Error in ArgoAPIPlugin call: " + JSON.stringify(err)) this.alertCtrl.create({ title: "Lettura voti fallita:", subTitle: err.message, @@ -90,7 +96,8 @@ export class HomePage { }); resolve(); }); - }).catch(_ => { + }).catch(e => { + console.debug("Error in Storage fetch: " + JSON.stringify(e)); this.warnNoData(); resolve(); }); diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 2eda2ae..233b8bd 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -52,11 +52,11 @@ $app-direction: ltr; // The "primary" color is the only required color in the map. $colors: ( - primary: #488aff, - secondary: #32db64, - danger: #f53d3d, - light: #f4f4f4, - dark: #222 + primary: #3f51b5, + secondary: #ff9800, + danger: #f53d3d, + light: #f4f4f4, + dark: #222 );