From 12ddde2eb048e1881f6b3fc9636f0ae4fe8aa87c Mon Sep 17 00:00:00 2001 From: Bilal Date: Sun, 30 Jun 2024 23:29:32 +0530 Subject: [PATCH] - Modified the like and favourite image. - Resized the images - Added Icon coloring dynamically - Fixed issue of constraint breaking for Season Cells - Fixed issue of TableHeight - Updated MyList Icons, also modified the click handler - Fixed the issue of favourite remove in my list screen - finalised mylist refresh, when user goes from mylist to seasons. --- WOKA.xcodeproj/project.pbxproj | 2 +- WOKA/{Helpers => Assets}/AssetColor.swift | 1 + .../ImageDarkBlue.colorset/Contents.json | 38 ++++ .../FavouriteAdd.imageset/Contents.json | 26 +++ .../FavouriteAdd.imageset/FavouriteRemove.png | Bin 0 -> 1185 bytes .../FavouriteRemove@2x.png | Bin 0 -> 2468 bytes .../FavouriteRemove@3x.png | Bin 0 -> 2860 bytes .../FavouriteRemove.imageset/Contents.json | 26 +++ .../FavouriteRemove.imageset/FavouriteAdd.png | Bin 0 -> 1543 bytes .../FavouriteAdd@2x.png | Bin 0 -> 3816 bytes .../FavouriteAdd@3x.png | Bin 0 -> 4417 bytes .../WebSeries/LikeAdd.imageset/Contents.json | 26 +++ .../WebSeries/LikeAdd.imageset/likeAdd.png | Bin 0 -> 979 bytes .../WebSeries/LikeAdd.imageset/likeAdd@2x.png | Bin 0 -> 2086 bytes .../WebSeries/LikeAdd.imageset/likeAdd@3x.png | Bin 0 -> 2328 bytes .../LikeRemove.imageset/Contents.json | 26 +++ .../LikeRemove.imageset/LikeRemove.png | Bin 0 -> 1496 bytes .../LikeRemove.imageset/LikeRemove@2x.png | Bin 0 -> 3557 bytes .../LikeRemove.imageset/LikeRemove@3x.png | Bin 0 -> 4037 bytes .../ViewModel/SelectAvatarVM.swift | 2 +- WOKA/Home/Controller/MyListVC.swift | 113 ++++++++-- WOKA/Home/Home.storyboard | 201 ++++++++++-------- WOKA/Home/View/FavouriteCell.swift | 18 +- WOKA/Home/View/FavouriteCell.xib | 93 ++++---- WOKA/Home/ViewModel/MyListVM.swift | 20 +- WOKA/Theme/Controller/MoreVC.swift | 2 +- .../Controller/WebSeriesSeasonVC.swift | 11 - WOKA/WebSeries/Controller/WebSeriesVC.swift | 51 ++++- WOKA/WebSeries/LikeFavCommonFunc.swift | 8 +- WOKA/WebSeries/View/WebSeriesCell.xib | 27 ++- .../View/WebSeriesShowListingCell.swift | 12 +- .../View/WebSeriesShowListingCell.xib | 79 ++++--- .../ViewModel/WebSeriesSeasonVM.swift | 46 ++-- WOKA/WebSeries/ViewModel/WebSeriesVM.swift | 11 +- WOKA/WebSeries/WebSeries.storyboard | 15 +- 35 files changed, 571 insertions(+), 283 deletions(-) rename WOKA/{Helpers => Assets}/AssetColor.swift (92%) create mode 100644 WOKA/Assets/Assets.xcassets/AssetColor/ImageDarkBlue.colorset/Contents.json create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/FavouriteAdd.imageset/Contents.json create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/FavouriteAdd.imageset/FavouriteRemove.png create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/FavouriteAdd.imageset/FavouriteRemove@2x.png create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/FavouriteAdd.imageset/FavouriteRemove@3x.png create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/FavouriteRemove.imageset/Contents.json create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/FavouriteRemove.imageset/FavouriteAdd.png create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/FavouriteRemove.imageset/FavouriteAdd@2x.png create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/FavouriteRemove.imageset/FavouriteAdd@3x.png create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/LikeAdd.imageset/Contents.json create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/LikeAdd.imageset/likeAdd.png create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/LikeAdd.imageset/likeAdd@2x.png create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/LikeAdd.imageset/likeAdd@3x.png create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/LikeRemove.imageset/Contents.json create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/LikeRemove.imageset/LikeRemove.png create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/LikeRemove.imageset/LikeRemove@2x.png create mode 100644 WOKA/Assets/Assets.xcassets/WebSeries/LikeRemove.imageset/LikeRemove@3x.png diff --git a/WOKA.xcodeproj/project.pbxproj b/WOKA.xcodeproj/project.pbxproj index c8fbcab..a842bda 100644 --- a/WOKA.xcodeproj/project.pbxproj +++ b/WOKA.xcodeproj/project.pbxproj @@ -728,6 +728,7 @@ 9CDCE1432BDB9B64003FEF11 /* Sounds */, 52C8B0722BDA7560003B51D0 /* GIF_JSON */, 523ED2942BDA3D0800CFED02 /* Fonts */, + 9C56E8472BDBEFAB00E4CA14 /* AssetColor.swift */, 523ED2662BDA2BC900CFED02 /* Assets.xcassets */, ); path = Assets; @@ -898,7 +899,6 @@ 5202AAFF2BDFA7860043B7BD /* Validations */, 52C8B06A2BDA6E7A003B51D0 /* Localized */, 52C8B0522BDA4B58003B51D0 /* UIElements Helper */, - 9C56E8472BDBEFAB00E4CA14 /* AssetColor.swift */, 52663FF62BDFACF60001D8CE /* ShadowView.swift */, 5257B2642BDFB6F50086D79B /* CheckPhoneHomeBtnOrNotch.swift */, 52D774F02BDFC53B001D87DE /* StringSubScript.swift */, diff --git a/WOKA/Helpers/AssetColor.swift b/WOKA/Assets/AssetColor.swift similarity index 92% rename from WOKA/Helpers/AssetColor.swift rename to WOKA/Assets/AssetColor.swift index 2d6a0cf..9f0303a 100644 --- a/WOKA/Helpers/AssetColor.swift +++ b/WOKA/Assets/AssetColor.swift @@ -9,6 +9,7 @@ import UIKit enum AssetsColor: String { case TextDarkBlue + case ImageDarkBlue } extension UIColor { diff --git a/WOKA/Assets/Assets.xcassets/AssetColor/ImageDarkBlue.colorset/Contents.json b/WOKA/Assets/Assets.xcassets/AssetColor/ImageDarkBlue.colorset/Contents.json new file mode 100644 index 0000000..082a2e7 --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/AssetColor/ImageDarkBlue.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.365", + "green" : "0.000", + "red" : "0.035" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "1.000", + "green" : "1.000", + "red" : "1.000" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteAdd.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteAdd.imageset/Contents.json new file mode 100644 index 0000000..387f38b --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteAdd.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "FavouriteRemove.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FavouriteRemove@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FavouriteRemove@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteAdd.imageset/FavouriteRemove.png b/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteAdd.imageset/FavouriteRemove.png new file mode 100644 index 0000000000000000000000000000000000000000..e2c296f77214c906101ae19906ebebd8a256f9f2 GIT binary patch literal 1185 zcmV;S1YY}zP)Px(TS-JgR9HvNnN6rwRTRg6YT3Y~RHBkdXiy-E5e8Bbr6Nuwu?E&4!GSn&U{PQn zRnRD>EtmJ|t6enjBFCK^w}ut0_Iv;DuU|6_YP_ndR@yZ64k;k@@a zXYaNCd#(Rkd+qfm(QHft^mtqY^mH@2l9ekjD%H2i0qAN8qABrC-|9eHmX=&8ktIEv z(^ghHpaPK#ycM_&mg;KKlGEX}+kIMhDt2*aq^%}iDciWLD|rinLk6@Rcrq+t zp47R#-`^D>T|xZux~oocr{6^*VH(wse=~k|DriviFAAv4+f51? z6v);oC!l`=s*Y^tK?11LWlVnws8Z7d5lq8oStWg8Iv}7Q0~>+@!^5V7TbcVyj4~W)9GX^E0PiSx{lOuSyff|Fn~3NeJ&gG zdQ^9rAG6YIqWG$mMo zo{D-@@2*Qn2Ce)1{uEsI4VbUy<>9F2)IS*O$P{^K3fv3)5KV_c1ebNFl6wTuwfVZH zMp?iZtTMn?z^p!7)*#i?SPJ}B(p_nL66vlYZYUG%?IT!&)P-<)>dG9=d6`!%RVm0| z?+11RclS8Jd?h}f3L_=;V`Y{!*t%S48r%~-ruo^OyRJm5`tImfJ4n5)KdL}BEkX=- zMs!lNd!NH~8!du$$4`NxEBe~#4wiQCnz}xpmq(x)UTTW9D(?=8n0&4}GP?b0RJAO} zFmz&(ycMV-<`Y0xmK&?uHhH^8y-+pa)MET!Yq5$eodC^GFj+^rc5BqL?W~(yQP=Wy z!0+uMyO%&M%NapdQFHB;)VZ5lxG1`5b}?D}&1k@BeJvl$0C#H9B5!@f>2UZ6c(|ZM z)!0Tr(Jfti+O^Otv&eXWnhLUzcq;2Y2dFQq@orQmdOA9s&om00000NkvXXu0mjf7w;jM literal 0 HcmV?d00001 diff --git a/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteAdd.imageset/FavouriteRemove@2x.png b/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteAdd.imageset/FavouriteRemove@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4757c3548a678af92207da11df52c8a8c551396e GIT binary patch literal 2468 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 KMNUMnLSTYbOj6bW literal 0 HcmV?d00001 diff --git a/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteRemove.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteRemove.imageset/Contents.json new file mode 100644 index 0000000..0ad881b --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteRemove.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "FavouriteAdd.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FavouriteAdd@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FavouriteAdd@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteRemove.imageset/FavouriteAdd.png b/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteRemove.imageset/FavouriteAdd.png new file mode 100644 index 0000000000000000000000000000000000000000..81e47d64d66af956455c083628cef23b17a5d2e1 GIT binary patch literal 1543 zcmV+i2Kf1jP)Px)!AV3xR9HvNnFr|ZV-&|f*9_UStSDp@vTn(aj4LxcvNs`{Ywr-Qd5y?QW@cnu zQq~O#p>U0|_sI5q{+)As-uJ%y|6cA>|K8tte&>9jv(NdDq4OF8%mnz`YW)TL(}hO9 zmd4C&_DbXLPPEzqNPq(Awq)Lk$xvvu0;&XM?3xu=16U7O3Ro2Q9ry@%8F&`>I`#^< z`C#?41%dT}wSv}cz~@2hIbbsIN6@M0>2l#m_UM~Xs0s@~3Hi6~?ReX0j*&^}bD@EN`7nMB~DoT@(@L1pg zVEfps+P%Lq?)L$%s~qUwxPJlg;4U?%No`y-axk!FJpTgN5zr(?u%)33U^(C=V7?Ij z$-u>x-K42Bd-+a9DieWug2|@w`$YWyP_(f>a95MsXwZ9x?PW+wuTH{s*iywC0`~`4fw=_k^|s~xGhq_VVMsc4RPepFd`md8g4;j` zPSty2)#Or==f*}sbc>Tp!ozJ|?E2Bl^Htdv#Y7$pTItbk{AmQR_U*otLbC4FoF@8m z&QSS^z^f5H(q_AXOr{C;eBk(acmZ%ik06syYEXMO{H+eWt)_jkRWag+V&`ta9dR$=k^CZbYC7 zJ~RZGeI72?<3b75%LZ1E_saFrB_j^x`0ue-@~LReLzQgqBlhFra4@$2vv75$HSNMAt_KNwH54 zmG(+AF_`i8)2Re%)-d{;SN(PM6Ha<%-p{^FL}p9tk4ZjI-P-1_B_FQ@Oo_BM8qe(HTql8nD5Oh7uMy~XgCh|ZDz&e3P`h?h5Fbm2p*48>$517 zEyMcFCl@Rns;MHPy-f5nUfT=VKHpr;0i9Z|%I-+@XqtSNm*&NX8tZ^%_Ky0u*J~6JRnZPymU*|>p?DlVfJ^IOh-6UEA zPOz&*QdqX~ROd_%y;@E4tje56>CLY90fYH#{n&XwKxL9(o#vUrbPAVq(w!sq)?KJ0 zN5_(md|W!AAf4v*<&6CTm03z{?r;i2mdhU8i10?-uM(cULfjkFooU%j_8p4{0V?0x z9xp34XPfQ%DkSE$5??5u+x8yW!IoE$?FalV=I(7B{wlpqV2;Vtvw!Z8b ze!3wY4bTLu8jX*tU8m6`TtAjFQ71F7_Zn~8;vFr}BwUZxo&CF<#W#$%yGgCn`(Xi< tN4Niqj0R`V0l!x!+M$0g?Q>`?_rG5GYXltOe#-y=002ovPDHLkV1fhc@ht!V literal 0 HcmV?d00001 diff --git a/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteRemove.imageset/FavouriteAdd@2x.png b/WOKA/Assets/Assets.xcassets/WebSeries/FavouriteRemove.imageset/FavouriteAdd@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b8212af6313475146e742d5db1b65a5f8b7fcbd3 GIT binary patch literal 3816 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 Hu0mjf3mhRg literal 0 HcmV?d00001 diff --git a/WOKA/Assets/Assets.xcassets/WebSeries/LikeAdd.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/WebSeries/LikeAdd.imageset/Contents.json new file mode 100644 index 0000000..cb3c8cf --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/WebSeries/LikeAdd.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "likeAdd.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "likeAdd@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "likeAdd@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/WOKA/Assets/Assets.xcassets/WebSeries/LikeAdd.imageset/likeAdd.png b/WOKA/Assets/Assets.xcassets/WebSeries/LikeAdd.imageset/likeAdd.png new file mode 100644 index 0000000000000000000000000000000000000000..9a0d4b96021041f9055ee2d7973e9659f6425002 GIT binary patch literal 979 zcmV;^11$WBP)Px&jY&j7R9HvNnM;U`VHn4M$E{q-j#3t)TuO<;#wE8*i7YLUBuu8PMQTv2tPEix z%)(MEkh{pG$jT)f!^)+k#(j+Me|jFhPT!gHp5vQy-nULo=X~Gy{=WZnf2Tz8YY6Zg zSOe?>rU7q(-H1oYb{dUxGaG;# zP46jbvgOWEwrk~c9aI%+D)6P5c~mf7F0W>}aY+^54E^(lUFY{jsi}(^RaEy$O+~Gu zT+!}PowvDHsH0g`>WGMVxrD6ncQpbULhj1y`GG2a8SdktoY3YsC zV00R!9y-vo+()-%UDcBsfuv`@2HrQSs8=7|e;C+l<`#UtFI-E}55O^N6J?ElH)Aa| zJdKRAzH)V>l6gS?_+Axa=Q#_kmjz;#@F=|itO9;ouUSi(Mt_$u3QqO2D}l=bU1p7L zCA2Qqh0jezZF<)#i~bH&r>se%WCJC zW2_d>w%KM9FcHu}#mL|jqpbGmu}X9>I3z1u>JM@i9r^3A`Y!+g002ovPDHLkV1i~c B%W41s literal 0 HcmV?d00001 diff --git a/WOKA/Assets/Assets.xcassets/WebSeries/LikeAdd.imageset/likeAdd@2x.png b/WOKA/Assets/Assets.xcassets/WebSeries/LikeAdd.imageset/likeAdd@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f95ad0c61f9622b5d8aa6dcea3705faf38b446 GIT binary patch literal 2086 zcmV+>2-)|EP)Px+;7LS5RCr$Poo9$7MHI*X7tE-bFh|4$Dwy@e98fWxC}u=OF`}U0hf@?$R19E3 zP)u;Af>}R^7!D)G6F-Qkm@#9*fZ6`d)qkz+o4MXjv%7XR47)qMQ(gU=SMR-g_3HH$ zO|D~#q<=z}caU_Xq&+3AF6nnkZ%TSp(mj$sku+7(-^0E|IyspRL!Bk*JV{Fp==^(< z&X;uecz~TOQ0XU9_m`w=C7lsq@;C4MK9EXY)5H10gVYXHVkZk!Lpe^;Z2_)9_Y>AX zB~6p`sif^CeHOqEMHNg2s2=jm1f98dkVZf+>;Nnhdyb^50%Rn+^an*j9-chIbG5XU59F2 zx?vdli& zJv>(n!IKrjjH-^5{w!&INndnznrf&gN5PXa)6#xZ)Q>X9e+x<9b`h$jagm_^Hm_lz zfNOW^m28T-v!q|U2o+sQxb7H9cUGK1#ga-}v^hu8QIVnROz6+kPXf`;MQ+qsLVSaa z7x7c19$)w35U^%e*7{M!0JPC5OX)R|&Z;@=^Nv3&u6K0}s{K+N^asK)EgLw=f6;cO zu>89P9qli!4WSs-=6Fl0ZxrkNSQhkHsfG&`-2bQCT_OM@<!UJGx%Fnv@ zNngLuW@hh7dMX6GzZwL#?!}63lJ=2MIz>VQS$LbZB%wupY4ZF#A)V-veqh^#>b4m= zdu2JKSmL#YAffq4Rg*BCRmk+0b6%OsJyW2d~y8y%0foan|V zJR+Y5+Xhs(xtyfSvvkH2!(H2ej0c1^u4(H}@SEit(l&dB(sS%4;9C6Sxjb1Re5r4=Lk0`Bs ztQSE#7t8WLUzBup0BCD}P>4EtnEW51#?i1{!jk$lZj@vN0=ab#=I{G-7%J>`l|+K^ zbfA(CzjDQpo2@zP^M`a8>Q5O^B=t4)Do_dJE?H4bW2orR*xB#G@VB8Nr+_SP1axYG zT2Y$9#|)L!c_uhL`;nm5g9=1mGec5wZ)TOCR)=cK&+fvFB7eN+{3o4SA1t{A>_Ws( zO**wY&yi1BVsR@EAYhavwE?P8|R}%pf(59%QkZp z)aIbtV11aNHV4%$eUqRz2i1}~FF|b%stwib1hpBcNU7bbnF(q$P@Nd^ELAWP)cQ~z zQzj*d4I6JHsP&-QI02OXuPk(?fJzOfUeKgc8>=3a6X_-4B}uJL)ly2hk4?#6hk$j8 zr&ed$`=s^hjiJU%lGK_&;~>ggA(?`5O}%7_6#1`C*OE%EDwhB4v_xGUrax)D%1_q) zpGi>bL$##-5}>lVI3-imf=a&npeH*NU9yYm>0Xbbf)E=}`s!4mlJj3>OHLP|TCZN0<)c!h0dAxA{__S8 zaoIEqxE5Akh{V@W9|}tfUD!y$@Mp;L{FY1mRlNWL4;HvRtF5<6(O6%|dA4Yi@ESv< zxHjcHc+amImzWSA_4+>3QBO_#>Qs8WYN(~Z#KOv0^tmlALZcsNk1%>ZocBcz3k4HA z({Qpu`~aB=L8?S296(_P#WPvHjAv4A#}ZU#$QSj&ikq6H3=wt$=0^d_o@-Awz}Ba> z{C!J)*f=#YJV%NM4{dQEl*h{P~su<6rFTKingpU3(3R&ByppMHx zEg+C>cG_*n7e&4B$PTKS0hr%;D1s|J_>rvht^lYdV zvjSc53&`tc9?Ck|Q`30l2hz@Dg%|#{e{Z@-10dOR$`(lq>QKp@qp$+|za=S|i<*v8 Q{r~^~07*qoM6N<$f-CUwQUCw| literal 0 HcmV?d00001 diff --git a/WOKA/Assets/Assets.xcassets/WebSeries/LikeAdd.imageset/likeAdd@3x.png b/WOKA/Assets/Assets.xcassets/WebSeries/LikeAdd.imageset/likeAdd@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..35b2168e7a2b058663d0fbf2d44f89802915fb32 GIT binary patch literal 2328 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 - + @@ -26,7 +26,7 @@ - + @@ -73,20 +73,20 @@ - + - + - + - + - + - + - + - + - + @@ -959,13 +963,13 @@ - + - + - + @@ -990,13 +994,13 @@ - + - + - + @@ -1021,13 +1025,13 @@ - + - + - + @@ -1052,13 +1056,13 @@ - + - + - + @@ -1083,7 +1087,7 @@ - + @@ -1091,6 +1095,7 @@ + @@ -1116,12 +1121,16 @@ + + + + @@ -1132,6 +1141,7 @@ + @@ -1151,7 +1161,7 @@ - + @@ -1168,11 +1178,11 @@ - + - + @@ -1195,24 +1205,24 @@ - + - + - - - - - + + + + + - + - + @@ -1224,5 +1234,8 @@ + + + diff --git a/WOKA/Home/View/FavouriteCell.swift b/WOKA/Home/View/FavouriteCell.swift index f5fb803..f387a6c 100644 --- a/WOKA/Home/View/FavouriteCell.swift +++ b/WOKA/Home/View/FavouriteCell.swift @@ -56,19 +56,18 @@ class FavouriteCell: UICollectionViewCell { if let favourite = data.markAsFavourite{ switch favourite{ case true: - favBtnn.setImage(UIImage(systemName: "heart.fill"), for: .normal) + favBtnn.setImage(UIImage(named: "FavouriteAdd"), for: .normal) case false: - favBtnn.setImage(UIImage(systemName: "heart"), for: .normal) - + favBtnn.setImage(UIImage(named: "FavouriteRemove"), for: .normal) } } if let like = data.isLiked{ switch like{ case true: - likeBtn.setImage(UIImage(systemName: "hand.thumbsup.fill"), for: .normal) + likeBtn.setImage(UIImage(named: "LikeAdd"), for: .normal) case false: - likeBtn.setImage(UIImage(systemName: "hand.thumbsup"), for: .normal) + likeBtn.setImage(UIImage(named: "LikeRemove"), for: .normal) } } } @@ -88,19 +87,18 @@ class FavouriteCell: UICollectionViewCell { if let favourite = data.markAsFavourite{ switch favourite{ case true: - favBtnn.setImage(UIImage(systemName: "heart.fill"), for: .normal) + favBtnn.setImage(UIImage(named: "FavouriteAdd"), for: .normal) case false: - favBtnn.setImage(UIImage(systemName: "heart"), for: .normal) - + favBtnn.setImage(UIImage(named: "FavouriteRemove"), for: .normal) } } if let like = data.isLiked{ switch like{ case true: - likeBtn.setImage(UIImage(systemName: "hand.thumbsup.fill"), for: .normal) + likeBtn.setImage(UIImage(named: "LikeAdd"), for: .normal) case false: - likeBtn.setImage(UIImage(systemName: "hand.thumbsup"), for: .normal) + likeBtn.setImage(UIImage(named: "LikeRemove"), for: .normal) } } } diff --git a/WOKA/Home/View/FavouriteCell.xib b/WOKA/Home/View/FavouriteCell.xib index 2ff7247..625ab90 100644 --- a/WOKA/Home/View/FavouriteCell.xib +++ b/WOKA/Home/View/FavouriteCell.xib @@ -6,7 +6,6 @@ - @@ -31,7 +30,7 @@ - + @@ -40,64 +39,59 @@ - + - - + + - - + + - - - + - + - + @@ -131,21 +125,18 @@ - - - + + + - - - - + + + + - - - diff --git a/WOKA/Home/ViewModel/MyListVM.swift b/WOKA/Home/ViewModel/MyListVM.swift index 8d5a870..8ef0b59 100644 --- a/WOKA/Home/ViewModel/MyListVM.swift +++ b/WOKA/Home/ViewModel/MyListVM.swift @@ -28,6 +28,11 @@ class MyListVM{ var selectedCollection : CollectionSelectionMyList? func initView(){ + let color1 = #colorLiteral(red: 0.6745098039, green: 0.6235294118, blue: 0.1725490196, alpha: 1) + let color2 = #colorLiteral(red: 0.5450980392, green: 0.6745098039, blue: 0.1725490196, alpha: 1) + + vc.gradientView.applyGradient(colors: [color2, color1], startPoint: CGPoint(x: 0, y: 0), endPoint: CGPoint(x: 0.8, y: 0)) + setupCell() Utilities.startProgressHUD() getFavouriteListing() @@ -75,6 +80,8 @@ class MyListVM{ self.refreshControl.endRefreshing() Utilities.dismissProgressHUD() self.vc.toast(msg: data.message ?? "Unrecognised error" , time: 2) + webSeriesHindi.removeAll() + favListingData = nil reloadCollections() checkNil() case 1: @@ -87,11 +94,18 @@ class MyListVM{ favListingData = data if var hindiData = favListingData?.showData{ - /* + + /* Taking out the hindi series , 1-> English , 18-> Hindi - And the saving it to hindi series + And the saving it to hindi series, also modify the bookmark category ids */ - webSeriesHindi = hindiData.compactMap { $0 }.filter { ($0.bookmarkCategoryIDS?.components(separatedBy: ",").first == "18" || $0.bookmarkCategoryIDS?.components(separatedBy: ",").last == "18") } + webSeriesHindi = hindiData.compactMap { $0 }.filter { + ($0.bookmarkCategoryIDS?.components(separatedBy: ",").first == "18" || $0.bookmarkCategoryIDS?.components(separatedBy: ",").last == "18") + }.map { element -> FavouriteListingDM.ResultData.ShowDatum in + var modifiedElement = element + modifiedElement.bookmarkCategoryIDS = "18" + return modifiedElement + } if let data = favListingData?.showData{ var indicesToRemove = [Int]() diff --git a/WOKA/Theme/Controller/MoreVC.swift b/WOKA/Theme/Controller/MoreVC.swift index 7de2164..50fb348 100644 --- a/WOKA/Theme/Controller/MoreVC.swift +++ b/WOKA/Theme/Controller/MoreVC.swift @@ -183,7 +183,7 @@ extension MoreVC : TableViewSRC{ guard let self = self else { return } currentTimePlayer = Int(CMTimeGetSeconds(time)) if let currentPlayingIndex = self.vm.currentIndexPlayingSong, - let cell = self.songTableView.cellForRow(at: IndexPath(row: vm.currentIndexPlayingSong ?? 0, section: 0)) as? SongListCell { + let cell = self.songTableView.cellForRow(at: IndexPath(row: currentPlayingIndex, section: 0)) as? SongListCell { cell.updateCurrentTime() } } diff --git a/WOKA/WebSeries/Controller/WebSeriesSeasonVC.swift b/WOKA/WebSeries/Controller/WebSeriesSeasonVC.swift index e036ad8..aa9e594 100644 --- a/WOKA/WebSeries/Controller/WebSeriesSeasonVC.swift +++ b/WOKA/WebSeries/Controller/WebSeriesSeasonVC.swift @@ -94,17 +94,6 @@ class WebSeriesSeasonVC: UIViewController { } JWPlayerManager.shared.presentPlayer(from: self, playerItems: playerItems, startIndex: 0, contentType: .trailer) - -// let seasonData = vm.seasonListingData.filter({$0.id == vm.episodeSelectedCateogory}).first -// if vm.categoryID == 1{ -// guard let englishData = seasonData?.seasonMoreDetails?.filter({$0.languageMasterID == 1}).first , let url = englishData.trailerHDURL , let title = englishData.title else{return} -// let playerItem = JwPlayerItemCreate(url: url, poster: seasonData?.thumbnailPath, titles: title) -// JWPlayerManager.shared.presentPlayer(from: self, playerItems: [playerItem], startIndex: 0, contentType: .trailer) -// }else if vm.categoryID == 18{ -// guard let hindiData = seasonData?.seasonMoreDetails?.filter({$0.languageMasterID == 2}).first , let url = hindiData.trailerHDURL , let title = hindiData.title else{return} -// let playerItem = JwPlayerItemCreate(url: url, poster: seasonData?.thumbnailPath, titles: title) -// JWPlayerManager.shared.presentPlayer(from: self, playerItems: [playerItem], startIndex: 0, contentType: .trailer) -// } } @IBAction func retryBtnTapped(_ sender: LocalisedElementsButton) { diff --git a/WOKA/WebSeries/Controller/WebSeriesVC.swift b/WOKA/WebSeries/Controller/WebSeriesVC.swift index dcbb8de..4162c08 100644 --- a/WOKA/WebSeries/Controller/WebSeriesVC.swift +++ b/WOKA/WebSeries/Controller/WebSeriesVC.swift @@ -8,7 +8,8 @@ import UIKit protocol ReloadSeriesFavLike{ - func updateRows(index : Int, type : FavCellCLick) + func updateRows(index : Int, type : FavCellCLick, isFav : Bool? , isLike : Bool? ) + } class WebSeriesVC: UIViewController { @@ -62,6 +63,11 @@ class WebSeriesVC: UIViewController { self.navigationController?.setColor(color: .black) } + override func viewDidLayoutSubviews() { + super.viewDidLayoutSubviews() + vm.updateTableHeight() + } + // MARK: - Tap Handler @IBAction func playTrailer(_ sender: LocalisedElementsButton) { let item = JwPlayerItemCreate(url: vm.masilaUrl, poster: nil, titles: "Masila") @@ -111,7 +117,7 @@ extension WebSeriesVC : TableViewSRC{ if let categoryIds = data.favouriteCategoryIDS?.rawValue { let components = categoryIds.components(separatedBy: ",") if isFav == true && (components.first == categoryID.toString() || components.last == categoryID.toString()){ - LikeFavCommonFunc.shareInstance.removeFavourite(postID: postID, postType: postType, categoryID: categoryID, index: index, vc: self) { [unowned self] isDone in + LikeFavCommonFunc.shareInstance.removeFavourite(postID: postID, postType: postType, categoryID: categoryID, vc: self) { [unowned self] isDone in if isDone{ vm.showData[index].markAsFavourite = false vm.showData[index].favouriteCategoryIDS = ValueWrapper.stringValue("") @@ -120,7 +126,7 @@ extension WebSeriesVC : TableViewSRC{ } } }else{ - LikeFavCommonFunc.shareInstance.addFavourite(postID: postID, postType: postType, categoryID: categoryID, index: index, vc: self) { [unowned self] isDone in + LikeFavCommonFunc.shareInstance.addFavourite(postID: postID, postType: postType, categoryID: categoryID, vc: self) { [unowned self] isDone in if isDone{ vm.showData[index].markAsFavourite = true vm.showData[index].favouriteCategoryIDS = ValueWrapper.stringValue(categoryID.toString()) @@ -134,7 +140,7 @@ extension WebSeriesVC : TableViewSRC{ case .liked: guard let isLiked = data.isLiked ,let postID = data.id,let postType = data.contentMoreDetails?.first?.postType else{return} if isLiked{ - LikeFavCommonFunc.shareInstance.unlikePost(postID: postID, postType: postType, index: index, vc: self) { [unowned self] isDone in + LikeFavCommonFunc.shareInstance.unlikePost(postID: postID, postType: postType, vc: self) { [unowned self] isDone in if isDone{ vm.showData[index].isLiked = false vm.showData[index].likesCount! -= 1 @@ -142,7 +148,7 @@ extension WebSeriesVC : TableViewSRC{ } } }else{ - LikeFavCommonFunc.shareInstance.likePost(postID: postID, postType: postType, index: index, vc: self){ [unowned self] isDone in + LikeFavCommonFunc.shareInstance.likePost(postID: postID, postType: postType, vc: self){ [unowned self] isDone in if isDone{ vm.showData[index].isLiked = true vm.showData[index].likesCount! += 1 @@ -171,11 +177,38 @@ extension WebSeriesVC : TableViewSRC{ } extension WebSeriesVC : ReloadSeriesFavLike{ - func updateRows(index: Int, type: FavCellCLick) { - print(index , type) - updateFavLikes(type: type, index: index) - } + // if like or fav is done in webseriesseason vc, dont need to do api call in this screen. + func updateRows(index: Int, type: FavCellCLick, isFav: Bool?, isLike: Bool?) { + if let isFav{ + let categoryID = vm.categoryListingData[vm.dropDownModule.indexForSelectedRow ?? 0].id ?? 0 + switch isFav{ + case true: + vm.showData[index].markAsFavourite = true + vm.showData[index].favouriteCategoryIDS = ValueWrapper.stringValue(categoryID.toString()) + showListingTableView.reloadRows(at: [IndexPath(row: index, section: 0)],with: .none) + case false: + vm.showData[index].markAsFavourite = false + vm.showData[index].favouriteCategoryIDS = ValueWrapper.stringValue("") + showListingTableView.reloadRows(at: [IndexPath(row: index, section: 0)],with: .none) + } + K.GVar.reloadMyList = true + } + + if let isLike{ + switch isLike{ + case true: + vm.showData[index].isLiked = true + vm.showData[index].likesCount! += 1 + showListingTableView.reloadRows(at: [IndexPath(row: index, section: 0)],with: .none) + case false: + vm.showData[index].isLiked = false + vm.showData[index].likesCount! -= 1 + showListingTableView.reloadRows(at: [IndexPath(row: index, section: 0)],with: .none) + } + K.GVar.reloadMyList = true + } + } } // MARK: - CollectionView Delegate and Data Source diff --git a/WOKA/WebSeries/LikeFavCommonFunc.swift b/WOKA/WebSeries/LikeFavCommonFunc.swift index 23fe902..b08de77 100644 --- a/WOKA/WebSeries/LikeFavCommonFunc.swift +++ b/WOKA/WebSeries/LikeFavCommonFunc.swift @@ -14,7 +14,7 @@ class LikeFavCommonFunc{ // MARK: - Like , unlike - func likePost(postID : Int, postType : Int, index : Int, vc : UIViewController, onCompletion : @escaping (Bool) -> Void){ + func likePost(postID : Int, postType : Int, vc : UIViewController, onCompletion : @escaping (Bool) -> Void){ Utilities.startProgressHUD() let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi", "access-token": AuthFunc.shareInstance.getAccessToken()] @@ -45,7 +45,7 @@ class LikeFavCommonFunc{ } } - func unlikePost(postID : Int, postType : Int , index : Int, vc : UIViewController, onCompletion : @escaping (Bool) -> Void){ + func unlikePost(postID : Int, postType : Int, vc : UIViewController, onCompletion : @escaping (Bool) -> Void){ Utilities.startProgressHUD() let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi", "access-token": AuthFunc.shareInstance.getAccessToken()] @@ -77,7 +77,7 @@ class LikeFavCommonFunc{ // MARK: - Remove Favourite - func removeFavourite(postID : Int, postType : Int, categoryID : Int, index : Int, vc : UIViewController, onCompletion : @escaping (Bool) -> Void){ + func removeFavourite(postID : Int, postType : Int, categoryID : Int, vc : UIViewController, onCompletion : @escaping (Bool) -> Void){ Utilities.startProgressHUD() let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi", "access-token": AuthFunc.shareInstance.getAccessToken()] @@ -108,7 +108,7 @@ class LikeFavCommonFunc{ } } - func addFavourite(postID : Int, postType : Int, categoryID : Int, index : Int, vc : UIViewController, onCompletion : @escaping (Bool) -> Void){ + func addFavourite(postID : Int, postType : Int, categoryID : Int, vc : UIViewController, onCompletion : @escaping (Bool) -> Void){ Utilities.startProgressHUD() let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi", "access-token": AuthFunc.shareInstance.getAccessToken()] diff --git a/WOKA/WebSeries/View/WebSeriesCell.xib b/WOKA/WebSeries/View/WebSeriesCell.xib index a98ceab..1456d55 100644 --- a/WOKA/WebSeries/View/WebSeriesCell.xib +++ b/WOKA/WebSeries/View/WebSeriesCell.xib @@ -4,6 +4,7 @@ + @@ -41,15 +42,22 @@ - @@ -89,4 +97,9 @@ + + + + + diff --git a/WOKA/WebSeries/View/WebSeriesShowListingCell.swift b/WOKA/WebSeries/View/WebSeriesShowListingCell.swift index 7da4c1a..7f5fad1 100644 --- a/WOKA/WebSeries/View/WebSeriesShowListingCell.swift +++ b/WOKA/WebSeries/View/WebSeriesShowListingCell.swift @@ -48,9 +48,9 @@ class WebSeriesShowListingCell: UITableViewCell { if let like = data.isLiked{ switch like{ case true: - likeBtn.setImage(UIImage(systemName: "hand.thumbsup.fill"), for: .normal) + likeBtn.setImage(UIImage(named: "LikeAdd"), for: .normal) case false: - likeBtn.setImage(UIImage(systemName: "hand.thumbsup"), for: .normal) + likeBtn.setImage(UIImage(named: "LikeRemove"), for: .normal) } } @@ -58,17 +58,17 @@ class WebSeriesShowListingCell: UITableViewCell { if let categoryIds = data.favouriteCategoryIDS?.rawValue { // if string, it means category is selected for multiple language let components = categoryIds.components(separatedBy: ",") if favourite == true && (components.first == selectedCategory.toString() || components.last == selectedCategory.toString()){ - favBtn.setImage(UIImage(systemName: "heart.fill"), for: .normal) + favBtn.setImage(UIImage(named: "FavouriteAdd"), for: .normal) }else{ - favBtn.setImage(UIImage(systemName: "heart"), for: .normal) + favBtn.setImage(UIImage(named: "FavouriteRemove"), for: .normal) } return } if favourite == true && data.favouriteCategoryIDS?.intValue == selectedCategory{ - favBtn.setImage(UIImage(systemName: "heart.fill"), for: .normal) + favBtn.setImage(UIImage(named: "FavouriteAdd"), for: .normal) }else{ - favBtn.setImage(UIImage(systemName: "heart"), for: .normal) + favBtn.setImage(UIImage(named: "FavouriteRemove"), for: .normal) } // switch favourite{ // case true: diff --git a/WOKA/WebSeries/View/WebSeriesShowListingCell.xib b/WOKA/WebSeries/View/WebSeriesShowListingCell.xib index 336a46a..6cd4fdd 100644 --- a/WOKA/WebSeries/View/WebSeriesShowListingCell.xib +++ b/WOKA/WebSeries/View/WebSeriesShowListingCell.xib @@ -25,10 +25,10 @@ - + - + @@ -42,65 +42,60 @@ - - + + - - + + - - + + - - - - - - - - + - + @@ -144,10 +139,10 @@ - - - - + + + + diff --git a/WOKA/WebSeries/ViewModel/WebSeriesSeasonVM.swift b/WOKA/WebSeries/ViewModel/WebSeriesSeasonVM.swift index 5e03d56..ef034bf 100644 --- a/WOKA/WebSeries/ViewModel/WebSeriesSeasonVM.swift +++ b/WOKA/WebSeries/ViewModel/WebSeriesSeasonVM.swift @@ -32,31 +32,47 @@ class WebSeriesSeasonVM{ setShowData() vc.addView.addTapGesture { [weak self] in - - guard let self ,let indexSelected, let categoryID, let showData, let isFav = showData.markAsFavourite else{return} - vc.likeFavDelegate?.updateRows(index: indexSelected, type: .favourite) + guard let self ,let indexSelected, let categoryID, let showData, let showID = showData.id, let isFav = showData.markAsFavourite, let postType = showData.contentMoreDetails?.first?.postType else{return} if isFav { - self.showData?.markAsFavourite = false - self.showData?.favouriteCategoryIDS = ValueWrapper.stringValue("") + LikeFavCommonFunc.shareInstance.removeFavourite(postID: showID, postType: postType, categoryID: categoryID, vc: self.vc) { isDone in + self.showData?.markAsFavourite = false + self.showData?.favouriteCategoryIDS = ValueWrapper.stringValue("") + self.setShowData() + self.vc.likeFavDelegate?.updateRows(index: indexSelected, type: .favourite, isFav: false, isLike: nil) + K.GVar.reloadMyList = true + } }else{ - self.showData?.markAsFavourite = true - self.showData?.favouriteCategoryIDS = ValueWrapper.stringValue(categoryID.toString()) + LikeFavCommonFunc.shareInstance.addFavourite(postID: showID, postType: postType, categoryID: categoryID, vc: self.vc) { isDone in + self.showData?.markAsFavourite = true + self.showData?.favouriteCategoryIDS = ValueWrapper.stringValue(categoryID.toString()) + self.setShowData() + self.vc.likeFavDelegate?.updateRows(index: indexSelected, type: .favourite, isFav: true, isLike: nil) + K.GVar.reloadMyList = true + } } - setShowData() } + vc.likeView.addTapGesture { [weak self] in - guard let self ,let indexSelected, let showData, let isLiked = showData.isLiked else{return} - vc.likeFavDelegate?.updateRows(index: indexSelected, type: .liked) + guard let self ,let indexSelected, let showData, let showID = showData.id, let isLiked = showData.isLiked, let postType = showData.contentMoreDetails?.first?.postType else{return} + if isLiked{ - self.showData?.isLiked = false - self.showData?.likesCount! -= 1 + LikeFavCommonFunc.shareInstance.unlikePost(postID: showID, postType: postType, vc: self.vc) { isDone in + self.showData?.isLiked = false + self.showData?.likesCount! -= 1 + self.setShowData() + self.vc.likeFavDelegate?.updateRows(index: indexSelected, type: .liked, isFav: nil, isLike: false) + } }else{ - self.showData?.isLiked = true - self.showData?.likesCount! += 1 + LikeFavCommonFunc.shareInstance.likePost(postID: showID, postType: postType, vc: self.vc) { isDone in + self.showData?.isLiked = true + self.showData?.likesCount! += 1 + self.setShowData() + self.vc.likeFavDelegate?.updateRows(index: indexSelected, type: .liked, isFav: nil, isLike: true) + } } - setShowData() } + vc.shareView.addTapGesture { print("share") } diff --git a/WOKA/WebSeries/ViewModel/WebSeriesVM.swift b/WOKA/WebSeries/ViewModel/WebSeriesVM.swift index bb34803..7835bc3 100644 --- a/WOKA/WebSeries/ViewModel/WebSeriesVM.swift +++ b/WOKA/WebSeries/ViewModel/WebSeriesVM.swift @@ -24,12 +24,7 @@ class WebSeriesVM{ func initView(){ setupCell() - self.vc.tableHeight.constant = self.vc.showListingTableView.contentSize.height + 100 - self.vc.showListingTableView.layoutIfNeeded() - self.vc.tableHeight.constant = self.vc.showListingTableView.contentSize.height - startShimmer() - vc.scrollView.indicatorStyle = .white // or .white let color1 = #colorLiteral(red: 0.5921568627, green: 0.2588235294, blue: 0.8941176471, alpha: 1) @@ -73,6 +68,12 @@ class WebSeriesVM{ vc.showListingTableView.dataSource = vc.self } + func updateTableHeight(){ + self.vc.tableHeight.constant = self.vc.showListingTableView.contentSize.height + 100 + self.vc.showListingTableView.layoutIfNeeded() + self.vc.tableHeight.constant = self.vc.showListingTableView.contentSize.height + } + // MARK: - DropDown func initDropDown(){ diff --git a/WOKA/WebSeries/WebSeries.storyboard b/WOKA/WebSeries/WebSeries.storyboard index 024e1c6..2d6fa6b 100644 --- a/WOKA/WebSeries/WebSeries.storyboard +++ b/WOKA/WebSeries/WebSeries.storyboard @@ -434,7 +434,7 @@ - + @@ -445,7 +445,7 @@ - + @@ -475,7 +475,7 @@ - + @@ -486,7 +486,7 @@ - + @@ -518,7 +518,7 @@ - + @@ -529,7 +529,7 @@ - + @@ -1068,6 +1068,9 @@ + + +