From e93ddc91d6e24a2844e196b72e7d89dc8aad333a Mon Sep 17 00:00:00 2001 From: Andrea Busi Date: Sat, 22 Aug 2020 18:39:41 +0200 Subject: [PATCH] refactor: Remove commented and dead code --- .../ic_action_settings.imageset/Contents.json | 23 ---- .../ic_action_settings @2x.png | Bin 4168 -> 0 bytes .../ic_action_settings @3x.png | Bin 6839 -> 0 bytes .../ic_action_settings.png | Bin 1906 -> 0 bytes .../ic_action_share.imageset/Contents.json | 23 ---- .../ic_action_share copia.png | Bin 2559 -> 0 bytes .../ic_action_share copia2.png | Bin 3680 -> 0 bytes .../ic_action_share.png | Bin 1446 -> 0 bytes .../DettagliMappaViewController.m | 108 +++++------------- .../Dettagli mappa/PastquakesDettagliMappa.m | 76 ++---------- .../inputView/PickerViewController.m | 5 +- .../inputView/TBDInputViewControllerData.m | 12 -- 12 files changed, 39 insertions(+), 208 deletions(-) delete mode 100644 Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_settings.imageset/Contents.json delete mode 100644 Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_settings.imageset/ic_action_settings @2x.png delete mode 100644 Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_settings.imageset/ic_action_settings @3x.png delete mode 100644 Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_settings.imageset/ic_action_settings.png delete mode 100644 Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_share.imageset/Contents.json delete mode 100644 Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_share.imageset/ic_action_share copia.png delete mode 100644 Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_share.imageset/ic_action_share copia2.png delete mode 100644 Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_share.imageset/ic_action_share.png diff --git a/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_settings.imageset/Contents.json b/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_settings.imageset/Contents.json deleted file mode 100644 index bdc30c5..0000000 --- a/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_settings.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "ic_action_settings.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "ic_action_settings @2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "ic_action_settings @3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_settings.imageset/ic_action_settings @2x.png b/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_settings.imageset/ic_action_settings @2x.png deleted file mode 100644 index 068ddc02658dab9fab783b7d41a96223093a0f78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4168 zcmZu!2UJtrwhcXiC}1EUSBx}iAv7;N6al44i-0tV5UL?DgdPwOE}~ok5sjoUd7!002Q^06NEgg)luQ5` zOY^1$4p5~n(I`9;5`ezr?V}o?A@s{bm9{=H!-OEeT<~5RLN+F5kSiD*3UXOSQASn> z&IW-%)NwAZsusHX|G;TG4Iy_t9;*t2`TP6J_$$a@aBeU;6%`ejtUOF!9!m3o`UHC8 zkpWO|AK~95|Kia_`8eY|uy_xQH{^sDc^l)4*ANmq3H0ylcb<3;*Z)NF_W4H^O(5*# z2~18#7WV(aXk!1J-+!S3kl5d#U#flwQ$L|nHN|Ahu>b4v4_F;`BKLpE|6SW(R$6i4Y&7J*4hqgz zAso6zdw&)UbhQ!gOlxU&K7)F^&2C~!+&VzkNIM;F`v;s%qPL}ejY=j)C2v)J*VBy4 zZiOL-8dvXAoJtBGv4M=Vw6qegtux{-?RQZ_GnYpUGP;c`SnceRN>@}SUiSUmRSCJC z4WBR&D!22qcJgPUW?MrJH913%Go)Y^f9)l1?2Zfc?CT^=dWg=KWY-Fkl9F)KI`XNAWs4t1#Ax%zvZ5ldQ})u|#=efo*wi}2;x<15?JX>D*ucOV zhWSzRQul2Wrq|7!KT6x^-eEC51{;G&8zo+#qov%qibF9l80_`@m7$dCL)@&mYK-sImblNb ze21N0wT)Gy9lP+3b6LwOAKDCkc0}#o^n|Vn+F$>2fZk3tg&Vx9s#4>nKWm7X9bj3q zwgeCGa2hU=7sNxH{QSOaArOMw5uObZ;h1wxov5=-cIL{#^Ui9(@URzW@E5st7hdP* z=j#^-KCMkj(@|Me#3p@~X;}$#VR}P19z&&4C7pz}AE>vP=Tzu;WlWXlbh>KB!>^|u zY`#Au1^;=pQ^VnE=vW_6&LcX7IubH#TQuvUZwRL6iLs7u`%>-Ppk{QisVPScho|abMQ=N@pW)>S{lNse} z6>#S*C*5Qu@MjFOyUE~{_$l;VQv~W!;C^>^w+em+&g`ml3}x-jD(ek%#o$cb+qAc@GXkjd#PLA!;EuPJvm zhZH_hR-K>Il1zscpNlU)T(zIb|iuHR}1@(prvagnI2-6vIbh>3|Um_Ib7H;q$6 zDI62%cgHU;4GruYsR3K)9Y8%5Yx)c zY}wTA+l_YOTiV28_0 z2!HuVqGfI_4|b73vE$GxgDrSgUQpQ;pN%X{=t_a5=ls>Wzifr%6q7WrG~`NZA7IO= zt4T3v_o`LJRINpc(HTH<# zX^z?L;v4GHevk)z-3I3TKtAs@k}di8VqBRGLL?4W6`L}|>Dt67yXYD1tgCa4u9_fZM z)sKd~OOfka^!%~NFMuq*)L^qs)OS?$NxA(vUwr%_22nlXAr_L(IvYqnP_MpKNCM%| zNkiPvtt4L-6!5OBtYqcCeKGy|aefgv5m%vHmYLZfY=pbW6B_niV^d}>5VV(7oX}0= z7SsMC;qk{VZj{5?`~fr%>+&YY%%+k_@ZR%A!@ZA*mTp zah5@NU#pk2?;{x5 z1PP%%%no^atDF?$VJu$a-T~_&pPLD$VoUD_=d#!6Z7a{|k=l`%PAP9~pm+pzPoB zv15F!xM#fPQC{1#er6N3p)L}m8OB_&C^akGE8gj4)lG!*IU&gKPjUCgCpYDGtn54X zC8DeV6G6$I*sasj7cQ`L`@5Cnm5BT9!NkI1L(1klw9}K0r!q=ObfdA+B9ztpDSlgV zbAOt^^vRA`Sy~L{E8lxUsoqtp_tM}o{hfZ9R8kou6nGr|n6=}XE_rV|Ve*^Y3%lit z7SGtgy!tM|JqeOrgATY!my+G=CGP*;Q(zo5dW){<#RmQI!g;Nvy=MbMdtwe>^iFI4 zEw|C{AYE*AJr9MLguJb`&*w||^9u)?&v`qcIBG(jm+;waEi-FdrF5NF24b?$X{`cX zqux)>O))HRluqcK=@nOVW(6>5wi|;-QMTYAY@w20*-N}P$k9_DNE@wF(Nhyr)}@R^ zFL&-XKrs?a^fiqOd)w05t0s}Ey$5`IU`B!bjoC1B$|>a%JbebnCIr#Y8g`i-&3P&# zoW$O6)lztts?zR-JR?%|wc||8k_5|;+ zjukB~x$Ua&E4~8Xe}b%>qwZbXx%On?Pu`k^JV&n#YQ2E2`O33mIU7xoD_8XiMw?$hhS`Q#C3i40o@+)nvN6#^ig?2lXIA z?O{xL)7IC0jS!=!UY~jGj|sC=P`%~9M^O6moewW^9;P%4C~CA4a@jUWT74*oW4N!` zD1O9GPk1&Hq1>A=-4Ga-o^THy^5C}qTw(lhR@*$~Cdg;$JnWONUy#s+38O>u71n#6 z26x+;qs$d+{5K|1rLm7(?*bDV-280|9H?V8^g$MIjHF^Cx?=9^?J=>Bw~3z!cTL?A z){T9H>HJ(PZNxArg$NJx&7(xt=|e71poqq0f5VUQNShu;KmIApp5|lSP}q0?wHp2 z3Vy$U>nN-10s!EH|27OjN*V3Lkj|FS=YoQQP;MS54-eP92A7McgR6-LmxBw_ zzexVWBWdnp>TK=kYK?TD|I2Ig2I=OCU}XHe(SJYxveVVt;(vB>aQU}e_YOk;u0Wqd zxS{_S?B3b`w(ozTJWL$_1^UOUe{BZ;O9fMLwl=>v_pedH&*A^j|1a797ze*+he}PUH-&^p$x)Z#MJMeCz%+T2aDQ?i;Hu}qJ4z54R#YmWzo|=5OOnud2=Ou zH`8T$b;W*V#l;^>=vBqCf<&^K_4h5r%UE#he0(R>lnrm9{WQpisWd-oOO zjF&0xz^<@7f!6qAAu2j{tAe3DGNiFTS6lKmJ3IUEaJBcOwzd|mJkZ@OIhNLMCa$R} z{qo3azR|5K)Aw|C^C9@G+A@)8Y&_2QWJ=o>!-)xi?6asIEGa3W3nM$sN_GV(=}4T8 z1aj34 z;QX`(at-LAo9bEl^y!n$}-3{({3GD^rZ~M zRL1owROYXLn;3GEd6*@8r})otPto}t1fm)CdwP5I0FDUCQxY2q(L*`&-xAc>gHsdI zi9B)~XM6Kaopvua^=Lnj9X}j#-X6}|duRX`^5z3(%s1ALZ<(_8SJ&C_bt(m%3TL%O z9!D{hrI3Lb=D#ZK+9&2Y;0+^l76h+5*4Nkf32EU1(uU4O2J!`89IxZ*mX;sMz0O)F zS@hgUr&6{#8BE}^)oJl^o06gPjeEZ(9uoUoGUEekdV0EtOYf^)K*-D?bP16gftk`M zm>cPeE%NOZ)Rd-KbRZhd{qE%Z#Pl>DkRaLnY%gzk(htud=b6^y8i?1;$xO*;x{$Vx zrPvBSZjGXuCT5+(yiMRCx$ZdhOQn*2i`U8b;Z%P7=w6;AOH$FVYIpY6$o|DZBWZm= zt?*Wu0r|Yb+NV%zJkZRHo12%hG zTSf1uN#x6fCfJk4Js@H4(N9lM^DW-)U@vEph`qpNvQFyrrgI01Eh&~`FdZn^qzr%D zKA;-aY(I&7tiQsu^{O%RSYmwco5UmyGc8z}n&`PwE_MIRf}ym}v(`W#woWE*{zF^E zb1Afum7QI)lHu^X2Sij>)xpiu11}$FzZyk|aTJ7CRVZh`F9PZzqd(26>f4G?E3Z|) z%KMs$+@7xv6=eD~(&(LLnw$&zAT-T9K+>RdS`+@Qt8VW@TeiJ0nC0SK28lnTDB4|sb2mc6c;&?S5-9K^7&R_6E0)sI72u3?DI;H*ZHr-mYO1okHj)7A zwYB0dR?qDNTxoWX>Bg?gAGj|FW zY47&+TpM_NREF|kf%zwfX7~^GlU0^B^M_cu?WP772g!JZv2lQ2ufsK-_Vc8M&fM;1 z?@^+CzwvI!C440x(!)?X+9McP%qknd!0+Um)I?YTzb@C2EQ)Pf6o0G2zDp8rl&xFE zDh(MMR@;gck2WYnS9C;a6t+ruJ0!`vMrkE=QPa0@*W?cw@sO_rd~ zblLW~&#FcEr`>|vy6Y-opqlimqg*%n+SD?zeR6EcqhMxYG#p2FMuEMOvKMZ*zq8}2 zHg2XPjMU~F!~I>#_ae4F@{@n~*^g36 z6l-s$ulbVzwAE2-I}>}EG%^u)`hrCstMTKzepv33X6T&KrUh@BsWD7U9$#vzIN6VR zFO}b&ofCntEg>DX-Tqb$Xph- z)m{2-`dieC*|=D`bl)u+ZMV-OwCy7GPOBlT`Q}m$Zvsb%zFG{Yq%)s(4dGD`Gfzn~ z3QT<#aG0s#_IW0#GJj`0F#tIA{@Ux^cetQ?^UN`*_;}EfTd6g6Q*sSq57HEV@?sC( z=dvcC`}##$#9EIRcnFHBpsXX^&wgqjHG!dMqrxF4bOZVDCAH?e(uO^cdqSHD`>@(Z z@;C0)p2S=MiV$x1j!B4|vnz*i1UO;y{?6=FEOAu~N$A~Id2%l*D6|>H^@rS4evcPno6h5&lmb| zFmAjWyHh-;4`ssA&W|`6LAl!z%Uqv%s6@}Hr?^ft^?9VIix^=i-Q`?w#FWl`^9=?L~^eyd5`kbQQU}*vM3vXvWA_s?VV&t0A&j@K_~)nlA*Mw{S0G7tJy| z1??&?O5C=g{Bhe-n*Fn7r6=+?ayk0Z=cr(#i5_x$x64w(?SkyKHh&IN55W^Wf;b23 zBOHgeVtmc9Oj#qgU!4N}%=%IS0nzbtvy7L-i4&VA6{@@&qZx>j0rviQ_V1*RP~ReF zxE0iV+10lXAu8W68(%oEyVG9+?(_M(VVAh31_JP$48pwpLpJ zQ&!u=@7dP;*b?jJz@L{zHN|A0U-dT;*&(p(HNx0k=?uFQZbZ?xuoI0x4po%%w_@Ew z1ykkx^$Y&z+@ls3XlrY1l12Z!8$@a7XTS*py%9eZAh3x0?FB&Gcf@9#wvnI zidK4hj<{gqYr0zb!k%%1VT;FM4xg<+lHyH4DO+a{Z0eVg?XdoX8oJF1KhWIcc+O8# z5tZZK>;s5m4p3#7xakA8Hd-pGMgX0%XnoMF`gC)bnx@Qhfc1D4=Q3@=flbm6jIOz= z^xy(OyLV(d_bI8Te04rWzYTve3h#dvPr_s)H$D# zNiiJ^_Qr~^qhE0#KBG)nBW=>IINJ!N{$xdMuFmoVYEb9u#iBtu|qK|$8|+>VRFaO>uz2ttvI->99g4@4g*p}G$*ipM27 z!KO@Ecwe+WvU5uKo_N}2Twvor(sj(rlpR3|lW#ffd(|@nvZt@`)L(q!?l_88&dy!=8)Q|hG(9Z(hEAPyWwTa+v4 zRSLwiyd*CgJ>lV9QU(r@m6-)0KCNFdr1v}t%J{Hp&2PR)*wU_+2b#wloTODy;kpkh zgFk7d_!2#I%amVwgmjpe3O>?^@$CCo+^eYEI>+scnEXd6LD)S`ReTdh93~H?Ckw1yw)Bu_*hGTbC0X@Ein`3L|*oZ)4MU zncAXN2bmH$t#|bU7osK$IQqkWh1o%dl(Pd-c}AaMt?r`^t`2=cMO52eXK#RBpMJO0 zymj-kpB<9);DmO6JKPY*oU(ZPo@PYfHi`w=dSUV6ZDGZTaH&IfGAR$76gO&tJJDh~&L}bJZ-oiaok7crEJ0ls(Rl2{Gl*+dlX2 zO3-RNWnA7Tfn-PZngt19H`$fBFE#DAUL|lh%z_xTQ1M3IyS3!F3kApu2Pa?WFYVWl_4 zGbY~5wImbNtaM0-!$K9EDSf=Rv+k+ZB&C0{YzgFn9=?k9*?N_-?a7$B^tl(q0Sk*A z4QDEyyQfn__uAxSk{6aBc0f2)9KBa@R{#${*x414=Adny;OyLZ)bjb4_wEIBj<0xbUM|TPs)_nG)y8N5<6Z|e3FBn5X?`-%d<3L9_>>lZY|_ASYJNL zqm4{-7?>B(vs&yl=q5Ju5MJr@2X5(g$Cj_d;@CC)Zi=ERPShVLHpK7Xj~_tHp~N z<^umH;PiVZAB(KiiKfM_o{>!_SN(d%RAM7&?w$ZKKy#&c+dj7I;;4mj;KpPUo~u<+ zYOXSMs-F3NZXA+j{iO7BDXg1r@X}~k?(VkP=Ih-xJ!dA>oXF0M?au>+@Bv)VNHkE zcri`SJCsdno@CoS_B}_0DooGB)sV*B)_REO=&Q6CCisZBO;uBEx^3!0cUzWb8i^@B z;mPHG$@11O7VJYr@wg=uAsz#LJtMKgTz+UKn-JjzLNdHw6Sd zkK-S$vmi5C`a~Uf&R!4~Y}GtoX;vi7m3!&86Sw1mI%?1P&BvfA+__*jn`v1k*=yd2 zQ6cI5j4q2r+rKv~5`Hz}{Rh+d4}rammYomUZ0ddfFB6A9!W)5gf$_(XHSa!`KN?OT zbnM9fZO%d{!q49Q>#@<3u zx}4EA$7R&vsj;zTyHtIz9p;F!nYCItLX|_*wq5S9hw8rX?d>TP##RSZFu%W1Om4s8 z%!|8{(sz~HBawFmPAcZM&gKhjIK>6sl2(4GevCZbwe53r z3V3+yUc0TqBp{`Y-<8R=>v-4c`GtH_sMQsFdU2RApP;4+^t1+CetAgIntD#ytPL37 zIw@Rjkk>a9!?)H>c4C=rMd;A9-zBRMzHv*5gvzH_CmIpe&6eO^PgK zyC^#?N>Rh1fgj2u(C-VF5ycUk!4{vvIRj&ME-bmDLA9Z|qnbZL&yH%CCK25mV4C1Y zcr>d2;;#0cngP0NcEoY9k|yk$soQHtG^Qo;jI@8B^OE2bM1)}i_-YQ0jm#@^?@|sX z>mklobHgWoN%NUY!80xFp_?}GnQ=8~TY_IrFV+k`d!G81Ho5|w!LY-qkL^3HZGM5Z z!`|cAInNPyK3LeHLb1U!UdpT9N7uiSHrS{^Ui?m(*$T*d{dA3ZnU_L!c|L%l4djc1 z$>j6mdHd=Xcj7h}+IHUlOkaHxA8iPD1zM^ z3T@SsVS2ndUaE+B#z|=r?JQtM*1M)yuU2IPta`noeWGaCCo^qSBiG@vWYdL3oQ)gY z9uD6ft3x)E_cxuUy(|^ydz*UD2)VD2}em5CzBBVI!Lh_5A96lW?*|_l;tfvnt zPz;;kIaFO<4k5yHD?kP^)zM(q1=R;zGxxW*MI^ z0qZ_3YE0_bT(#AfHU85A){Hq992Lzuc?UuO-{gmx&7`vOUy7ezzTv5%vMXVuN-Zz` z&CNPXZaI>+6+!5K{USZ&+3Ky%E)uLj`gN>jFwU0^S3UsFb!>#ljgJ>IGQxVfYsKI5 zr2#|bF-DKm)@pbIn^4utPn%w1V`xQMQWP*|qOC9{W6Kovc-(&0)r(6{bpv3&aX!9f z5PFF)ywYu&A?nSP=P+Lg_Xz#|(FyZ5sNynuBdKawg}tG{DHG>bi}a>j^l0ed+#9?E z>Tj|>NX2P?h`$=wB*uO*z13+Wo4T*gW|85_sdM5Cd~FPTk~^btsu#o-8m1SZ_-aZf zc5-a~k;kC>gQ?HovN<@i$UCDl%xp34fGgbV)0me*i!54r>p_;#{!!fbQ?_Avq~!$#QYyp#K5}UFQG* diff --git a/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_settings.imageset/ic_action_settings.png b/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_settings.imageset/ic_action_settings.png deleted file mode 100644 index e408740c0a4ddbcdd17769c9d0b466b84b5ad6a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1906 zcmZuydpMNo8~#)@k!W+S)yy}g-8M5Ahm0A*$gqjVVYN>4VK6afniDXc@`vce>j>DB(hJr%r z!4wpi#*m`{0LR73k2DG!f^%t6(JU+%53VDy^0Ok02I1=vb|fD3b@PBb(wP*v1o=`n0P2r3f&JvQoOQ^Wqr6wUf*OKuRYctM+@ zOwj+2CO7+ceg9!`A;t!2-PJ}ioI(og&ZJW0v6(T4DEJ_BVRF9+fxOR#ndY>qFV9)*%z-0YG`D z3&GxtsNP@T=kDjMb)MJSZrLC*7k}O)`!!M93iU$x8MW>YES8Et(d{)l;T2Qyq*QV%yjpSv(>{H+afD_wal6`XiuC)e z?y?|tZQC**jK8scd97`!8H2%m=o=YZ^O-hbugS{iUxw$I?13o3Z$q%ct z7K!BK*bTeqnN~Xor|$E3yq3(&Orr{=vZv2qM3`3s_q*bMn|tegKag&nOWZR%H)mBN zo3D@8X}uZ1)2?+Z8mt2Q(?ZSkVJa!Rvc`_t7dWn%$WSO$XZ_dJ3@%q3@vbRc(#TC_ zILk6`4DZ8arNg=bE`y{g`G|BwCl0G9 z%#vT-P)Dwrw?dK+L^wr~Vq;?sM%#k`sk&fqc~EVmn(xl;%~1hUh9#6ay($y$qb(D4 zydUFob(f#+-Md#;;@S7GL4RpV#~`q&r*dew>iOQJ-)l6GAQe;xVUE~GIOUo;c%7E; zlhmCWEIVoRzKr;+?XPci2WGVXp%<+09VtzU_3le57L4Eic3qI0~o)bNSLc4?Vsi@lA#A5#PEjx@~vB9ouv z4IJyt&cKB?i~25i&U6!=cJse}d87S@(YIPBw@&+?xo~OdbdlKNl!Mg@u*h1j=eJC- zsiJHCw3>lAXy+Fa=jZ5O?Q`#);R5i@Xt_I;f450$bQ!IsTAG%YmJAR& z_b-V1XHVTUGfN8Kjo8@OJVTae_ywP~mdf6o#-NuNm6eqb4=1XK8xMbLPvlr7_(aY39Wx*E4W*5Zj;n$m1@IF6yzX+NS$Ua&g_pPhbxL7oo)B8%YI(Vn} z)IBOKdT3TEj=e^co-IihP&>~{u+{}!*E{!*a4R0HTRwDhKqB!cBYFmRncaw$%(!m@&*tvBE zFVL7MoTFyfbK>KF!(YGE5vQ?R6mw+lcH+?8wd~bquy2H;KRY?xRFDWfVdWKPR{EJM P{%kHz#|bwb$jN^K%+NfD diff --git a/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_share.imageset/Contents.json b/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_share.imageset/Contents.json deleted file mode 100644 index 8ac27fb..0000000 --- a/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_share.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "ic_action_share.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "ic_action_share copia.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "ic_action_share copia2.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_share.imageset/ic_action_share copia.png b/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_share.imageset/ic_action_share copia.png deleted file mode 100644 index 407d9513904145110ad9d7cd6e5ac8956f88db39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2559 zcmZuz3pms3AODSsHV&HP7Hi5SY^0LeW-jF#8M!lKJIrMp+sSk}C|X&?aVw)x9LFJ% z=#OL_o2z)}t}izmojLV@Y8KL{J$lDxC)3;wAahe_&w|h^;_>w{LldG5!ujV}4U5 z)Q4h|7$^gzKI;EDv8dnwliq)LZJm5|`=aV=FpRJ?Xp0C6iA9faq0>WgW?Qv`+k}w< zDFh0M9ECysH{zd6Fq#|SD#sC7#b&H#h@AKN!P2DK&k-{gO-?H8-CxHyO~(q9*a zgJ>h$u>c_6ZewZY5+pXu^K$e)Dc6{xSTf<7o0lex=ocEcRO(w9>I}Re z6nrZF!!v}~tD2Aiap}aHiHb?d9ULV}fj{dAzH2^j5ul^d1HyI=4XI>j zXa8~au;aK9KRpd?Vp5dA<&KDVF66kYO9T26b9-NCjBZ!*6)jWhV zPT9wZids|rIY|Ak=r8W>-356*4GAgG#rWmre!r~?MMF@n zTxmY1sHi9(?)DMpXV+g{UA-T2HRkd_%>DC869Z+iJb!#hJ69!b+=MUTd!;kN(Ggtd z?RmtuR&owH%74b)rRU*acH?m2$+*b0A5by zRGxQ0Fg})E(JYcD6Bg;z(r82<_Kt1bsf&5;^)H3{NpTM!gsv#J=2vFq7Cw41JUpx# zhvD#1^?t9?o9twM{7xsD=r3;reQZ8>vUp>5cJQIvz;Ai`n}d_xTwGmU>vxfAO9s!j zEbi8fBDgcl84>>RAu6JcW!4HZ=+FE3ax>vW^5|w0eSOAW)x>P^8;Dywx-&%Ph!ycm@^-VB`AF{*o3ry?NuNYqZu1-|ne8S%zmq ze*!-VwT=Sq2U+g;4NBF!NXDYt=9(%(`fo_qmHk?HCTnt_JWA~I`?{4_?hfzaXpLehNX!0LkxLCT5(Gk!k=0;;A$#k3**b%-}cflPtYmt>Z%vyh(;jG zME2>17x&`qQtw(}T0GR|N2@wM^>KVhDjt34qTwT^uBU-9M+^;N6PK#Jh(uFQ0^xSS zfQCRi30#^`y)^lZR`=$*1wMiNLMuxB6(wsP_R>dNE#~S8n^7nfnh4sov#_W?0^;cE z%0vtzNQXqbnCm?S5+$+Rc5u#;MtU0YO@98_WW1LN+O#6>edFRD!D8@OvqDUd%7oVB zC8?)Z)XPawDtxr5n)Vx=xYP?= zF4qaMAN1kr>C=wgs7r#U;0D_V+HyUz%LA*ctNIkjaVx%v+^F{^cXdsk;!)*f3}0&b zRo^AOwqt!G?!=fp%+#%QJ!olr%-QK^>`HPCw8NcZ`!qzuO(3)UAgruvpMQuSz_*Y{!foDb!Pwo diff --git a/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_share.imageset/ic_action_share copia2.png b/Sources/Earthquake Network/Resources/Assets.xcassets/ic_action_share.imageset/ic_action_share copia2.png deleted file mode 100644 index bd52c4a75458b8226e11f3500694f95660066e82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3680 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 Mr>mdKI;Vst0AIjdp#T5? diff --git a/Sources/Earthquake Network/ViewController/Dettagli mappa/DettagliMappaViewController.m b/Sources/Earthquake Network/ViewController/Dettagli mappa/DettagliMappaViewController.m index acd6433..7373ce9 100644 --- a/Sources/Earthquake Network/ViewController/Dettagli mappa/DettagliMappaViewController.m +++ b/Sources/Earthquake Network/ViewController/Dettagli mappa/DettagliMappaViewController.m @@ -18,10 +18,12 @@ @implementation DettagliMappaViewController -- (void)viewDidLoad { +#pragma mark - View Lifecycle + +- (void)viewDidLoad +{ [super viewDidLoad]; // Do any additional setup after loading the view. - // coordinate -33.86,151.20 at zoom level 6. UIView *viewNavigationBar = [[UIView alloc] initWithFrame:CGRectMake(-18, 5, 150, 44)]; UIImageView *imageLogo = [[UIImageView alloc] initWithFrame:CGRectMake(-18, 5, 38, 38)]; imageLogo.image = [UIImage imageNamed:@"distquake_app_wave"]; @@ -33,7 +35,6 @@ [[UINavigationBar appearance] setBarTintColor:COLORE_BARRA_NAVIGAZIONE]; [[UINavigationBar appearance] setTranslucent:NO]; - // self.navigationItem.rightBarButtonItems = [self generePulsantiTipoMappa]; self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"back"] style:UIBarButtonItemStyleDone target:self @@ -42,31 +43,12 @@ self.pikerViewController = [[PickerViewController alloc] initWithNibName:@"PickerViewController" bundle:nil dati:self.filtroArray]; self.pikerViewController.delegate = self; - /* - switch (self.tipoMappa) { - case reteSmartphone: - [self setUpMappaReteSmartphone]; - break; - case reteSismica: - [self setUpMappaReteSismica]; - break; - default: - break; - }*/ - -} --(void)chiudi:(id)sender{ - - [self dismissViewControllerAnimated:YES completion:nil]; -} --(void)setUpMappaReteSmartphone{ - - - } --(void)setUpSegnalazioniUtente{ - +#pragma mark - Private + +- (void)setUpSegnalazioniUtente +{ self.labelAzione.text = NSLocalizedString(@"Un giorno", @""); NSArray *lista = [EQNManager defaultManager].elencoSelagnazioniManuali; unsigned unitFlags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay; @@ -118,13 +100,8 @@ } --(void)setUpMappaReteSismica{ - - - -} - --(void)creaMarcherWithSegnalazione:(id)segnalazione{ +- (void)creaMarcherWithSegnalazione:(id)segnalazione +{ /* if(!self.annotationArray) self.annotationArray = [NSMutableArray array]; @@ -134,7 +111,9 @@ } --(MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id)annotation{ +#pragma mark - MKMapViewDelegate + +- (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id)annotation{ /* if ([annotation isKindOfClass:[ReteSismicaAnnotation class]]) { ReteSismicaAnnotation *anLocation = (ReteSismicaAnnotation *)annotation; @@ -149,44 +128,17 @@ else*/ return nil; } - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} --(NSArray *)generePulsantiTipoMappa{ +#pragma mark - Actions + +- (void)chiudi:(id)sender +{ - UIBarButtonItem *item1; - UIBarButtonItem *item2; - switch (self.tipoMappa) { - case reteSmartphone:{ - item1 = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"ic_action_settings"] style:UIBarButtonItemStyleDone - target:self - action:@selector(setting)]; - - item2 = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"ic_action_share"] style:UIBarButtonItemStyleDone - target:self - action:@selector(condividi)]; - return @[item2, item1]; - } - break; - case reteSismica: - return nil; - - break; - case segnalazioneUtenti: - return nil; - - break; - default: - return nil; - break; - } + [self dismissViewControllerAnimated:YES completion:nil]; } --(IBAction)visualizzaPikerFiltro:(id)sender{ - +- (IBAction)visualizzaPikerFiltro:(id)sender +{ [self addChildViewController:self.pikerViewController]; [self.view addSubview:self.pikerViewController.view]; UIView *subView=self.pikerViewController.view; @@ -245,7 +197,8 @@ } --(void)applicaFiltroWithTime:(NSNumber *)time{ +- (void)applicaFiltroWithTime:(NSNumber *)time +{ /* NSArray *array = [EQNUtility applicaFiltroWithTime:unAnno withList:[EQNManager defaultManager].datiPastQuakes]; EQNSegnalazione *segnalazione = array[0]; @@ -266,8 +219,8 @@ } #pragma mark - PikerControl delegate --(void)inviaDati:(NSDictionary *)elementi{ - +- (void)inviaDati:(NSDictionary *)elementi +{ [self.pikerViewController.view removeFromSuperview]; [self.pikerViewController removeFromParentViewController]; NSNumber *index = elementi[@"indice"]; @@ -275,19 +228,10 @@ [self applicaFiltroWithTime:index]; } --(void)chiudiView{ - +- (void)chiudiView +{ [self.pikerViewController.view removeFromSuperview]; [self.pikerViewController removeFromParentViewController]; } -/* -#pragma mark - Navigation - -// In a storyboard-based application, you will often want to do a little preparation before navigation -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { - // Get the new view controller using [segue destinationViewController]. - // Pass the selected object to the new view controller. -} -*/ @end diff --git a/Sources/Earthquake Network/ViewController/Dettagli mappa/PastquakesDettagliMappa.m b/Sources/Earthquake Network/ViewController/Dettagli mappa/PastquakesDettagliMappa.m index 6184fff..4a1ac6e 100644 --- a/Sources/Earthquake Network/ViewController/Dettagli mappa/PastquakesDettagliMappa.m +++ b/Sources/Earthquake Network/ViewController/Dettagli mappa/PastquakesDettagliMappa.m @@ -18,23 +18,16 @@ @implementation PastquakesDettagliMappa -- (void)viewDidLoad { +#pragma mark - View Lifecycle + +- (void)viewDidLoad +{ self.filtroArray = @[NSLocalizedString(@"Ultimo anno", @""), NSLocalizedString(@"Ultimo mese", @""),NSLocalizedString(@"Ultima settimana", @""),NSLocalizedString(@"Ultimo giorno", @""),NSLocalizedString(@"Ultim\'ora", @"")]; [super viewDidLoad]; // Do any additional setup after loading the view. - /* UIBarButtonItem *item1 = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"ic_action_settings"] - style:UIBarButtonItemStyleDone - target:self - action:@selector(setting)]; - - UIBarButtonItem *item2 = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"ic_action_share"] - style:UIBarButtonItemStyleDone - target:self - action:@selector(condividi)]; - self.navigationItem.rightBarButtonItems = @[item2, item1];*/ self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"back"] style:UIBarButtonItemStyleDone @@ -43,30 +36,14 @@ self.mapView.delegate = self; - //NSArray *lista = [EQNUtility applicaFiltroWithTime:unGiorno withList:[EQNManager defaultManager].datiPastQuakes]; -/* - EQNPastquakes *segnalazione = lista[0]; - CLLocation *coordinate = [[CLLocation alloc] initWithLatitude:[segnalazione.latitude doubleValue] longitude:[segnalazione.longitude doubleValue]]; - MKCoordinateSpan span = MKCoordinateSpanMake(10.5, 10.5); - MKCoordinateRegion region = MKCoordinateRegionMake(coordinate.coordinate, span); - [self.mapView setCenterCoordinate:coordinate.coordinate animated:NO]; - [self.mapView setRegion:region animated:YES]; - self.mapView.scrollEnabled = NO;*/ - - [self.buttonAzione addTarget:self action:@selector(visualizzaPikerFiltro:) forControlEvents:UIControlEventTouchDown]; [self applicaFiltroWithTime:@(2)]; self.bannerView = [EQNUtility ottieniBannerWithController:self position:NO]; } -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - --(void)creaMarcherWithSegnalazione:(id)segnalazione{ - +- (void)creaMarcherWithSegnalazione:(id)segnalazione +{ [super creaMarcherWithSegnalazione:segnalazione]; if(!self.annotationArray) @@ -77,12 +54,12 @@ CLLocationCoordinate2D location = CLLocationCoordinate2DMake([pasq.latitude doubleValue], [pasq.longitude doubleValue]); PastquakesAnnotation *anAnnotation = [[PastquakesAnnotation alloc] initWithTitle:[NSString stringWithFormat:@"%@ %@ %@",NSLocalizedString(@"Sisma rilevato da", @"") ,pasq.users, NSLocalizedString(@"smartphones", @"")] location:location intensita:[pasq.intensity intValue]]; [self.annotationArray addObject:anAnnotation]; - } --(MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id)annotation{ - - +#pragma mark - MKMapViewDelegate + +- (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id)annotation +{ if ([annotation isKindOfClass:[PastquakesAnnotation class]]) { PastquakesAnnotation *anLocation = (PastquakesAnnotation *)annotation; MKAnnotationView *annotationView = [mapView dequeueReusableAnnotationViewWithIdentifier:IDENTIFIER_ANNOTATION_PASTQUAKES]; @@ -95,13 +72,10 @@ } else return nil; - - } - --(void)applicaFiltroWithTime:(NSNumber *)time{ - +- (void)applicaFiltroWithTime:(NSNumber *)time +{ EQNFiltriMappa filtro = unGiorno; switch ([time intValue]) { case 0: @@ -125,13 +99,6 @@ NSArray *lista = [EQNUtility applicaFiltroWithTime:filtro withList:[EQNManager defaultManager].datiPastQuakes]; - // EQNPastquakes *segnalazione = lista[0]; - // CLLocation *coordinate = [[CLLocation alloc] initWithLatitude:[segnalazione.latitude doubleValue] longitude:[segnalazione.longitude doubleValue]]; - // MKCoordinateSpan span = MKCoordinateSpanMake(10.5, 10.5); - // MKCoordinateRegion region = MKCoordinateRegionMake(coordinate.coordinate, span); - // [self.mapView setCenterCoordinate:coordinate.coordinate animated:NO]; - // [self.mapView setRegion:region animated:YES]; - self.mapView.scrollEnabled = YES; [self.annotationArray removeAllObjects]; @@ -144,25 +111,6 @@ [self.mapView addAnnotations:self.annotationArray]; [self.mapView showAnnotations:self.annotationArray animated:YES]; self.labelAzione.text = self.filtroArray[[time intValue]]; - /* - MKMapRect zoomRect = MKMapRectNull; - for (id annotation in self.mapView .annotations) - { - MKMapPoint annotationPoint = MKMapPointForCoordinate(annotation.coordinate); - MKMapRect pointRect = MKMapRectMake(annotationPoint.x, annotationPoint.y, 0.1, 0.1); - zoomRect = MKMapRectUnion(zoomRect, pointRect); - } - [mapView setVisibleMapRect:zoomRect animated:YES];*/ - } -/* -#pragma mark - Navigation - -// In a storyboard-based application, you will often want to do a little preparation before navigation -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { - // Get the new view controller using [segue destinationViewController]. - // Pass the selected object to the new view controller. -} -*/ @end diff --git a/Sources/Earthquake Network/ViewController/inputView/PickerViewController.m b/Sources/Earthquake Network/ViewController/inputView/PickerViewController.m index a03f59e..4ac1f98 100644 --- a/Sources/Earthquake Network/ViewController/inputView/PickerViewController.m +++ b/Sources/Earthquake Network/ViewController/inputView/PickerViewController.m @@ -63,10 +63,7 @@ NSDictionary *dict = @{@"indice":indiceElemento, @"elemento" : elemento}; [self.delegate inviaDati:dict]; } -- (void)viewDidUnload { - [self setPickerController:nil]; - [super viewDidUnload]; -} + #pragma mark UIPickerViewDataSource - (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView{ diff --git a/Sources/Earthquake Network/ViewController/inputView/TBDInputViewControllerData.m b/Sources/Earthquake Network/ViewController/inputView/TBDInputViewControllerData.m index 824fe1b..f4da387 100644 --- a/Sources/Earthquake Network/ViewController/inputView/TBDInputViewControllerData.m +++ b/Sources/Earthquake Network/ViewController/inputView/TBDInputViewControllerData.m @@ -34,13 +34,6 @@ [self.confermaButton setTitle:NSLocalizedString(@"Seleziona", @"")]; } - -- (void)viewDidUnload -{ - [super viewDidUnload]; - // Release any retained subviews of the main view. -} - - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { return (interfaceOrientation == UIInterfaceOrientationPortraitUpsideDown) || (interfaceOrientation == UIInterfaceOrientationPortrait); @@ -55,9 +48,4 @@ } -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; -} - - @end