From c353be4cd22583eb10ef22da7192f16e3f3bfd90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Batuhan=20Berk=20Ba=C5=9Fo=C4=9Flu?= Date: Fri, 5 Oct 2018 11:20:01 -0400 Subject: [PATCH 1/2] Made the UML Class Diagram --- .../.idea/caches/build_file_checksums.ser | Bin 537 -> 537 bytes OlympusServices/.idea/misc.xml | 2 +- OlympusServices/.idea/vcs.xml | 6 ------ OlympusServices/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- UML Class Diagram.docx | Bin 0 -> 25385 bytes ~$L Class Diagram.docx | Bin 0 -> 162 bytes 7 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 OlympusServices/.idea/vcs.xml create mode 100644 ~$L Class Diagram.docx diff --git a/OlympusServices/.idea/caches/build_file_checksums.ser b/OlympusServices/.idea/caches/build_file_checksums.ser index 13c68429351ab3060dda3e1af1251022286695e8..b25e67ab63a10ce6ac168a410e7f15e86dfe0285 100644 GIT binary patch delta 87 zcmV-d0I2_&1epYom;^+ieU6cwi4Q14I$TwAWpZ;|VqtW3Xp^=9Hj^a*LlD_W$tl{C t@OZ}J`o`JG_283u0UZ;O1*7iUYw_`hjs}eASYn%W01=bF0UMJD0uhzyCjbBd delta 81 zcmV-X0IvU;1epYom;@oaYa@}IiIZvpLlDvnlNfphFxv%7LonB};9HZu0UaSB{&XT5 nK=U7(IQ~;;G$*cf04PH`Tvc;ra&ufsc42N|lQaP~lk5R4;+7sV diff --git a/OlympusServices/.idea/misc.xml b/OlympusServices/.idea/misc.xml index c0f68ed..99202cc 100644 --- a/OlympusServices/.idea/misc.xml +++ b/OlympusServices/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/OlympusServices/.idea/vcs.xml b/OlympusServices/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/OlympusServices/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OlympusServices/build.gradle b/OlympusServices/build.gradle index 077cb2f..4e8009d 100644 --- a/OlympusServices/build.gradle +++ b/OlympusServices/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/OlympusServices/gradle/wrapper/gradle-wrapper.properties b/OlympusServices/gradle/wrapper/gradle-wrapper.properties index 0683d4e..5f2fb81 100644 --- a/OlympusServices/gradle/wrapper/gradle-wrapper.properties +++ b/OlympusServices/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Sep 28 14:59:51 EDT 2018 +#Fri Oct 05 10:21:14 EDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/UML Class Diagram.docx b/UML Class Diagram.docx index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0cd4473d8bd67d73f8a3270726ef474a249515b8 100644 GIT binary patch literal 25385 zcmeEuWmFtZx9%{w1O|5)h~O41K!8D$;O=fAxVyV%LeQWg1OmY!xa;7OK#;-R-StkA z_x;Xy5 zAOv6lbtUZWT+HoU4Andx%$@bwJ#1~jpHP5|9|1r_`Tza=4<3PU3H??boFJ+5(7WK# z>PeY;#@x={Pf&A8%PXWP9yiHTaTNpqdFAvJg7;)clVn97y!Xkcz8ih}&a4}N_dWIf zNi*iL~((`gB|K> zRHmX`s@nSV;0KXVfD!DSJN^6jI~eTMtQe|;3Lku{TELnYo?`dNKcgD2hs=AZDevnt5JH>$fvh{i;+ zjSWyelz}0e;x`|&l;z3rGPI76Pu;;c=4U-2{nCffwW*dAQ&VSV0wLI3eSmv_sOipZ zoctCQy4ym|^V^B4NK4;CpLcf1NJ|jD*_ntAQG{UK-y;K*{vA4L;wWnN5myut;KN3s z)6mJ>#+ift*YE$L@_#TC|EcRm@7oZl#DVMw-v*C1DNnbNmKjP(_F73LIpnpJ-r2ZhP3G?TrL5J>jqX!@{v@w^<mj?SAFh~eBhA90%`%@I(ukf43U)}`s zdM|y3geqm&DdpPH`2?iNQAJwHss0OA-F&{r(EBz~Y&zv?9r%{Njr*D;4w}FaIRK{7{``JsqbskRK?R=@EDMSW0PQIJ&o$~xHmhKeH@7C|Id%HEz4N)FvBw0d-$WbHpmU` z_4j_r^tS%)Nm~$ z(Ds#7REk-n5&s!s{8AlYUW zd&XhvW}Vyw0U>r1n7gp1Z0Am*tPYmn>{7n_HHHg;HVy0woCPiM*d1c?_d% z3P`+mz*#XwLZP{u<5D}HQu0MF76f9I0D*;X-+4{YWjK`hQ@{6*Au zxO5CSeos77w?xl?m1?rPBKh2=4;PRuncL4JJ5Fd+e@hYexvPViq^(F;d@eRC79=PD z)&3c4P2^{4FNv>yEOdQo>1DR2DSC?I7I*zSJKXMm{ zRj;Q{u4xO~X?l_7^`F1}QjmQF@QA!5zW20X6@_lpk?vrK@4VJC5%(UPeoyu3pzJ_> zjHl<6{W-)6aF6j(@dvg;w{#7J4U-Ic| ziM{;;50(RiB1g zJkt)jcN3WEr*L$b3`Z^K;+P@yj;+_u2I~t3VRf*Mv0zs^sZ2Y7{tXu8>Epo<-$W`h zP9xVpLpIFRdVUD2(G>F5-V_=*GVqQY(BH zdadaW|2885`Fv68lZN2P`6u6mvhXbCKvn4C@XfK668@tnIlfqa;SE`x@BM=w=Lp3K zm-dw~Gw5iK^f;Kg{=^I3TX?;8E@iQNir@QQ>DjJq+ap3i4DfV-(n?jnW>Puo?iV?EAG=T;zkPYYMC)<|Bh;a61GUSl;1C#Le zye^8dL|IP5W?LV4S4(BJ7VV8Z$PPSf&mWIc=H)i!ZXz@At40m&DqHVJH-DUR$n^!= z*fz1eS|ObX}>j z;M4+fZyxyig#YH(2l-6OozoG^;X}}DnGUj#fkcVkl@Kp3o$}CINLD$Lnp(qZ=1j3y z%m=X%K&1d|g+@*MK)?MZtMw3^v3{z;v0XgtL5ITi^oMdDB`9-GiGpkZM=YnY`-Lb*EaPINExXtRq^J-PhFo)%9g{f zo?>y?FQv_xRJKaDh4L;jgqDRwCxj!*mfDzkmO)EcKE)>rITD1<3qV~089wW}>sHfA z@(N|W_`_NPfxDoy!UKOoJ}CAD+ID;CzQ?rkAkWYLc}LLA3&m_VUjyM#zbdC@ zi&yP?Y&xWK0_RmPwufuyaG#ytLNpYeuby zyLD^C8aziOE26xruUpdNP2GM-$9+;&Kj9do(GlvzaPZ?*NMOZFI`xIzpZrsr z*TquD@~FrKSI@kz|5+hm{bd`_0bZ4)NUd=K0KdM(e=7uAbF(+b9B*umUz>BWJJ`LB zR8n~H0E^<+T@PNplvDu#kU;LOusb^(O(k`6f7s-u7Q!e43L%c{ z_E0_qOF#Dj;b9B-+uad*X(iS9LNwZB?eHxg28DAN67JJe;`2$02VsV(o4UoPpu}HL zp57LGElDl;TC!I#wfkZ7gQv(x*Dqfhu3$q$jRrp|ryl<@i2~$^emMjHQ;diX000%r z;9m!`9LTRjk96R#!@F4EucBZ|)L*^;2p<*-;t*i-KkY`sGtqnaYZI(IZSh~jl2WFP z9Ye|-1)nW6V?RUE?r>7OfIs7vi#*i)(sfs=Z=?{jlAZKmN>LnlW` z(fYgnecz)_N~hru2AYdv8$&~X*9*xxB#DsUEKnIyZEJGx9{T#@12Fqsz|?;`rc6{{ z@>kQ497mFf*;r!2$-#T*srkf^;=h^WUuseXv4AYJ8)8zU+Ld;kITcCMOocZ;T<(#z zul6meCO}OLJR9#E(KI3NO%+LhOF(S523QWlQOdXh62`dIap-D8b!vfl7{gh0OALu3 z^KEdjLTWObc1xZlptiH{>y(v_5@R&%w%K;+YnRsyX!VNcglHN@m817R>CXHkO%$<( zkc|aBCY(7~N>CwEsv+YikU^b(jZLGT8rl*t?oLbnE2P#bjvz6}i1w3HHcF_;#$^19 zKZ8*Vi4n{t&h|Per?zJf^5oSbZSz(^6|a2UzN_n!_^}+4;%TR^o?ul9ku+r@ig5ca z<4=ogy?ff2<0#E*@%0wekrU4$mlOCT}7#oegATN&)4bS`lmK$|i+ zVLr*f=x2gT-~3bw<#x%+Plogd}s5I7%1z3r8AhB>E=k$ED1}- zZ3$Z^ysVmD5o2_*>e|5N<`N@64NTt3h5G1H%y_lcmKfz<2kmXO5?BBd9UYEDdiB+m%xiyuos3^C#7jiuovRDBsr+3Vedpl?Sd6uzIpmNwe{mOo+ z(NyyjC&Q}vhIJ{wCRQg?U6E%#lkC5{-3l6S-3U6fz+anH zM>-y=ZL<9$W@%eLoCtKEFK9X2tXRRd=RRXCs-6{3F79e{#eZSD$qshP0fjry?D{Z86T7BP>VH;;yy}G*! zlk&UkW&aJaR*);|CjlI|Q5x2dGYdN0!Nc8D;9^iC`42dB!>t@|Q{|m1n9r5*9O&*L z#HHX9v*z|py6Ixl`ZHFD|63bvmSOF+7b$!5M0Mp4vuK{vX9=Gq^!%);sBdIFYDm4G zw`~CZo&{ zRQX}l=y6|VWMCHRMg6+oRj3%&nLQcK8h zsgTPd!Z^nD1@(jzVQ_O8yil~OqrX8rm(m0TUGJ=%6&FC%&P7vOEK!%{ZR0Yc=?!gq zlfw-Xm+?fH7@*BePWwqcS^T@=zhw|7P8Tfac@S(v)oP6`soH9X)#57kQ8IAkDR!r? zI(Y8}yx($C(Q`gA?xH#;P|Lb6;{0+2w!icD-J0O9$8u$-$R5n^;HT}ww}q`j7@ZRB zrI;IwDP9eBm%hXpxtH$XCHR@vnI2eWo!%HBP410xvdJq=6VRv~J^ahvq@E_Y)i|}l zWoL!Y?a8ql-EXQ5>uCZiqv%q9jDBNYtjUCP_aePdWg)1hX3uCR#(h}+<@p2$^0gnf zr1|_(d620FtiC*p1>~k%Op4JZ`hs_v*3eHO5xr_i^va!PFY3nk#jFP9R6UrK)}!-p ziL4|c<1+XI#ZQpdKlJl&==|@U+EO!`5u__DWLPO`(stEQC@SfTWb-C0{zDw2waCj; zPz`ma9-Lb?qKMfa+ZNu1v|Tww+k8;GKN=;Lm(xJ#@iuc=*2v>e1RI3Y%%JUUtA=f- zt<;QyjmvE-5!6rQe-Sk~nS9DbR~t#BmBW0Z>UI}#loM7mrJnLZ-XiK!Lb@xQ&*e~Q zIS(u9gC=*iu3uS>$)=Nb%!LeI)3vDEbWh$3ol&7(vHWVW7FMv77P~#H zZ7wm;vTi}dp1SzWwZ;K{UY`h48(CL1x~b%HTDeUdMs*^^!}<&nnua37M$iH(65w6% z1U5p+kt3{-=c__Hs||Nv2B2>FXJ;K=bwz9F4$dw2Rl0oTa{;(pVw3E^S{9;Jk*j!q z4U-+2O^iN>mexr{TlJ1ttZ9mE{UMgu6Dv-DlVL3S+cp-Eny~Ho&Ep6OhfqA%> zapqyg3>17vdhGJyWitzH)Al~Lh}DX`UAoLWsQMWb{zA@fnr$lAX>;;%zwP7h1KD75 zju}Jl@#1Iz2L>R3>gqHovNy}3cSbLeG1$4MB}%C|KJy(b$Sy;kIKAom#@zZRw+k6w z2_!_C0~G1H1YGV5$lPaJFP(T6raM1_p98_kp@o;YAhi2H&gCUWJZ7_FEt|-9?iA9{ z-6gC*+H^vx)*?dGJ)@~-YS*+6u|!o?&bUs?KYbn(L4_&V2vKzmSu@jE#2ooK8}eBA zJnyo_>g2pLO(Q@8Y*5Uth*JtGBf7gqY&>!6u<-^oSA1Y9WzbW?0&>J0VeSuuKLA#< zJt(+7Qv)X~kP&D;yD4N>Xk_z`Nvz78e(OI@CkPEbWdwCxKyBr-5YdeKfQd)natTrC zU30VTtk^-VE?ubN&QdslfH#Y-7`C4v05%z7jBo~fKr7F|RdBWICxrEeq(80(=E>|t z0>pQ2<8~Wwp#oDF1faIJW-cy#K=XJ1=RX{dfOD< zgp8mzgPmL65Mbcwuc~*?%jF{hfEbf|dx$caQxFSf|b z>q2*LTXIkUDX({%q?P_ES55o7Tv71^+P$Ii(;wx{UkO_sh%j)f>hdzx5d6T#Lk{~r z;tn425K>l$Kt}edP1??b3VkkrbJJ=ek5zqC;mdv2^vwcK;obsNq6nX5FPrUsT7Z#b z-GtLeY?5Y3QPHW{V~p>WhTy0pP%^Tw9?SO@EBm)f;O^Zt*xY+X8b4*T>(n0Ks$low z=o>HXmF{XEhl?_OE54ZH^1*0y0PB;?>rq~6CQ#&v0cLI2Q+CNsrdlV5s?sQkXO?IZ z<{0d%Lcl}Q0IF-JI&a8sI7@nr+sN;BK`vI~W9T*a)N4NIlwf}$eAyzz(^;XBK*@B2 zICw*Ev*1~B+8UYH>!|zf%d6)h%j2~6tvlA9EtxmY6c<}zJ{}9&mluirk|lZsb(L&K z{nd?4H?=*(qEn$39gq6TMUnvlU9HX{^_CV`l8=cBuhIMAkmnfXqqgUcnVhXx@Ug%t zTb6Q;KzhC8bJG6nYn>^BM*k=Qn$n2Qns|im1NVD8cKzvC*P)9pJ&PGMzI^(#fNKAp zv)6rIPb~H2$pZf6PWBhc>gL4pRr9#{@tb=)IHKv#B_)SJK)^9{-OFX%hBzWMz!qq8 z^0vWXF81|aX%VGeC6(#RNp+RL`Zx21{Tm-?h>-~EI~JO0OC&E;l^7|oB=w$$(UeY| zA9;M8hZ?V|6?@!P^wbqP?X_YbUFN)y95TeeT&})(OcWuwcZ~%|5q;j0({GUnsdd;E zSIyN!IiKncn@mSo##i+L=`=$2^Eu`!%OBocjE4$yU#}zvbCELY(C6aR1NRJm^P|Oj5!_CbT~V4 z#PwIm%%#|z|E77|ere%mUZb;v_MGq9yB_HLuZiKo3h9o102mO-?B`+;Q~`gdtHPJRzYLFL$8(>Z;1}Y8QpWvFN#FvtOl!fc5w6D6x*Xfh5I%z;=g*50M?R$zsgK_49&zPx^0UyKI-%b??>%+m(*xDO!# zDudT;2U7QlFb2w9xIVnl_p~`SK><_-u3Hb#W1)1HI!Rghxo#p5L;!H19R87_PJ|H? zcq<&&mT*{JC@@+DtG=c|&|dJm#lUaUC=sdl%mxP7EnJcv2LO@2<@ZBv4ZZ=4>OE+> z8$TlGZ|ll5jg$kBf}82jrTB}yEEda)4Ld#PkOO)b1xSy>fLsss?=&L`{C^-_S|D1+ zrU1l{+D{r8D1-B|cY$0dc(B+5cQQuM^;2s^-ID;L=N^7t&vPJh5^1RIG3pO)t~kV! zL$h`Ld;SA8EdNJp7+f-iCn^9SLLLfTjoU8+Cll|=A8Su-p!IXV3pR3bhPMmkGYs$-CpNv1aJZP;vI%Khr(5rjo^jdc%+1Ath(lIW}zXE$OPn#Wf zb&Up?q|KBq#}HHp2Px?v57p<)8*@l}#qKaS8*i(@xRXC8UdGvTe%ys>Mwr*{`xJiC z?(72(v8`%uVPl)oe7ubnBFvCjMpJ%GWzS7SN;jBsyg~H^E2O2QPE`5p((#BI_+Kr{ zMr=|~3#}UukXq*ssiLGt3xN1x3u+suD0GcXHvH(0qB~n3=Y?`=bYradoVRoR_&=`A zUU5F#KKyiAfz^qjcX*h$xc=02C@~vGRQx{B~12;#js?WbQa>8nHL=vjx-;0yRm ztw7;N$x7h7SW*apEY^D$l|(8WTk`oZ3DUKMj+}u*)qV`#-ZApd$o0uHb4SJ~$-{e2 z#{F!_=bzRMkj|aMq;K$qsG5F?hZQLBdFZR~}Ja5dHdrPXu(W*YBe!vXg; z|0Jvs0>8$url?EJ%piBacjtx(eR92RRnN3frI+NMCGhBI+1)LBiiZQWeK8atuysfk zDK$O?G#1|gr)VITVfNhJR?*dLHj8s5iTaf{JtGUxZuAnOPLJMA?4N>5U`sX{q|Swx zkum0>TpSm|(lfur=zw?XnC;=WcFdq;_FnH&TH>iX`Xe}7oOjK*m5|d>r1|C5=K8L9 z<(oMKH(@^ls2$EkNc}7TX8V)%Ght1xW$Yc@&FNeW)vzE1GvQwGo|8wqk1jhYMVxVC z^`7oGHi&;>ARam$e~aiH3wE%t6a1jm!}9Ku+q7G%m7)&9*miCqsI4X$l2PX2b9A*|CJEaTf+#cr$5HG2V1!rbo24=>ys-yi8C?m)uJeAR zLD(as^rF?CZK#}h9yG{dx)DJ9d$!=KmWg*yZw!gC?x(&xT#i;(@yAa}H%#B>US_X@ z4{Joa1Dyto);&I z(1N4Vk2T&jx8H?`A6yLn2k*`O*Phv9`W6F{x^gyJDiNFHPml`_E;LRSk7l4W!gs0c z`DGS6xYxm>ii1U#<-4YK$%UZaJl?_K)#5Jwz}0q`ztj{-&;x%;w+4+fVhlo)Su(fu z(xzpye9TE+x@WG>S*-j|{c3GDZ!w1)mpG)t=Y!MB^r@^h@bjs>8x6RAF5HcsgO|Oh zONF|}>Y~pIN>0cPXW!xBJ!he9IST7Zl%;pCmhziQs!66Ly}V>VI9}-2hS&fu#KX$1 z8-l7}aYxQ#%y*HXq7T=NWm=?s@#PaqaZb8?lYB*4`e1^ZDhJ=(JjNImFf(jFYq*bV z+BX8qG(G(F;#w`IqNx`Aph5rm7CLNQCihLjXK%o^w6?3p^xQsbW-?9@k0x%I#!JR* zTUT4(faFqt@P5BqKLV&6PHG9z&&f*mumhgu<)F5sX>q9Whn`^FZ-uU%FUge~;y6*eenauVo;GaWfRcqvjL9s7%DZN-@_x}O z=eKc!T#OrBP)1fHDjvwW_*Ac@93pvqrVkz~7W??N?-iK%TcX2&Fj2%<9lz?JUrfGE z#1mC;kY}4m*I6NqGJ}8qUvdy)c~EZrSu4#KxNF#>Vbr1^$u%2EomlDZ<)=c>Dy}Jd~N=jZW;vp(W;iqS&8~~iQqk0 zvbZ)7E1!osHF@}l%~r4X!RPDumlyQ9*THiPQcz{@Jr4c%=LVw870yyCHM;cYc7?=l zD=UQkN2foA;h~J6oP|)T)<=iw$ltzDqKb1NX@rY&pME9{ae|@2JenUw+ubHs863Rz zqGDGK^e(d{PW3J*+fo!8slLwC1qbbhB2_;_e~{gzf`V1B%ye#8P?W4CjoE^3^)>xo z%K~9~iQsncGE~!Mtb4$#U5Hc_uL|}HTAEXXp1u=wZ%gs|DtZn}&Qe_!v)!e=6~c3u zx@*p{E3}{ci_n;`I`dCF(E}Wvh7SSL2*3u?x2}gcx{yM5M-P{9jr2V1kh+6`qr|3n z!YFcR(A}oxP#Q>@hXPV}IB*ny5%!U@(8FdQkK+O`-Rg|ViSUnolzLu$uGn&Lyo6^| z>Tw6?MmVRxMZny=5ji{3ZE1L|D@q7@JDjv5H3mR%Gg$(9e=Q4_%4bD_kOH1Oe*r*v z_9y=fADJa2kPMF+gnQcVIm$H+278_j zi6J#c3g|dS;uJpC1eavIcO{-w+#pcKJi)XjjyQF#nspU$9UM|SxpC#q0+v5x1TDX? z1dycp;VyUrQcCJrKu-p?myDt%d29Fk3Qm`>qy$3yACxe9{5SwQ$_&-pQr3IqJF22~ z4HS~Y*+jLvSsu%8XA?4l;>7|0B!r^p5dHz}!2eg**(hQW*h?=5hz`zj|0sk|5HtH& zwY{i&^_RS#$_&uFUqDGi_bfBS4rs}8A&eyel$wsiWhc-;bdvkm>(%636jiwy&*L)~ zjpCU=*Gt4hy~qcw(Tc7^YFs`;zU2^9gg3!UQ3Hit$4xqc_~_RfSdv^8y#Ur0?eR8q3y_b!f`sTafTIsW@DK}xV{DiC zbcBFWdf2#!I~yTS@+gEK;TPnn7Ko6E zB|da_kNzWIHpid+atg&__%8>+275c!2=xssurfN!0Dv970F)yY4Q{nrW*}=7r*8%P zXd9;CyuM&UD=Tw(M>hb7?--`!q`i2BR(62F+v=hGGw`xqksH7mLTU8;VhXs1Cpr!= z!gmR9JLE%2cm(oWo60*$^4e;_-jY-Fdc8AY+CGfO zIe&qP9zYTD@pgo+sW!Fp+po}z)z9(fA~Uq}LEf5@jJJqT-yFIvBC?kx%?w1?;9ch? z5~LW{x7yY<(slc!0his10stN`Xg3_Up!&Jx2h?_yS;k4b61D^4;FroMQLxnwO@gSU za-J|2&YSdKqU8qY;q+f*ydqNs?dkV?`vD#ZKi1@%;SH=`y#?a4nU*r5Xi_wKu1;dU z_F5GT_GPag*R5RCi9Nkvc0BR2pd2knUrr2Vn5;>49yt@bxQx2p=p)APWe2e0`Yj=W zfB1xcz5?PKB2CV`MD?aNiZ0Wy@hOiDV*v$23@6pMKU@zu@qP3@r!3$asE&qE5ur5| z)ilrD(>r*>?7EN7lw-dn7f{9P*W76_*q#8njG*Og3FtD~t?gy}l-)PB99DtFLodVa!$$E16iwP4v%Xim zh0;@B?K%tbB6aa%);~w-L(Af4< z=y730i5mo3-jJzFUy_$@l0;lykORszZ%&X~X$IW_u#nvk75wqT_$O|_2JElr63;uX zKQw1#8Hn8IL}G=^S&#?lgMZ$i!+tb6+Bo3-gmZdR+gX21X(5OySf9G(T=qOK5YL94 z4TonZZ5Lji!UW$G0F?)@MJ@O~W9%YzApwSgfHJ&Fs=PiZdcnK8pDZ0s*C}rsIIupi z`pWljJM69{(s>_@g7qcQ_Ltzj`j`>jg?bo9;-J8rgCmO)6U!i zcjtq0!KRe{fg^BaKqe-@C`<1h@)|kR5r8|41{fg#lB^L!Z2=;g_<)a6C~O0Sw;pR; z55V1(K)|<{)=iJ%)WsLOtv;R1Cm`h_a-V%@Bxr zbbLD`LwSb?jR!FGFyZ@oAfoFN(wPCb2$k_N8*yL42EnM>qa~o@;!@~NK{Z70A7OQc zSszv&ER+BuMBGG9duV-_36z3hir@cTAYUaB?mJsVGryYJh`4wtugV5`?G=2h{gt(a zsj1CZ_PdbjYnC)?gfsuAs%gRXFZd0?Z2oE&0;?t9Y650si>p0BGdDtjQtj1b**KU& zku(Ak<)=XUwfF~zBI0kS?nMi-F*YWxajN1!3jGS5 z^D@bV@ONd4UgfK3lYL8t@*{#Cmx%HHHRha81kLK*>uyW8HxJ0s)MZ;9?%ff8tS>c{ zKX)BM1Yy2j3nDzl5cWTh$LW6K9=;1x7)fNGpd~oKS z+ZW6ZN~2_H^ZWuan*P)MR=w|SV=RD&q1*I3=jtic6l;~rV2UXyb{C9>G(wrdsO7J6 zol?ev7|mzN+OxzVZLfPfF3m@ZbmurgqfhyKNHxjZJ;QJ-z0$$?FG3~BLvE*s`>tW+ z{uy)C#!q&S>d|vv}j9wf+7U zVDnylOB&y@!+p(Fi(TAe_Na@Gq6D(Rxf{BwUzORQXkU22Akx2^qT5Csxj}|@vwPJ) z#%5?U9BbX~qn0}0+xz|9#q_-N58skUyy@Y+DlowncW}U)1ul$VLLsL|ly~c}J@@!r zycqlYYQuV$nYf>m=OEsZ46|OEW22|eH$5e#6JI+a_5jMmy9XQ~ikbWu+FXzz~HgAU#SxjrWU*e34p zZfj1N@mlpu&}51#?SHyxKOw5HZ%w$??;BYPi7AHEmd3Xqj}Qwsa&gIf0|UqqZun=S zW(^|-DD#87qOD2&AKvYuFL3(`i8lFMR1t()Hw{+2t2Oy}zYo+aXWjIOwwe*5vL>?s?8J>k{4gyAGt>0+kcOYpFJtkM6Wr z@Uc2;eUB$~k9s>eqHGKa>q^}Y_B`VZIihDKlkjk9t7VD*K?=PGB)87r4#xuzvfAZQ zPvwvOo$sd)kL+zdZroc{HNow+A^t*U7iaE+Ddxuc2zN0KFDl%<|Gde+r1n{uQB$YT z#p$(1NBZ``g~~v!ye7_)Kf9KEmw>zf_UD@~$)}zeutL!}$W5)1sx8y?zjW0jJQ{z9 zGGE4nTWk#Po1k8j*d&S~hfR1*G?)T?$x3X*xLWT?v*=tHZVCIqnoSEv)p!fG3ZaT1lU4 zVRABkAtLM{DdN4s6jy9-?&_(%;?8^D0(Z*>{yi1U`rxe~E3%shm5tb`yxC8gA3GXj z*uCfvlZH2wPlT+{8Ed{m-7>nAc?L};ueQHlmkAL?o&ORB#P=5sr?KDi=F>8ubW<3Q z`oFD~0i0C7M1z@lZt0^SM&uK5u>)SM2<@a>wI@@a=VNmbEpGjViP#>X`P-A-E6T&%vNk;7xIB)qK{yANwh=b97Yk z0vn0lckdnizPkt?qjyRlYjf*{viPf&^Emyjc@vkRsqyf9vzu#B|SUT{{;A>PFmak zi%In-f0zcLZU5gGLE}~kg#F|aeSrl1ZwdTG1~=#%Q3ZR@jNI`Xu6jp=Bk|igKUw`h zv_G%mV(}gaGnAnEixOBmNfX@cxx;q3vPddbT^c!~xx4c3(Jzlk&iX?%%;a+ew3x?p zUC3bX}1gCGY>4*12qi=5F z^)0XdK|P5F8kf&vaf{4f@*@f1&IH5RXTkzobU-IU8{@6%G^)yNv!SQyyXdIxA$Jb` z;$01wtAdeS-#pT@m#xlxc5)&4z7#|Wed-AVP|n$Z1?FD~bHD63$ctQTN&ROJf?JG} z+);C$_;ziU^)8B;Kr-a5 zg>6C&keK@0`a+ZfM+$67E)K0Zg#uIRsamXm?N-l2xHSG)cf34}mx$QF3}wNA?FUD% ziZ|UDrC2c0dwN)U3`v>kVCPvJusS5tBPZH9{Qk&xzW_jW4D8zF*H$ zE$wo_OuMAnL7U4(wf`~rrZF2AugKazp(tuknkw?QVX4O3I0f02cYMi*1UJk(oV`|Y z*|`F;B;BWAH-pAFf`G~kEp-ZIkUYSno9$RYoY zJ*%R{-DxIm&A{6bcKk$0)`&)+mZ2tGKUsBRM^0+kQ1h4xG%NA1aCrp&|cM>>ts~~Y4uFjSBw5DaR z(rM$iXkKx%opwU?gE1R|)J2=W-qnAtujg@IT)IsWe363P{{F45u%;t*ddy_XBV$;T zFDGl2-iwzBG5F?~d$riCGtoj>{%%Ma$@p)}k&hyuK?Us|t?u~Lu}X8sbPDiwU=GNW zLE}Q$@%l~Qz7?~V>#vf@Rep>AN{>N|E5C{B!#jL8+yoi-*SS8BMML^f3Nq#9QZ-Wv zaZ}ijuU7=v_)2?JbkmN;8C*glt>?MhN{=4Nxy(e}Irj^Z_F2<0W1BfUN!->X=wiiu z;bnt$bX0v@zck2c_*sgiX19zsC}ujMwfzIYL(!(7%APl5!FG@|NyTWZ<8q#M>owlG zelk&Wpl|4l(}$DzgfXvwVo6jqQ!eV-pjnmxSgzB*B6z`W;SnSqfDL*a zp8l-iQ4ILNg3%Zl#!}T+rV@U?wY-^h#wZ9?RuH77h%Bb-g5f_@u&7uzKrObzJ=*Gu zPKIW-_?%q#!=Q#DSFUwu)idS^A)a;oqQ1w&KR7a4{I3rOH;y-#l^{BLhMf%{G_DdDv5$gtN1McnMl$@na_0klWw@y{Yay|OOxN*_^} z$g#b^50QO+0~sq8ye7XbQ{!&7qc!rhyavrdFZ2ko4|IqqTZOwVp^n>`B?VPS8Yv9f zzK$Zp%XV}wX1YR?2S-LC!L01G z4Gll)wZ_n+$fHRX6D+!@^fWo0SDeQo`63rck3;vGCCV1}YO;3W@4|MFK3S~IxIN8Si*d>nH!j#1HPZc{m^Zr1&E zi$M!g{5gs;+BA|=+>JK8C}4Qbex&7V6cpno_XjybolQ(bwk$X(0dlnlL9;MhN=Z1V_IPB6l4_jFt*vCh{ZcO zNooc*zM4My0g1G_>_+92&PSfssNa;YFKA280&JUT`S7FoS)#4TE8rMFHmSU#7y4M^CI7@Vo6FAs3W{F zsfHBXg$K{>dCG^f+F7kVYO z9To82mzJQeOOC)5J95qHfbG%AkV2>wy!}(|7-_|bp=@dE>I(Su<;=N?G{_G0-E{Sf zn&0ZI>bXlC*P!hLE8Lo;MITiT)V}k5^oc0%%lBKD zq{*HVfke^zEF?Zgx9X>w_l;z46-!p;>WSuDugBB2huWO)U5(k*O)`Y(v|J~tUhcnG zHeG)=bjgMic9f=W-pYmVWIM>UShp}#R2x^4^kURw{ynv_fCzF^Y%IN7@s$z9H>s7FQeY(|Js&Umc zEx{QTv-CBqL^y=@+NIpbz7$q7Hw!CNxt@vWGSAyys37^dzgJkb z2Hb9$59G@+;?H@a_ae!rH?nM~J!$z#bggcY>dA-qjAY^19;S!uQ&5c~B1lN1g}*WDR{@8e>5=-LCF;kl9gM2TQNfyDib^|{fS`GsV$aZ zY+HQ^&)CUQ64mv)c5U^JVp?@qThK$a39r#=Yh`0f?VKL?vHgSeb4CHz%i@Pf4`0P$ ziB7uM4a6-GqqNW&9;Rz%QP^T|*00?LVl12tKLwIC zu@e8C$NEj-UskcNi@x6-NMRfo3F_!e9WvWJtg?j4k!)IViH1KqX3SC?qKjtyAXhp> z*T4C!Nx-@?onchn54Y~sm-xd~fzMDupJwX*ouNzB%Xr&3Bx^ROPAsVrBikAkOJ1zg zTJX#=YFI&-Vw}9Hhr=@)q(M+Fiw7%Stz=~py$-wM?vP9DSoQiY&zLsTK%wHWp4*-A zX#+v5&1kTA1)Favf&7z<$BS#3oE#H~m52t_+5zU+!Pc=s-Sg8;0W&n2-q?5ED>C0V zO+*G7*4YcDC!IR1ADQb`b@8R5CfK+?sR*@LC=8s*~4vO zJ*yyWDo>8}p6cv>(!_dL@i{ryAW3HmcP$|(_YmX33RJ@YTc!(1vqtz%X6%XB{=3e8 zw=WRSNR1ITa^cC>7npn`B@u!1A@9|2gr`tRzWi+bk+;D}aV$PzqM_Yvmj6y{wg^)`#0 zwy&0-5Hwzs>T$g5RuA|5@tODbH9p(XtJkO8 z!FdbrJ$-Iz5%%5nnUV}-vUia?cZ$L+p3)IEOn(d+Zfz55B6J4@;g++jZ zL?wV<`FalK>?>ZkXd zn`~t$Zj!WS`bqa5X-yBW-X5>&RCHit4M*IXo{RTQO0+<8evZ>s{)WYdU*IcIBOf%m z*y3yQA351hYqa6nwA=z*jV~r&1?Ktac}IDzRwT4YuWU)8({^{5AJ5Pcy_dSil#Oza z(+SJR?VlE~%F3c~`gm70dV^r#|2(jj2bRXZh=ILC3@kq4#W09Bc_=yAJ2-Qg+B=#5 z^-{C{eH#oy;$q&*|9Trt==sYTx+9S))w{2Z^0`4;%9xS#AR$vlT?rH2vxIM77N0tB zq<@x=+z6VDSx@6%e*HRLUR#oOq4BAg+zxQ)_rq6djB=B6(Icm2gi)ZtA z+N-Ge)L7M+YDUPkEgMLS`gm8>7-kk~sVdW?CDwZj1_=_8b|+FvY$c639S$W!!ejKm z6TFjsoBlJXe3z(KK_yDzdx`!i#!Ip600JJbR2%{?BYeG0C?8Lvp;>{0^&(?EhucYa zA#TxEE2Rux%SqAf;mU^awXfyht2BWxGhfAhY6l+0(6oatPq!&CY@iK~I@^(6EFUq! zPNTLh`&vW?CtjD^AvQ~#-Tt5U&ik*4Yz^ZGNDn>qB1J&T(h0pu@4W@kAfZc>UKa#Z zBy@s?ZUku}27!olg;1n}fT4;gQWXU0-0146?B4qq+~kMJ%$)Bt?|f#?nKRFvyu)6X zb^^q{w9~cmS4M5khpQbxr`ojIIj1*%}Llhjela%sFP9A{Km1cw(P`q z>)#s#=eJ>HVBFa}=7)zz^`kMk77*$M{nn#s%(K0QZ2)3s6-G8%hs+OByEeJ`^H-)G z=b?9``nO@L@0hu{$fb2k?HfOjFyiUn+T;@8_&6$ht2UPtu5ye=2|C(2&=kzdoMTW{fPm>`y{{U&74~sh49B(l6olDUT`HkkxKo_cv3#-g4Y0SvUMH<3`O6pFa7MC> zoubkX^|-?dvfFp~pTamF*n8a5LlxUVrPrQPt=Se230iUuNK7x;z#H$}a)#Yy!#5Fb zw}5)2MUTSDJe*DCBT%jI;0aHi~>GusWha`8#emzT8E*z)aF zcm<)?%5)n%@uwSFWBXc4szt+mH3ScP7%NjlT^vj5-M3L;(358ty7^}Z_=U;i(IZ(y zFKpa)$86JYr5(rB2&?oGdLH?@AG;m#zTE7@zUQVzKE5D+@aXvCt?rSbEHHNjWn*)-^i`)?LufiNT zH@Fs>G3BgrMpj)q6gJSV;kLHqVlX*w=}cBj@l-S8i7o zYC=YW4n!=}h&L<;=fi;kpB>K{&Q=sId=Xq42?sihpA5um(0zp%_>rki+o{emCi zMNLi9HFE}kIb6p~E9D*d1rN;N7G+51gS~5GJ+IdAa;~D{%|h?_bG$u-%EHbgpx0zr z@@+qd=nd=O8_3mIl7G5v*R{Gb&GP~=8m%;7XvJ8nSxrr)S#Ew*1bp93mo5K+(uUrh zgG+2NG)+G2g{#4Xh&J>5xLp6sBWi|xOuU+k{7gAQJF1;;bTy_TrPG|vY^dDwR77FA zgl&b%ws*?sEzOg>qIUm4%|}AdwS{t>=XW|PWOjl}D}t);%$LPdK}WR+}O9`)_V(9Qja_W&F93TgTZ9iU+LjAP9DANM7+CyB?e@Nv+V zfbgDY=PciG_w6;?NkxrGh-nvNANR>z>6Nn{^7PeyT=G!Y;vh^x_*b!ykrf5P`Q6z^ht58GS@+iF^fjfm@AZPvE1yPbB$n`(IR;x+=`6+%7|ergztJ zxgI3kMsf_PtI;w_yz67$I}gNGCt#P?DmCny$aGEg%i6UO?z_u@9p-s(B}zUA!3$%O zDN8qN6fGBRJnf=p^@e*lXWxvaL)+i!fo~q`M@B{|qahV-fQBpsUa5x218PYwf(G^% zW7Bh(fA1?K_-bF6+$AMt$0wbr%dN!F8OnN^4y;Zrl)FRi_q~IIpXz z!Q0eFf9ss>MUjny!@w#VmZ3p!b4N$ojBDI)k~%8^8h9<0QS)vOhA95S%+26C6UW^vyw znoe>W%WTWP3Whu*_gdL zrlb?=Drs}$i{!v~V;|l#2S=!Ep%=ve@HZC=@;47V=z%RsOc)>YzU)c9D|Iz=rGme; z(FZitpXaAmHI{!4462JrfI4t@Fsj+N*yD! z{AXS)Ym9^-$rlO1`-Lzv8aJdmZjCQNf}~&)h8fs-zyvglNFuxN*K!;osPR{^u=TaP zc}J~y`X{Db_*X4%s4DIP@!PDz(G#S@t(frXwmkkW+`ebup7iO zvrEJ@*Dho#X{^aUoO%0NpWB3A`2@Yx{QQ9~=k8$fvLi`&KYc6JfmZAl!5a=2o0&<| z8=qID%_I>%>wjJ~Str#KC|2$N6fToOX$3|cFJiXJ6- zFmHZxdWQwY_zm`)Q`j;79?mu}tF2bj*7UCb;P^>uoo2Oza6JK}c* zwds5O`6-*_USn~BfJ)iCSwa>IZME4&e5>UcaunTysI*2Xj*BvT-p6j`q0{<}YH_%?)7o`6HFK4o3 ziv;Sydf`)MI8>(0Z_+Gh^f;p?2e+I5Z8h4f%<#u9eJ}I0xD%>>^%sf%ssB{~7tGtg zH!lAb2gz$tE8=@F)JRb+K3sFEd?tH z2n-ywE}qzfsk2f&=vZ+(!kY0-j0%)SbyS35ts3Pqc5pWWi0QmpHqeSH*Pq@}Nj50* zeMY3$DmIqgIJ*`&nS|KKT8?|~R~*h*`2@aF03n|s`-A9%cTD959e{`Sa>3Ssz{q!~ z!#v3&Odzd$>$PpxOHe~3qt(67?-}iTSgoSK52r3=MWkgH811ZHBbtd&7UjJAKFN4( zYMC&pUdX(;GRm`WXm;`9=ZcKuelB;uRQP(Gbs@#t2gB**7L+J1-|oNMJF=!zci{%u z;@!qMf3!dP;V!te*cK2cuWvVxQ|Z`5tQd8|26-fL(E$v~-|yWguTRA)km)FlB{rd- zWEg96%M97tVedAwV_|p&YAOY&@4LQZ{ouOJ>6pZ){XtC*JQC3+kY(H%lCAJ8XD6sJ%4xf?4Zaa7ob`_qYl+Dd`7)5*sB^a>}!K|w4;#eXXW^~gnj9I zvNbqM;u^*=YUBNT9E2uqzv!yoq@wH! zy|bAVlaVHx$z&RN_2E{;gS5C;)Di5ubLdW&9Cw*66I*Yw70Gdr_m*Uzr{q)RI+N|k zGl5>cdiDz~PQB=1VZOxV@KhQJK9s39+H^m_3SxqHrO;X}!1buBDG|hWvCxi!?J~w= zzl%vo*}Fc#!oShM!m7T2ulQ!u@E3>~oH1Tglh;W89gj9||9RqY7bJnTk)jY!Ohh(8 zsDA?1n(e{_OP;_`%F;`JIFGWQtHS1PJx_h`qKcn00ktyC{>J|B0iDFv%Ul0y z7;t1>Zlp=55|sF^VRt2^FRWkbmNNA$-k_RHr2f znBc|L0fYgj-B~x)201yNQpajM8H6z2NE;oY)4h!y?`KeY;oOKtE#7lJE4${okPP0j ziEM6wXsR!IK%1_MD5yErZyqT;PEl6XASgRWnq60^Nx|Bm;az0zuI8?Nw-aN;H5Br; z**z&i;n5{|->yf!{(bYnwlR}S@wTaki8&l6)=zfAK4#~ao1ast&1>o7>bne zgq`|JVZz<@Eat;)^anL$il&5$d--_fZWS%X^lOx(CXx+R=EcoZ#|6pEQqzAe$q8|U zU)h3)$;I@xrzLTaTxwwT(V+q~0Zt%6cXQa446Gy-p4M!!N0+WgFlHi;H^*~s&xD0Azf3sxs#YQ_cIT@|+1ss&lQp6DK)hE>mpixq;mi=_X22`OGavu`g#bSe`;Y0rydJ_n&naaf3h*;HF(fjSFqAT60O>pi1u#FJF`q%6F$XBhz|g|a zz}NsbiwQ&~gP9D|q;~$^8*_zm+Qdytv%;@1`toiA^TBF>O3JNR4hST#XNan6;eX+{ IOB`ed0L+FS%>V!Z literal 0 HcmV?d00001 From a8972e06c5e2f50e7b71737f562bb1812a4bf959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Batuhan=20Berk=20Ba=C5=9Fo=C4=9Flu?= Date: Fri, 5 Oct 2018 11:39:30 -0400 Subject: [PATCH 2/2] fixed some file inconsistencies --- .../.idea/caches/build_file_checksums.ser | Bin 537 -> 537 bytes OlympusServices/.idea/misc.xml | 10 +++++++--- OlympusServices/.idea/vcs.xml | 6 ------ .../uottawa/olympus/olympusservices/LogIn.java | 13 +++++++++++++ .../olympus/olympusservices/Welcome.java | 13 +++++++++++++ .../app/src/main/res/drawable/background.jpg | Bin 0 -> 2477 bytes .../app/src/main/res/layout/activity_log_in.xml | 16 ++++++++++++++++ .../src/main/res/layout/activity_welcome.xml | 16 ++++++++++++++++ OlympusServices/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- UML Class Diagram.docx | Bin 0 -> 25385 bytes 11 files changed, 68 insertions(+), 12 deletions(-) delete mode 100644 OlympusServices/.idea/vcs.xml create mode 100644 OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/LogIn.java create mode 100644 OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Welcome.java create mode 100644 OlympusServices/app/src/main/res/drawable/background.jpg create mode 100644 OlympusServices/app/src/main/res/layout/activity_log_in.xml create mode 100644 OlympusServices/app/src/main/res/layout/activity_welcome.xml create mode 100644 UML Class Diagram.docx diff --git a/OlympusServices/.idea/caches/build_file_checksums.ser b/OlympusServices/.idea/caches/build_file_checksums.ser index 13c68429351ab3060dda3e1af1251022286695e8..73af276a35eb0a7bf35435e70bcd09123bfbc0ed 100644 GIT binary patch delta 87 zcmV-d0I2_&1epYom;^-M&&83Pi4Q14I$TwAWpZ;|VqtW3Xp^=9Hj^a*LlD_W$tl{C t@OZ}J`o`JG_283u0UZ-KzTtb!tK4#gUU#&l?rnc`01=bF0UMJD0ukB)C^!HB delta 81 zcmV-X0IvU;1epYom;@oaYa@}IiIZvpLlDvnlNfphFxv%7LonB};9HZu0UaSB{&XT5 nK=U7(IQ~;;G$*cf04PH`Tvc;ra&ufsc42N|lQaP~lk5R4;+7sV diff --git a/OlympusServices/.idea/misc.xml b/OlympusServices/.idea/misc.xml index c0f68ed..e0d5b93 100644 --- a/OlympusServices/.idea/misc.xml +++ b/OlympusServices/.idea/misc.xml @@ -5,27 +5,31 @@ - + diff --git a/OlympusServices/.idea/vcs.xml b/OlympusServices/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/OlympusServices/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/LogIn.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/LogIn.java new file mode 100644 index 0000000..02ed1f3 --- /dev/null +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/LogIn.java @@ -0,0 +1,13 @@ +package com.uottawa.olympus.olympusservices; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class LogIn extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_log_in); + } +} diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Welcome.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Welcome.java new file mode 100644 index 0000000..8cf6848 --- /dev/null +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Welcome.java @@ -0,0 +1,13 @@ +package com.uottawa.olympus.olympusservices; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class Welcome extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_welcome); + } +} diff --git a/OlympusServices/app/src/main/res/drawable/background.jpg b/OlympusServices/app/src/main/res/drawable/background.jpg new file mode 100644 index 0000000000000000000000000000000000000000..498ab09110f5dba852b2ad77b5627c24059cc163 GIT binary patch literal 2477 zcmZ9H3s@578ppY5!a{)rlQc!KK+;e!!?F}2iCh9RXCCvCx{CIgGw(DlpiBjYrKy!9 zf)g)|nWtllm$a#58)e#U=55-%RhC(%WghaJvpvswzvp}Z@8$Qs-}fy)ULFP@*t_@a z1^|Ho0MNJq%l!Z`0BX7l0Y@OMD zPQXV!1N>GigOGuMn-DStK$f)w)nJy!6l`WH!&4FXz|%M}7;;vAfa-?l_>g5|))O{D zh8Z4(We^xLR=gQq&a*s)N7)E{a7NgE2McX4FFa`UGH0Jk$Z4KgCCEp8mS*ltWJSsD zLsuM|!NgOAPL|Y67JCoe;XXu!Kg(mt`GHD(1KhrQmBW1-p?$oo{62(*Kg!~T6ck~3 zmf1m(AC>`dA}r&3SkMt z6u0L(&OV4Lr605B2WeM!LYroDjy&bE$ri`M@3s@$9fz4qp!ml3WP_w`q~Gwj-qjDRJm&h>u3_uUach3c}xZrk?)ac{92)1axC$6ojV72#0tJT{#%~N(UR+)Eb zJQIg+M7-~iT6#4avbYyT$uWejNgik6;XieA;;!};L~TBv8694KtMT?#Y$ux&_tQ1@ z?!CPu1LINe-Y0D_=5K0yUdO~XIyo9a$(z~_C%3&F9?Zp1^b;fDT9Dk(ykq@|C9C?^ zhhr<)qBECgop)@y+Q%cOU$L+r^KP+Se3h_uYw%s1-){wruZT9&y(8n>#XGK;-`Pn2 zOe5Obuj$n(Sum#AR5S}u21TO?J}3y;$K&mx!h3QSQCl{$=!B8X@fK^3P21|j;8ufX z#P8FYx85qow5|FZ>9fp0QV?}-u!EfryRj)kufCpPD!Y2Pf%tN1tE*Mhyt~ckc0uBB z!F=r5tl5{fWyJQYv)WG=3OgROw$bO)FAb{~k|sYoRFXbcJN)qMU!@6Obt+}FJ@o9ZdtW6N0;yj!gURD(?9EO6;|Boq}>ZBOuu|Y$a{A9M)~W+ zL%q+&Z6>~Yud5Fjp&u*A9oc-T`aQ8F%*`Oo@JycUJm=&ZBoLDdqIoBqMoS=@3uE$z z*TV#s@BHV86E9N#sc08Cq(LWOiY{-tH)PJ_ZbXY-aaM7vCxvLeA#l!AugU1OoC`^_ ze~{whJ=&0+R?ByZ5GBqpSbZ_LFA>w~$U5|p<$301M@5s(luK|Av&LGa^d8chw9j9j zJ)yZCKazIGIH@(h}g2Fxlp%MGBFzj<3KL@r39Vie~}jMhT4Yts#@59c-f&eR5W8_`$>tL!_D8-;dePJap~n@; z?3#g(-x|t0x8;_1jUkWCI4lGHwe&;aUP*R&$ElvB(Ux1EhC21%xw<`d4o&w75g1Y* zZ`N&+m4zO@K`6xdq^4#^2Rci4NRE+m!Rw$DpaWy@s!uGB~Z z8C;}eB67dYltUG?kbaKuXo6(h8~&l`){Jutf>{&Xd=;%PiYv}NgXB|+{T^4{q9qWP z0jzSn*i3f`pIn^y^&&$%m&@-8_HWG3P@~^XoFH_CM;Pm)!0^eq6G7-ti%9oL?k8FG zi+kfWr02N8y?LE9*fLbFrnX`gr)M Un)XtSOge3XJQHGqa9n=!Z}lHGpa1{> literal 0 HcmV?d00001 diff --git a/OlympusServices/app/src/main/res/layout/activity_log_in.xml b/OlympusServices/app/src/main/res/layout/activity_log_in.xml new file mode 100644 index 0000000..56bab7a --- /dev/null +++ b/OlympusServices/app/src/main/res/layout/activity_log_in.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/OlympusServices/app/src/main/res/layout/activity_welcome.xml b/OlympusServices/app/src/main/res/layout/activity_welcome.xml new file mode 100644 index 0000000..9f3b32c --- /dev/null +++ b/OlympusServices/app/src/main/res/layout/activity_welcome.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/OlympusServices/build.gradle b/OlympusServices/build.gradle index 077cb2f..4e8009d 100644 --- a/OlympusServices/build.gradle +++ b/OlympusServices/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/OlympusServices/gradle/wrapper/gradle-wrapper.properties b/OlympusServices/gradle/wrapper/gradle-wrapper.properties index 0683d4e..d66f519 100644 --- a/OlympusServices/gradle/wrapper/gradle-wrapper.properties +++ b/OlympusServices/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Sep 28 14:59:51 EDT 2018 +#Fri Oct 05 11:36:36 EDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/UML Class Diagram.docx b/UML Class Diagram.docx new file mode 100644 index 0000000000000000000000000000000000000000..0cd4473d8bd67d73f8a3270726ef474a249515b8 GIT binary patch literal 25385 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