From 85645ad18d4ebc7d367bec487eb05fead5b861d5 Mon Sep 17 00:00:00 2001 From: RISHI KUMAR S <150787679+riarsdev@users.noreply.github.com> Date: Fri, 29 Dec 2023 10:01:33 +0530 Subject: [PATCH] Fix conflicts & Update compinfos modified: app/src/main/assets/appfilter.xml modified: app/src/main/res/xml/appfilter.xml modified: resources/new_icons.yaml deleted: resources/utilities/icons/blinkit.png deleted: resources/utilities/icons/blinkit.svg deleted: resources/utilities/icons/zara.png deleted: resources/utilities/icons/zara.svg --- app/src/main/assets/appfilter.xml | 2 + app/src/main/res/xml/appfilter.xml | 2 + resources/new_icons.yaml | 6 --- resources/utilities/icons/blinkit.png | Bin 2764 -> 0 bytes resources/utilities/icons/blinkit.svg | 73 -------------------------- resources/utilities/icons/zara.png | Bin 3790 -> 0 bytes resources/utilities/icons/zara.svg | 29 ---------- 7 files changed, 4 insertions(+), 108 deletions(-) delete mode 100644 resources/utilities/icons/blinkit.png delete mode 100644 resources/utilities/icons/blinkit.svg delete mode 100644 resources/utilities/icons/zara.png delete mode 100644 resources/utilities/icons/zara.svg diff --git a/app/src/main/assets/appfilter.xml b/app/src/main/assets/appfilter.xml index 4c72fcf74f..a6ea8a591d 100644 --- a/app/src/main/assets/appfilter.xml +++ b/app/src/main/assets/appfilter.xml @@ -3751,6 +3751,7 @@ + @@ -4126,6 +4127,7 @@ + diff --git a/app/src/main/res/xml/appfilter.xml b/app/src/main/res/xml/appfilter.xml index 4c72fcf74f..a6ea8a591d 100644 --- a/app/src/main/res/xml/appfilter.xml +++ b/app/src/main/res/xml/appfilter.xml @@ -3751,6 +3751,7 @@ + @@ -4126,6 +4127,7 @@ + diff --git a/resources/new_icons.yaml b/resources/new_icons.yaml index af39514175..d52c5d3766 100644 --- a/resources/new_icons.yaml +++ b/resources/new_icons.yaml @@ -123,9 +123,6 @@ backbone: bitpanda: - com.bitpanda.bitpanda/com.bitpanda.feature.onboarding.authentication.impl.ui.RoutingActivity -blinkit: - - com.grofers.customerapp/com.grofers.customerapp.DEFAULT - chilis: - com.brinker.chilis/com.brinker.chilis.features.LaunchActivity @@ -143,6 +140,3 @@ manifold: ms_india: - com.mns/com.mns.SplashActivity - -zara: - - com.inditex.zara/com.inditex.zara.MainActivityDefaultIcon diff --git a/resources/utilities/icons/blinkit.png b/resources/utilities/icons/blinkit.png deleted file mode 100644 index 4e241b8690317ab7a9b587fdc66a1d9b40a2e270..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2764 zcmb_ec~H}b68_~y2tQ1=(mD&lmuZ@AzV%uBiK$_L7HUF&?q5Q9-c;|0{t2 zfk4p1M~21V{G$W)qOJtrUPh__0MyeKea4Mg{BZ&w4(F?NtxYc(u&0<@-)W`7{Y7r6 zK$UjrOnEsBZFj#rMb+5NIpKcAtr9Lxsgg~*Z7xc^&1HeJ#wOr{pv!H`vVlcbzDAUCkg zWPZe8Nr1BT>ANLBe|h4%=$?>LG^jdUEOA`xp%$8gJ}3groXE_e+vl9bk9?cvBeYCs zyn*D21>09I1vEwy_cvJHKD!QizXu8Oev`Dg08-Z*(7|;km$*6@i-+F+YJIgjX7=ESG~MHZV}F}f8vp1^fW#mRu=es7Wn#Uhs-rL3Yh0X@uC6JT zIsCq@2u%ieeNC6r_?uAuJ%InAt~(R0U~D3PCz8{k_00QUxn7+3>&wsJ^6HC*y8D%g zt2SqqldZ-x-rOm`^U@wbozGWKPs;n-!!j%D>;`&9scP(vHaWXxJv0Y zTTVTmH$Z8}LoOhmddf}eJZ4Z}`2Q>7l zy3ps9{A<3agqG+nL+X4xSvByQ60~K(0PG7pdyIk(n&T38WWk@AO^6|5vA64V<>{<$ zKn_T@IQWvCkzinkTs}PPRYo!IZ5D6-a3L%) z;5prqq3Fxw<)mEZ>%nx+nmd+^yk5ugkZ(&24LI5Lb;A(nLwW1X+WeB7wbfQkh{qw; zwN-wGyGmCdtG=om2AvmsEBz8K91*ke~m|PE9TA}39 zFMmu#`SRoNtAeq#->SXoGsV>+`Hc$4|v<2A(vN&@2MR?NSl zw93$$2-$DMCoS3?0}FM#&v9#0D_~NA+@3zU@BTa$(&ho}xNAf7_Dy zX%{@DB+(+~4pdjK;hLlZMtPis_jXVTS?-av^oMJlA}gNzGfGTjsh~_OF9ZqVJ|bmD zj9`5a^_#pgtbX;b_Ks!;$_FUVqv&X=^Xt~fyPg_1K;e-OUvx4nJP{~if)QzP9Yb97 zig8k?-x5quajcp1Ru9>x;hxV{^esaKthIHtiV@NW(UxCtoQlj%A2yuZH8!*52!~N> zJ=BkeA6`{eSVnr9{N8)O0URI;-nFvK%+b;G+n7JygeI&p4Pcm(J*y((A z*#pxokLTM|9lI8rO2yji?9u`{{|C=eQklas%82~>QG0q9rTUawjoO%y7tBg4u|E{T z4zL{U*i_f%QAVF;to*WF`>+pS9te!Shsq{OYja|7&Noz_9U{g!_|?B0DWPqE`j-L- zfJUV?y6hifnZG0%{-IgeeJAJs%gNLoP)O#e)pvhnny?{_D4;^EDal>~AX|K)ar+e7 zH_A6N3 za@E|3crX0uyBDKJa;01DaU;e)z8KBnK~|a7d}WYBVe02*QEI|e)tYfdfh!ISH2Xe1$vcw{@|GTw)pozR xd`gIuj65AwZ8Zidymlgeo%t7J*Z;s!0>K|BcftC2;P*xYwiqnB_WO&e{{gvd@r3{Y diff --git a/resources/utilities/icons/blinkit.svg b/resources/utilities/icons/blinkit.svg deleted file mode 100644 index 37adcf0cd9..0000000000 --- a/resources/utilities/icons/blinkit.svg +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/resources/utilities/icons/zara.png b/resources/utilities/icons/zara.png deleted file mode 100644 index 55caee1d167e3fd7965c900b5b6dead9e8f06607..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3790 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 - - - - - - -