From a57bb50c607ac53e1ec6e3917a4e28fa10997672 Mon Sep 17 00:00:00 2001 From: Elchin Gasymov Date: Fri, 2 Aug 2024 10:31:41 +0300 Subject: [PATCH 01/46] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D1=80=D1=83=D0=B3=D0=BB=D1=83=D1=8E=20=D0=B8=20?= =?UTF-8?q?=D0=BA=D0=B2=D0=B0=D0=B4=D1=80=D0=B0=D1=82=D0=BD=D1=83=D1=8E=20?= =?UTF-8?q?=D0=BB=D0=B5=D0=B3=D0=B0=D1=81=D0=B8=20=D0=B8=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/mipmap-anydpi/ic_launcher.xml | 6 ------ .../main/res/mipmap-anydpi/ic_launcher_round.xml | 6 ------ app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 768 bytes app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 0 bytes .../main/res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 3174 bytes .../main/res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 486 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 0 bytes .../main/res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 1885 bytes .../main/res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 893 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 4271 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1393 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 6658 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1754 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 9729 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes 22 files changed, 12 deletions(-) delete mode 100644 app/src/main/res/mipmap-anydpi/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-anydpi/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml deleted file mode 100644 index 6f3b755bf50..00000000000 --- a/app/src/main/res/mipmap-anydpi/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml deleted file mode 100644 index 6f3b755bf50..00000000000 --- a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..628f97bf3411b49e9b22eead21ada1a533ff9f0c GIT binary patch literal 768 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2U^?#U;uum9_jcyStdKwv*Uz$U z${JCbQi7t~j?&!Rx+W6?KXQw(XzPmPFo|(45#T=9(7K2-kel}hBbQo4L}a9jqjSOx z3&)EOR|W4$%B>LJ*>5X!uI=hvp4WP9CdMWr-A9xDU*wC8_H9nN{b60>Avq(i-3vEJ zf140^gSYkWhW4IAc^YrpY*R$aoDekybU2C^*Cl=3Yu}!H7xcsGRuaaBY zyQ%J`oYg0QDjzogpQF_zwPW}0*E4T9^yI_DH&%T}MnIVS>2jg=KXlixS+enCcagJ(kKf&Ylf=Y!zr6gZ-_AJS z?8!0~VBG9zd93aiW-mG4_PW>aZ}Jm>ekuC$E6eKd^Jo*Zjn|&%8{C_6fGY7pX)18n f5$onH+Rwe5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..e5dc3cbb3e3a2cc83bbe5ec2361cacb1feffbf67 GIT binary patch literal 3174 zcmV-s44LzZP)_AoO6D^-@Uh$$zGr#geGu`2_P~qe&0)LT)-2tCc$6vcpwwL=cNP2WdZ~j zBOU|8&riWpW2IoFae~M2+!XQa!G=5Ln6R=kG||zBCJCRjZEQ`pH@J&!o88;&4efhv z4X(@h|F`X%-JN!)>+ziOFZ+y{C4G9v@>tK9IvK`%8$Z6xFqXY~ecD!rNh@ZU8Og$9 z%481sjG(jeg&PaSTL$*J4xP=}UV)(;$1pnV4K76FZ1dBc@=M5=xe#F}&r^qN^T?X6(jLx`j||&b9%2ed{wKXWO#^XX^kwhc%d2 zet8fB8pIH=%mW}=Z+=GWO+@VTKCrs6b~8+Rp}-aJVRU7bu#{fi;&#|KyUt@U!b~AR z2%I4@XJi=!&;XbjfCJjtg&rrH`|@=Lq1?wD1%}UffO7d9}RMu z<#~=~EQfSDqnYy%e0wpC+**ZV`N#In?R6N;697Yij1Wv1fW)Bq66~c7mO78GR;$O? zs2C5&`s;2bo_$UVN~vEQ^hgv2Ade{8($7D}*>uWcu_%eJ(SpRo$=}kRjkD$s2d96y z{t}F&0L02XAOLkoXRyp7zDF7o-;8Z_cNg0l+`T*;aiF0}IzX%hka}s_w1kTyGR>RM z9Nb@)lST|du~W5QprJ}?Kp0fBf(c#-+N zQkj~>MH$9AiC+XdTluM6vW7gAA`J+{H*VatPs_;uEkra|)>zv^fEkNu>n3Pp--! z2NXR(-cr-i#-lQ})Pe)#Ev=RXFr|mGrwUck1jK2OE49U3^g)yw*O&|HThB#$))Fh) zfcRMruZ_Nt1=Fzk(#o%CvGEH+DKqGoJ3G+vE055Lt3&H}vl|^cb_N|da5$h!-(2Pw zXc!{9f5;*Yow9(#5V+I?d#yi3B73&&?nHf0`%!;?=&IgOBMvew@mZwP8TN7%hAuPy z3PIl5>l&Ojoe+@JGuLPYzCP638(8bBHw_VF*n)H4C|RT5C}iPdh`o?E!B+eICy^*GQ0ed71QKM@ zP-^)7cWB+F_fdI8bwFA3i^Rc&ExydORLZBA0bFzQ?L&yWTA5XLMup4D4Z%oJUW?vw zqu1VLwdkFpFZBo&>?}5I`Ye<^%j%JMeB@%wOh*|z;^Wn{kO>cn5VKbOqu6s^d58c; zstf=85na9UnCP?XkNn2P3Kq}@AMQXGFE)E59uHAuO{7*crNH9Cg$v#?^YovMH?~Sy zUfmD-Jk7PeyVq}AtY85hK77olaf`=86SF~OMv)BP0_~N z85tRJK6yNgqCI=|Xzk9{4scY884NTQ0qH2y{cYQ}c^8a4pwp*Mo9y*%55UoJ4(Q>o zUAr>;0G&E@YWkeD%{|~G++_iO!&Uc#Ctg6EkNw8Q%Kh0fWU;O!ke;WbP3L?7iN{0K zpfR%qrA%AUg8}9E0cvV$$}naW_jq6IcYqPAtLuNBAYASazj3hu4nPuv6YJz4k+#y{M%K6g{iw0Aai$OunZ>qm-%evd9jvqC7tovy-`=mTt~POiywki|t(NQc z=3A_@;|~y7+F(F=Ro7b-3WdrC5C9+*o0VIB`76vqA>iWK zYE0G9#(m)Ecm-s0wxaAc=MMu5jtOgs-Iz_r%j|c-(eVkW?O8$X9W-P4{tti!$HW5& zXiZY9sZz1i;b^P?g3N*blfUUEGB5gQ1+WmG?jV;u;^N|r6k~R=4u{{U#}FXWpl7eU z-Y&P4Oa~U8{=*wbOi5A36X2{AWj0m-dHT<)v*$2_M4#;8jjOqMjfSpe9Uey+)ZiK@ zsJV^O-}u9CfWftE*Zgm;;!-Mh^5j=C@q+O_>vVXK#sVO|yzu&`GtuOL8>?dd%FAn6 zlkq<)oi24RI2>-7jRin3d)eymqM0j>9)j4j$_@g9fCjT!ygW($CY+z;92b8-B53X3 ze-M4rbb@Hlo_&7fVg(Cm$B}My?(aW(Bpwe|w))mVZvTa-qWa|!yTdU={}CB{M~kAU z)X%}`aI(=8~QdH@yA*PT^OKcMovEjd_#6(?<2a?3)CN&_oAwyZQa7^=m>x3AT zsip8e4awl}79*1>;lLK9N?nP2(gO$zZ)_!lBqboeA(QjWm0vw%Y&DQM7KNb@PRRS; zgD8>3$mMeQ<0tD+EIE7)WyNet07cI$|Z!IG}GbP}A z#NhB2!(A3JVihE7^yetrL;_?>&K&Z#BwRr3_JJ)aSm$IeKlE8_tilGqDh!JwnmJ;_ z^_v9WCT6g*lah4XamoF_@7+QL6)GSh7|5F0m0$m0d2Po>*f;nxFOy_h1inh%bA~hc zK$s@srpM_C2?>i;YW+#vz;UqrCYRjS7If*26cE`m)VGlt3VP0*4gW$JKmF?|m7x&6 zz&kxY-bl;zR`4q8#zrF%|0AJ*c4SX8u{wiX|XA}Gyiv=r3p-5VzQc(xBRBAh3Ga+wQ zfnZ<9|6mFE0TZIs86^XG<(CEkLV@$%0J$6tFd$3t{t18(DE0SH{-#?fx8iDh#;P0&TwGjnVxs!JWDR{5&w8!U(8<2en_Yqo zDnW1y3J-#n3&Gy0ptc2B-@buz%dfP~TygA7TFLhJUQuVjP8>4E0_CJq+2OMTe;H*I z897}dlO;e#rC`AwTeC2%`AVg#5@*(qXQ%h z)_v2Jx9*xNcWv{{?A2$l%vgT#NZOK*cj#>!D&Pu|oa<{|bm;}FquypCtDR3(?2p+?8Fb1#TUi(7q|0F+uFI{w0F8}}l M07*qoM6N<$g4;<7#Q*>R literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2898 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 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..ab42cf9937d996ff7329b3fe422ac0047333e38e GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(Fs}741Is)oo?D#P5`kA}nI&`ikH)e08mdY$|-! z9@g3~xvniz!=u0I*xN&ox?^CTsL=!fw{be3IoS?lu*+_gFv4JGjI7 zm~7GZggc6l`F2Jdyqi$ien(fL{KO7t9NIq0d_NZY`Hxlqp8ATOJ2&q1xjh9Mwz$Y< zPhI}2UGJVG?2zw0HE}nq`_qboP}8f=!=IE`_1?KD>$cOzgiC=bL-jr%wxy z{#hvwv~%94Cuz&}v)*s&VL$x7ug`z+_9;Lo_($?-urnMB{#$E@W_YZ5n(-;afr?Z0^#^WM?Vss0FY2dQip`HtX8E?e=ep)= j66Grr1B1IY{sXTdr|_GPnZaei_+#*N^>bP0l+XkK!*APC literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!Tt1+yrAPkj4TP+U{aZgCRB=Loks< zGzgKT{UHXM`UgmqL@6r|8(g$e3$`mr)9nihR2vPX?T+W%xp#J$*~jdbHuNN4cQZ3P z=lkZKbMCo!YBEjHBuO#@<^t02Q+r-(>TB`0+VeAJ;Cv2Xp7uBz9M1v>06PVK&(dCp zhWEgGX^&5zHA{0Un;$0b@`aYTy+hmGzTu-4-of*3Zz$;Y4UD+F!}mn112F;!TCJt$ z1*_wzC_1)Vt&Sz?dzeg>c+cq-;;fa@*!Rl1+ga|tgVk>D;90dWv)%o?_ zeiuvFRKn)b2v9^olG`T=#FD28$C&ekI_?|$J1K#2EumzgCzTvnV)KISiYYQv>t}2h zIa~G*OGXX@=`udyI?CEQXB*L+;N2T%caYOk2!bKfP10bWoaV0fs&ZM7bLR|HI zXDOkiV}H5@uw3Byl5b5k2MBkGE<)DsxK;*XGlpbR8G)Uj+?I}iGpfUfhd$E5>w8N_ zFfo*hG?vR3ucQLz;vczm?*6@ohR>7}R}DRpDIttuRKOS2Q2}Yn2vqC|eufT{sry%Z z|0N;u*XRS?Iff`C2)ep{Q9??4E;i&*;Q8WKpiGvs$Q{k>s=sjo9nJ;;kO!B6bEK4Z zbaZ678g2#A;cO7V3ne!W95|4p20&5Pxb-nB1UTR5xqbNX;Zj9FQ&UrpDB6Rv(^(*3*KaqftE&qX0buiC z1TM->A9DflxwhuVPT-tLnA4_c9!w4`veU;~0CdaJs;%cf2hO;^I*+vyW{ah8H+72r zw|3(xDrQoE+~N#|D;oNwWiNlZ7db!FN@QnS%Aw=?TXt-06lPWc#{ZDCzOMHl+cR%( zK+Z4$lM!I;bQUj`oI|JT{h4@}Nda!!;;-Iz$q!tgq~R}fXL(?;h%}+)!+htnN7`E zWn`hez+$oP!@U^M;3y=5j!cpu$*Vm5mUob&_WcAirbvKxHGs~I=0ZGZ38erM`)jse z{0X=f5{90(Slf(b6y|4V=T$){JwO6e4W%fAjH3ZVX9!w{>ko>bZSo*DXKf(H#+G74 zM0TEqdmoo?qP&bVR92%wN6H{**@V!!DJ|W6{2+3Q6*^kO(u6}K<`;-3s0iHBNJ)g2 zm=RF&lQ?Ou@O*U=xj@{^Rc|~eGRy}YDto>~JViyM6i!-l2|>dK$v?H_%o*U|AY5X{ zeN4k2%mJJDNb+4i?lWApoDq$1L%;bh96Yc~o&&}uG<+!3= zl@NwWxe<&&{mPZVH$a*)0uY1YvbN?*Z`n&n-h+FuKp!hTZRyD*Y!XIZE?`LUkXPk7 zIov*I!~M_%j>=+mf@Gou^wn%*zl5`@bJw-eRj+;LU;M(MeQBANa`~Qy>im?=Ooe0s zIKa}(%tf1Wa|`xE#X4EQ6?SrbagY;AhIqkt$60s%&bnQ{4y~*GIk;xqh0YaQPMs`! z@#FpZWt%s_Z*gYqC~g5cb^apQAURaMU;@H-yE zbMzX#7JoxlRZ$wVnKSIkabeNj-JRanhOtWo;ppK1KRiK!-|<))UV|$s{EccYlCu2| XFA#UIY&~0d00000NkvXXu0mjfxGH@p literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611da081676d42f6c3f78a2c91e7bcedddedb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1772 zcmVQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..526849947461efc5629d07e9db6b2f00c9fe9bf2 GIT binary patch literal 893 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V0Q6zaSW-5dpmn?mPmpK>t`7) zjjmfNi!@kzTbFF??Cn?3@X$Fj-^sE02Ahz8^ucrN9XC4kr?7|^)r_Da&h;$|*BM<2eW#tc zVl_|c)Zbnbue6+FpAJrGEARJvZqB`P`;XmJZSC^qMK7OyGB~9JbZnoIw|&js*>B#z zmtPq@e?QOSGePgPA8KqiVV`lDu`de7{=J>O;>W+^^Ob!b|N8YTGdk z0SyaTJ=^>9?o@3oJ|TVnSou_*wKkQn?mYR^`qO!yU2$Q>b;a*f4YnNaT^oNm|Lbdi z`*x6$m>ng#Klb(ZmLJ~D2MSNwXAG=7Zw=Tr5;EE?9T=Uh&oFXH+)CsNIBCUmvF&%l4`J0rg88_V z>c>aQ{PQx|Ur<^Re)7Vp*Z%+i{e8LMw0?P8xolB9r*mxTiq$~t1HvU=X#stGB@~!o pYE^-0WZ}BOEPWrG*8k7GzvEynYvJ-+Zoq8C;OXk;vd$@?2>^(TpcDWA literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070fe34c611c42c0d3ad3013a0dce358be0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..f854e7187d74ace813335c77886f84911a0a7f37 GIT binary patch literal 4271 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 M07*qoM6N<$g5V{%0{{R3 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f5083623b375139afb391af71cc533a7dd37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5914 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeN4tMTI|sD|unAj*5afsyq%P==HL zZO~7Ka~5((Cw{n~HdOprmr=&G!5MZGUoe{rz&KSMjH}VW1>f zU@YIjpJ2mw=M4J;W{G}A^UsVw7>*?$I9tPD*YI&5q#yI&d2@4fynkQgJiEUipX^q% z>sU7Z|CRIipNHC2|9SM}_F7QfKS;Asj)PUhjUcen0Q%X!$WT%2X_MM)A3w c$#3lMF#cu@VLBQPtg{$AUHx3vIVCg!0Dagc*8l(j literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d6427e6fa1074b79ccd52ef67ac15c5637e85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3844 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae37cbc3587421d6889eadd1d91fbf1994d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7778 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s From ac63b454d132b7330aead93a0bdf55306f439013 Mon Sep 17 00:00:00 2001 From: Andrei <116720914+AnShok@users.noreply.github.com> Date: Fri, 2 Aug 2024 11:07:21 +0300 Subject: [PATCH 02/46] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D1=8B=D0=B5=20?= =?UTF-8?q?=D1=84=D1=80=D0=B0=D0=B3=D0=BC=D0=B5=D0=BD=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 ++++ app/src/main/res/layout/activity_root.xml | 14 +++++++++++--- app/src/main/res/layout/fragment_favorites.xml | 7 +++++++ app/src/main/res/layout/fragment_filter.xml | 7 +++++++ app/src/main/res/layout/fragment_search.xml | 7 +++++++ app/src/main/res/layout/fragment_team.xml | 7 +++++++ .../main/res/navigation/main_navigation_graph.xml | 6 ++++++ gradle/libs.versions.toml | 3 +++ 8 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/layout/fragment_favorites.xml create mode 100644 app/src/main/res/layout/fragment_filter.xml create mode 100644 app/src/main/res/layout/fragment_search.xml create mode 100644 app/src/main/res/layout/fragment_team.xml create mode 100644 app/src/main/res/navigation/main_navigation_graph.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c0e251eff8e..d17b1548256 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -55,4 +55,8 @@ dependencies { androidTestImplementation(libs.uiTests.junitExt) androidTestImplementation(libs.uiTests.espressoCore) // endregion + + // Navigation Component libraries + implementation(libs.navigation.fragment.ktx) + implementation(libs.navigation.ui.ktx) } diff --git a/app/src/main/res/layout/activity_root.xml b/app/src/main/res/layout/activity_root.xml index ea46b92d7b9..a8c59d315e7 100644 --- a/app/src/main/res/layout/activity_root.xml +++ b/app/src/main/res/layout/activity_root.xml @@ -1,10 +1,18 @@ + android:orientation="vertical"> + + - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_favorites.xml b/app/src/main/res/layout/fragment_favorites.xml new file mode 100644 index 00000000000..fbdd146ffc5 --- /dev/null +++ b/app/src/main/res/layout/fragment_favorites.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/layout/fragment_filter.xml b/app/src/main/res/layout/fragment_filter.xml new file mode 100644 index 00000000000..fbdd146ffc5 --- /dev/null +++ b/app/src/main/res/layout/fragment_filter.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml new file mode 100644 index 00000000000..fbdd146ffc5 --- /dev/null +++ b/app/src/main/res/layout/fragment_search.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/layout/fragment_team.xml b/app/src/main/res/layout/fragment_team.xml new file mode 100644 index 00000000000..fbdd146ffc5 --- /dev/null +++ b/app/src/main/res/layout/fragment_team.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/navigation/main_navigation_graph.xml b/app/src/main/res/navigation/main_navigation_graph.xml new file mode 100644 index 00000000000..6b1faef4bfd --- /dev/null +++ b/app/src/main/res/navigation/main_navigation_graph.xml @@ -0,0 +1,6 @@ + + + + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4518ee4f7a7..8f4272a0d15 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,7 @@ java = "VERSION_1_8" # Build constants minSdk = "26" compileSdk = "34" +navigationFragmentKtx = "2.7.7" targetSdk = "33" # Detekt @@ -14,6 +15,8 @@ detektTwitterComposeRules ="0.0.26" [libraries] # Detekt +navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationFragmentKtx" } +navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationFragmentKtx" } staticAnalysis-detektPlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } staticAnalysis-detektCli = { module = "io.gitlab.arturbosch.detekt:detekt-cli", version.ref = "detekt" } staticAnalysis-detektApi = { module = "io.gitlab.arturbosch.detekt:detekt-api", version.ref = "detekt" } From efd902f001bea638a723a945f86099f46c3a139f Mon Sep 17 00:00:00 2001 From: Vitaliy Molodanov <53826004+Logomann@users.noreply.github.com> Date: Fri, 2 Aug 2024 11:36:53 +0300 Subject: [PATCH 03/46] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BC=D0=B0=D0=BD=D0=B8=D1=84=D0=B5=D1=81=D1=82,=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=BE=D0=B1=D1=85=D0=BE=D0=B4=D0=B8=D0=BC=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D0=B3=D1=80=D0=B0=D0=B4=D0=BB,=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20App?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 16 +++++++++- app/src/main/AndroidManifest.xml | 10 ++++-- .../ru/practicum/android/diploma/util/App.kt | 6 ++++ build-logic/checks/build.gradle.kts | 2 +- build-logic/gradle-ext/build.gradle.kts | 2 +- build.gradle.kts | 5 +-- gradle/libs.versions.toml | 31 ++++++++++++++++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 8 files changed, 61 insertions(+), 13 deletions(-) create mode 100644 app/src/main/java/ru/practicum/android/diploma/util/App.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c0e251eff8e..1d44f401436 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -2,6 +2,7 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") id("ru.practicum.android.diploma.plugins.developproperties") + id("com.google.devtools.ksp") } android { @@ -36,16 +37,29 @@ android { buildFeatures { buildConfig = true + viewBinding = true } } dependencies { implementation(libs.androidX.core) implementation(libs.androidX.appCompat) - + ksp(libs.room.compiler) + implementation(libs.room.runtime) + implementation(libs.room.ktx) + implementation(libs.kotlinx.coroutines.android) + implementation(libs.fragment.ktx) // UI layer libraries implementation(libs.ui.material) implementation(libs.ui.constraintLayout) + implementation(libs.glide) + implementation(libs.retrofit) + implementation(libs.gson) + implementation(libs.converter.gson) + implementation(libs.koin.android) + implementation(libs.navigation.fragment.ktx) + implementation(libs.navigation.ui.ktx) + annotationProcessor(libs.compiler) // region Unit tests testImplementation(libs.unitTests.junit) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 267e2845990..5042b8406a1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,11 @@ + + + + android:screenOrientation="portrait" + android:exported="true" + tools:ignore="DiscouragedApi,LockedOrientationActivity"> @@ -23,4 +29,4 @@ - \ No newline at end of file + diff --git a/app/src/main/java/ru/practicum/android/diploma/util/App.kt b/app/src/main/java/ru/practicum/android/diploma/util/App.kt new file mode 100644 index 00000000000..5fe18753c5f --- /dev/null +++ b/app/src/main/java/ru/practicum/android/diploma/util/App.kt @@ -0,0 +1,6 @@ +package ru.practicum.android.diploma.util + +import android.app.Application + +class App : Application() { +} diff --git a/build-logic/checks/build.gradle.kts b/build-logic/checks/build.gradle.kts index c8b1c9a17bb..ef439d52888 100644 --- a/build-logic/checks/build.gradle.kts +++ b/build-logic/checks/build.gradle.kts @@ -10,4 +10,4 @@ dependencies { implementation(libs.staticAnalysis.detektPlugin) // workaround for https://github.com/gradle/gradle/issues/15383 implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) -} \ No newline at end of file +} diff --git a/build-logic/gradle-ext/build.gradle.kts b/build-logic/gradle-ext/build.gradle.kts index 6092d7fdcf7..eead1fc5117 100644 --- a/build-logic/gradle-ext/build.gradle.kts +++ b/build-logic/gradle-ext/build.gradle.kts @@ -7,4 +7,4 @@ group = "ru.practicum.android.buildlogic" dependencies { // workaround for https://github.com/gradle/gradle/issues/15383 implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) -} \ No newline at end of file +} diff --git a/build.gradle.kts b/build.gradle.kts index 541a66836c9..b70254d3981 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.1.4" apply false - id("org.jetbrains.kotlin.android") version "1.9.21" apply false + id("com.android.application") version "8.5.1" apply false + id("org.jetbrains.kotlin.android") version "2.0.0" apply false id("convention.detekt") + id("com.google.devtools.ksp") version "2.0.0-1.0.21" apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4518ee4f7a7..0d6fbf09205 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,18 @@ [versions] +fragmentKtx = "1.8.2" +glide = "4.14.2" +gson = "2.11.0" java = "VERSION_1_8" # Build constants +koinAndroid = "3.5.6" +kotlinxCoroutinesAndroid = "1.7.3" minSdk = "26" compileSdk = "34" +navigationFragmentKtx = "2.7.7" +retrofit = "2.11.0" +roomCompiler = "2.6.1" targetSdk = "33" # Detekt @@ -14,6 +22,19 @@ detektTwitterComposeRules ="0.0.26" [libraries] # Detekt +compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glide" } +converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" } +fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtx" } +glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" } +gson = { module = "com.google.code.gson:gson", version.ref = "gson" } +koin-android = { module = "io.insert-koin:koin-android", version.ref = "koinAndroid" } +kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" } +navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationFragmentKtx" } +navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationFragmentKtx" } +retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" } +room-compiler = { module = "androidx.room:room-compiler", version.ref = "roomCompiler" } +room-ktx = { module = "androidx.room:room-ktx", version.ref = "roomCompiler" } +room-runtime = { module = "androidx.room:room-runtime", version.ref = "roomCompiler" } staticAnalysis-detektPlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } staticAnalysis-detektCli = { module = "io.gitlab.arturbosch.detekt:detekt-cli", version.ref = "detekt" } staticAnalysis-detektApi = { module = "io.gitlab.arturbosch.detekt:detekt-api", version.ref = "detekt" } @@ -23,18 +44,18 @@ staticAnalysis-detektLibraries = { module = "io.gitlab.arturbosch.detekt:detekt- staticAnalysis-detektTwitterComposeRules = { module = "com.twitter.compose.rules:detekt", version.ref = "detektTwitterComposeRules" } # AndroidX -androidX-core = "androidx.core:core-ktx:1.12.0" -androidX-appCompat = "androidx.appcompat:appcompat:1.6.1" +androidX-core = "androidx.core:core-ktx:1.13.1" +androidX-appCompat = "androidx.appcompat:appcompat:1.7.0" # UI layer libraries -ui-material = "com.google.android.material:material:1.10.0" +ui-material = "com.google.android.material:material:1.12.0" ui-constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4" # Unit tests unitTests-junit = "junit:junit:4.13.2" # UI tests -uiTests-junitExt = "androidx.test.ext:junit:1.1.5" -uiTests-espressoCore = "androidx.test.espresso:espresso-core:3.5.1" +uiTests-junitExt = "androidx.test.ext:junit:1.2.1" +uiTests-espressoCore = "androidx.test.espresso:espresso-core:3.6.1" [bundles] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4a2256c8011..e44bf76891f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Nov 12 02:07:38 ALMT 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 76374f6ff4f4a6cf75c44695d2ed7702a311a5f7 Mon Sep 17 00:00:00 2001 From: Andrei <116720914+AnShok@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:07:24 +0300 Subject: [PATCH 04/46] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D1=8B=20?= =?UTF-8?q?=D1=84=D1=80=D0=B0=D0=B3=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлен фрагмент "Вакансия" экрана описания вакансии --- app/build.gradle.kts | 1 + .../diploma/ui/fragment/FavouritesFragment.kt | 19 ++++++++++++++++++ .../diploma/ui/fragment/FilterFragment.kt | 19 ++++++++++++++++++ .../diploma/ui/fragment/SearchFragment.kt | 20 +++++++++++++++++++ .../diploma/ui/fragment/TeamFragment.kt | 19 ++++++++++++++++++ .../diploma/ui/fragment/VacancyFragment.kt | 19 ++++++++++++++++++ app/src/main/res/layout/activity_root.xml | 4 +++- ..._favorites.xml => fragment_favourites.xml} | 0 app/src/main/res/layout/fragment_vacancy.xml | 6 ++++++ .../res/navigation/main_navigation_graph.xml | 4 ++-- 10 files changed, 108 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt create mode 100644 app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt create mode 100644 app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt create mode 100644 app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt create mode 100644 app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt rename app/src/main/res/layout/{fragment_favorites.xml => fragment_favourites.xml} (100%) create mode 100644 app/src/main/res/layout/fragment_vacancy.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d17b1548256..30b7ab52e12 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -59,4 +59,5 @@ dependencies { // Navigation Component libraries implementation(libs.navigation.fragment.ktx) implementation(libs.navigation.ui.ktx) + } diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt new file mode 100644 index 00000000000..b2cdd8aa50e --- /dev/null +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt @@ -0,0 +1,19 @@ +package ru.practicum.android.diploma.ui.fragment + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import ru.practicum.android.diploma.R + +class FavouritesFragment: Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_favourites, container, false) + } +} diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt new file mode 100644 index 00000000000..444026afe9c --- /dev/null +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt @@ -0,0 +1,19 @@ +package ru.practicum.android.diploma.ui.fragment + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import ru.practicum.android.diploma.R + +class FilterFragment: Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_filter, container, false) + } +} diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt new file mode 100644 index 00000000000..608b786ae1b --- /dev/null +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt @@ -0,0 +1,20 @@ +package ru.practicum.android.diploma.ui.fragment + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import ru.practicum.android.diploma.R + +class SearchFragment : Fragment(){ + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_search, container, false) + } + +} diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt new file mode 100644 index 00000000000..fc69c039b44 --- /dev/null +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt @@ -0,0 +1,19 @@ +package ru.practicum.android.diploma.ui.fragment + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import ru.practicum.android.diploma.R + +class TeamFragment: Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_team, container, false) + } +} diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt new file mode 100644 index 00000000000..0f4f5ecc360 --- /dev/null +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt @@ -0,0 +1,19 @@ +package ru.practicum.android.diploma.ui.fragment + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import ru.practicum.android.diploma.R + +class VacancyFragment: Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_vacancy, container, false) + } +} diff --git a/app/src/main/res/layout/activity_root.xml b/app/src/main/res/layout/activity_root.xml index a8c59d315e7..4c0b47f5544 100644 --- a/app/src/main/res/layout/activity_root.xml +++ b/app/src/main/res/layout/activity_root.xml @@ -1,6 +1,7 @@ @@ -12,7 +13,8 @@ android:layout_height="0dp" android:layout_weight="1" app:defaultNavHost="true" - app:navGraph="@navigation/main_navigation_graph" /> + app:navGraph="@navigation/main_navigation_graph" + tools:ignore="MissingConstraints" /> + + + diff --git a/app/src/main/res/navigation/main_navigation_graph.xml b/app/src/main/res/navigation/main_navigation_graph.xml index 6b1faef4bfd..9e494838cd7 100644 --- a/app/src/main/res/navigation/main_navigation_graph.xml +++ b/app/src/main/res/navigation/main_navigation_graph.xml @@ -1,6 +1,6 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/main_navigation_graph"> From e9d387ae8743bf0553aca47eb62329cf8f1426a2 Mon Sep 17 00:00:00 2001 From: Elchin Gasymov Date: Fri, 2 Aug 2024 12:23:23 +0300 Subject: [PATCH 05/46] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D1=80=D1=83=D0=B3=D0=BB=D1=83=D1=8E=20=D0=B8=20?= =?UTF-8?q?=D0=BA=D0=B2=D0=B0=D0=B4=D1=80=D0=B0=D1=82=D0=BD=D1=83=D1=8E=20?= =?UTF-8?q?=D0=BB=D0=B5=D0=B3=D0=B0=D1=81=D0=B8=20=D0=B8=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 267e2845990..4f5aa046033 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,5 +22,5 @@ - - \ No newline at end of file + + From f0eab54be4165b4edecc6fdfe75db0cfe4cbe6b2 Mon Sep 17 00:00:00 2001 From: Elchin Gasymov Date: Fri, 2 Aug 2024 12:32:06 +0300 Subject: [PATCH 06/46] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D1=80=D1=83=D0=B3=D0=BB=D1=83=D1=8E=20=D0=B8=20?= =?UTF-8?q?=D0=BA=D0=B2=D0=B0=D0=B4=D1=80=D0=B0=D1=82=D0=BD=D1=83=D1=8E=20?= =?UTF-8?q?=D0=BB=D0=B5=D0=B3=D0=B0=D1=81=D0=B8=20=D0=B8=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4f5aa046033..8ec0bc1e84a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,5 +22,4 @@ - From 6109e952c0e0ac89cd58cbe9972700f57ad5cbe3 Mon Sep 17 00:00:00 2001 From: Andrei <116720914+AnShok@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:35:23 +0300 Subject: [PATCH 07/46] =?UTF-8?q?=D0=9D=D0=B0=20=D0=B2=D1=81=D0=B5=20?= =?UTF-8?q?=D1=84=D1=80=D0=B0=D0=B3=D0=BC=D0=B5=D0=BD=D1=82=D1=8B=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20TextView=20=D1=81?= =?UTF-8?q?=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC=20?= =?UTF-8?q?=D1=87=D1=82=D0=BE=20=D0=B7=D0=B0=20=D1=8D=D0=BA=D1=80=D0=B0?= =?UTF-8?q?=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FavouritesFragment.kt | 2 +- .../{fragment => fragments}/FilterFragment.kt | 2 +- .../{fragment => fragments}/SearchFragment.kt | 2 +- .../{fragment => fragments}/TeamFragment.kt | 2 +- .../VacancyFragment.kt | 2 +- app/src/main/res/layout/activity_root.xml | 10 +--------- .../main/res/layout/fragment_favourites.xml | 14 +++++++++++++- app/src/main/res/layout/fragment_filter.xml | 14 +++++++++++++- app/src/main/res/layout/fragment_search.xml | 14 +++++++++++++- app/src/main/res/layout/fragment_team.xml | 14 +++++++++++++- app/src/main/res/layout/fragment_vacancy.xml | 19 ++++++++++++++++--- 11 files changed, 74 insertions(+), 21 deletions(-) rename app/src/main/java/ru/practicum/android/diploma/ui/{fragment => fragments}/FavouritesFragment.kt (90%) rename app/src/main/java/ru/practicum/android/diploma/ui/{fragment => fragments}/FilterFragment.kt (90%) rename app/src/main/java/ru/practicum/android/diploma/ui/{fragment => fragments}/SearchFragment.kt (90%) rename app/src/main/java/ru/practicum/android/diploma/ui/{fragment => fragments}/TeamFragment.kt (90%) rename app/src/main/java/ru/practicum/android/diploma/ui/{fragment => fragments}/VacancyFragment.kt (90%) diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FavouritesFragment.kt similarity index 90% rename from app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt rename to app/src/main/java/ru/practicum/android/diploma/ui/fragments/FavouritesFragment.kt index b2cdd8aa50e..1a608757169 100644 --- a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FavouritesFragment.kt @@ -1,4 +1,4 @@ -package ru.practicum.android.diploma.ui.fragment +package ru.practicum.android.diploma.ui.fragments import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt similarity index 90% rename from app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt rename to app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt index 444026afe9c..3725b765859 100644 --- a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt @@ -1,4 +1,4 @@ -package ru.practicum.android.diploma.ui.fragment +package ru.practicum.android.diploma.ui.fragments import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/SearchFragment.kt similarity index 90% rename from app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt rename to app/src/main/java/ru/practicum/android/diploma/ui/fragments/SearchFragment.kt index 608b786ae1b..1097201c5e3 100644 --- a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/SearchFragment.kt @@ -1,4 +1,4 @@ -package ru.practicum.android.diploma.ui.fragment +package ru.practicum.android.diploma.ui.fragments import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/TeamFragment.kt similarity index 90% rename from app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt rename to app/src/main/java/ru/practicum/android/diploma/ui/fragments/TeamFragment.kt index fc69c039b44..d990fd772bc 100644 --- a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/TeamFragment.kt @@ -1,4 +1,4 @@ -package ru.practicum.android.diploma.ui.fragment +package ru.practicum.android.diploma.ui.fragments import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/VacancyFragment.kt similarity index 90% rename from app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt rename to app/src/main/java/ru/practicum/android/diploma/ui/fragments/VacancyFragment.kt index 0f4f5ecc360..ce0dcfa2eae 100644 --- a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/VacancyFragment.kt @@ -1,4 +1,4 @@ -package ru.practicum.android.diploma.ui.fragment +package ru.practicum.android.diploma.ui.fragments import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/res/layout/activity_root.xml b/app/src/main/res/layout/activity_root.xml index 4c0b47f5544..c8cda858f00 100644 --- a/app/src/main/res/layout/activity_root.xml +++ b/app/src/main/res/layout/activity_root.xml @@ -16,14 +16,6 @@ app:navGraph="@navigation/main_navigation_graph" tools:ignore="MissingConstraints" /> - + diff --git a/app/src/main/res/layout/fragment_favourites.xml b/app/src/main/res/layout/fragment_favourites.xml index fbdd146ffc5..fd84f6f218f 100644 --- a/app/src/main/res/layout/fragment_favourites.xml +++ b/app/src/main/res/layout/fragment_favourites.xml @@ -1,7 +1,19 @@ + android:layout_height="match_parent" + android:gravity="center" + tools:context=".ui.fragments.FavouritesFragment"> + + diff --git a/app/src/main/res/layout/fragment_filter.xml b/app/src/main/res/layout/fragment_filter.xml index fbdd146ffc5..48b477282e3 100644 --- a/app/src/main/res/layout/fragment_filter.xml +++ b/app/src/main/res/layout/fragment_filter.xml @@ -1,7 +1,19 @@ + android:layout_height="match_parent" + android:gravity="center" + tools:context=".ui.fragments.FilterFragment"> + + diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index fbdd146ffc5..e025558e681 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -1,7 +1,19 @@ + android:layout_height="match_parent" + android:gravity="center" + tools:context=".ui.fragments.SearchFragment"> + + diff --git a/app/src/main/res/layout/fragment_team.xml b/app/src/main/res/layout/fragment_team.xml index fbdd146ffc5..7fa02b68368 100644 --- a/app/src/main/res/layout/fragment_team.xml +++ b/app/src/main/res/layout/fragment_team.xml @@ -1,7 +1,19 @@ + android:layout_height="match_parent" + android:gravity="center" + tools:context=".ui.fragments.TeamFragment"> + + diff --git a/app/src/main/res/layout/fragment_vacancy.xml b/app/src/main/res/layout/fragment_vacancy.xml index 13544084861..c0d0b7432d2 100644 --- a/app/src/main/res/layout/fragment_vacancy.xml +++ b/app/src/main/res/layout/fragment_vacancy.xml @@ -1,6 +1,19 @@ - + android:layout_height="match_parent" + android:gravity="center" + tools:context=".ui.fragments.TeamFragment"> - + + + From 417441b79e3af4ee7524dd27df6ae657b18afc01 Mon Sep 17 00:00:00 2001 From: Vitaliy Molodanov <53826004+Logomann@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:44:50 +0300 Subject: [PATCH 08/46] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BC=D0=B0=D0=BD=D0=B8=D1=84=D0=B5=D1=81=D1=82,=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=BE=D0=B1=D1=85=D0=BE=D0=B4=D0=B8=D0=BC=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D0=B3=D1=80=D0=B0=D0=B4=D0=BB,=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20App?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/ru/practicum/android/diploma/util/App.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/ru/practicum/android/diploma/util/App.kt b/app/src/main/java/ru/practicum/android/diploma/util/App.kt index 5fe18753c5f..98649fc8f46 100644 --- a/app/src/main/java/ru/practicum/android/diploma/util/App.kt +++ b/app/src/main/java/ru/practicum/android/diploma/util/App.kt @@ -2,5 +2,5 @@ package ru.practicum.android.diploma.util import android.app.Application -class App : Application() { -} +class App : Application() + From 1de463b34e09a9492d65e4ee775d7efe6e413626 Mon Sep 17 00:00:00 2001 From: Andrei <116720914+AnShok@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:56:50 +0300 Subject: [PATCH 09/46] =?UTF-8?q?=D0=97=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B3=D1=80=D0=B0=D1=84=20=D0=BD=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=B3=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправлена ошибка в layout vacancy_fragment --- app/src/main/res/layout/fragment_vacancy.xml | 2 +- .../res/navigation/main_navigation_graph.xml | 39 ++++++++++++++++++- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/fragment_vacancy.xml b/app/src/main/res/layout/fragment_vacancy.xml index c0d0b7432d2..96baba93ac7 100644 --- a/app/src/main/res/layout/fragment_vacancy.xml +++ b/app/src/main/res/layout/fragment_vacancy.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - tools:context=".ui.fragments.TeamFragment"> + tools:context=".ui.fragments.VacancyFragment"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/main_navigation_graph" + app:startDestination="@id/main_screen"> + + + + + + + + + From c9261789b60066fcc12b3c67db3649e59e1f7fd6 Mon Sep 17 00:00:00 2001 From: Andrei <116720914+AnShok@users.noreply.github.com> Date: Fri, 2 Aug 2024 13:40:26 +0300 Subject: [PATCH 10/46] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=D0=B0=20=D1=81=20?= =?UTF-8?q?=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B8=D1=81?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=BE=D0=B2=20=D0=B8=20?= =?UTF-8?q?=D0=B2=D0=B0=D0=BA=D0=B0=D0=BD=D1=81=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/diploma/ui/fragments/FilterFragment.kt | 10 ++++++++++ .../android/diploma/ui/fragments/SearchFragment.kt | 14 ++++++++++++++ .../diploma/ui/fragments/VacancyFragment.kt | 10 ++++++++++ app/src/main/res/layout/fragment_filter.xml | 6 ++++++ app/src/main/res/layout/fragment_search.xml | 12 ++++++++++++ app/src/main/res/layout/fragment_vacancy.xml | 5 +++++ 6 files changed, 57 insertions(+) diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt index 3725b765859..7361b2163ea 100644 --- a/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt @@ -4,7 +4,9 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.Button import androidx.fragment.app.Fragment +import androidx.navigation.fragment.findNavController import ru.practicum.android.diploma.R class FilterFragment: Fragment() { @@ -16,4 +18,12 @@ class FilterFragment: Fragment() { ): View { return inflater.inflate(R.layout.fragment_filter, container, false) } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + view.findViewById