From 61bd7d95c0b8c4a648461aaa394ec7c0b67f2e49 Mon Sep 17 00:00:00 2001 From: Dmitry Donskoy Date: Wed, 23 Jan 2019 13:51:28 +0300 Subject: [PATCH] [android] Improved alert dialog, added opportunity to inflate different layouts for it, added the first dialog such an approach --- android/res/drawable-hdpi/ic_error_36px.png | Bin 0 -> 815 bytes android/res/drawable-mdpi/ic_error_36px.png | Bin 0 -> 560 bytes android/res/drawable-xhdpi/ic_error_36px.png | Bin 0 -> 878 bytes android/res/drawable-xxhdpi/ic_error_36px.png | Bin 0 -> 1373 bytes .../res/drawable-xxxhdpi/ic_error_36px.png | Bin 0 -> 1795 bytes android/res/layout/fragment_confirmation.xml | 52 ++++ .../mapswithme/maps/dialog/AlertDialog.java | 234 ++++++++++++++++-- .../dialog/ConfirmationDialogFactory.java | 13 + .../DefaultConfirmationAlertDialog.java | 12 + .../maps/dialog/DefaultDialogFactory.java | 13 + .../mapswithme/maps/dialog/DialogFactory.java | 9 + .../dialog/ResolveDialogViewStrategy.java | 11 + .../routes/UgcRoutePropertiesFragment.java | 2 +- .../maps/ugc/routes/UgcRouteTagsFragment.java | 2 +- .../ugc/routes/UgcSharingOptionsFragment.java | 25 +- 15 files changed, 342 insertions(+), 31 deletions(-) create mode 100644 android/res/drawable-hdpi/ic_error_36px.png create mode 100644 android/res/drawable-mdpi/ic_error_36px.png create mode 100644 android/res/drawable-xhdpi/ic_error_36px.png create mode 100644 android/res/drawable-xxhdpi/ic_error_36px.png create mode 100644 android/res/drawable-xxxhdpi/ic_error_36px.png create mode 100644 android/res/layout/fragment_confirmation.xml create mode 100644 android/src/com/mapswithme/maps/dialog/ConfirmationDialogFactory.java create mode 100644 android/src/com/mapswithme/maps/dialog/DefaultConfirmationAlertDialog.java create mode 100644 android/src/com/mapswithme/maps/dialog/DefaultDialogFactory.java create mode 100644 android/src/com/mapswithme/maps/dialog/DialogFactory.java create mode 100644 android/src/com/mapswithme/maps/dialog/ResolveDialogViewStrategy.java diff --git a/android/res/drawable-hdpi/ic_error_36px.png b/android/res/drawable-hdpi/ic_error_36px.png new file mode 100644 index 0000000000000000000000000000000000000000..5c1f02add543b4edeba4db48e09b4cff49a5a192 GIT binary patch literal 815 zcmV+~1JL}5P)Px%=}AOERA>e5SUqnOK@i0m(Kf4H6VVKoX>g3JD?GQEr&MeC@@oXZL0=Y4)n!nc3NS@6K;$tyFv>1CfEq zKx7~?5E+OJL zX`@BLQ3R%i1oCq)$iW@tQ}h)K6Qnr~DI{WG2ZFI`7AP5q5)v`61Hq_Ez!cU75)u(G zEg00UKPeOzVnR9d+=5&pV9p(eZ-D_ilG4CJ35E@`R7gqz3oRHna1tRYb&mN61|ZIF zHXCiTcsiix>44^+V`^=kNp&N0%~}dGL=09R10*~XUX6;E#s%wEJIKmiAr9~_Ij_& tHcI-8?gu$lk>002ovPDHLkV1h|3U3mZi literal 0 HcmV?d00001 diff --git a/android/res/drawable-mdpi/ic_error_36px.png b/android/res/drawable-mdpi/ic_error_36px.png new file mode 100644 index 0000000000000000000000000000000000000000..50c699f22899766ba178e6d67beb361e8462138e GIT binary patch literal 560 zcmV-00?+-4P)Px$>PbXFR9Fe^R?SMoKoFiut1akVDD_}(+G9;92-*j*pwHq#kM#}giztW>P{l)O z>d|`Z#TxKlrL@hiJ5d7p*qMyZFQ*W*y=P!bd|vI21cqG9mVk3AWgadsaV zkTF1`(5?;!4@vEbg2>2|ujxp93GPWr5FY`d=hZp11ok8WJFaeR*Rj`|$uNmm_Ge_d z7-AJ-b_c@_y}mHnGzEi81+8pksiPx&C`m*?RCodHn!RomF%W<~dl9075($oiYbnDf(4~z6>39UhBLEV`6+A#vk{5s) z6wx4BNG_DLG+ZK5lOUAicCc58blU9f+PmW)p}8iv_ShbO@_q4oS1I`j0U;m+gn$qb z0zyCt2mv7=1cZPP5CTHrzajuB%m&Bf>}YrQWr4+0lTQZO>zf-JuV6ebV&|6xpu>E5 zr$F^&5e5M43?~OAu*LGw-=hOM%=1Tj<-Dt#xL!${wEjNWu;(X=^c4kRk{>=nAqHGX*Guu!8||6*J8!tgwRs>MCXmQb=J30W|%6^1N}! zOp&0$iJ|?0pb=j z1Vpgc0QFCH1*JG7qvUjY{$366^yos4g)}yf50r?g)&B%|i zSpl7kd5fBa?{Y2dEt3Q1IIMuq#XRCn(5WxP5%&(84N!0~Q{`ia>bWl;GqmUlYtSnPoM z&Tu5sYXv1EW(p9)4!bj;SUYBl1yybyI!;$stRGTV`{@KIRWVm5cX5qabbd>u6QE?p zd_ko8w}-Hu0VT6zu0m+L?zqEVYU{UJKhrmaR&Qlg8#Y`w9?mzkbE-1J24!xfH(lB} z{hObzuHMJ_-_I@sq!tT6eowIVAba6uFvNo4f zu4@qz>N#^enae0_E{94ampB~M8fX0pJr?Xt z&7a!b>{0!!9cxeZwI>JR@7Y*m#{T(fdSOr$JXBbWw6^h1F&?yQ+ev!sJKtYT@UOB= zUD;-xO$}YmJTkGQ{5~$7H@LfX)n)-~X1WZGsgf2q*X~tI9G#uF1kVb4TK{-3TQ6-L z7IjR{&ub?)YrG&y^_s&Q^l5z%^>$%<{RLwh?3X59cT!4U)~yPf)|qA17+3bYrXFe& ze`;>dgEH`6gV2>NY>9TUTp5KdrS2uadO5IS1smCZCAq(9QIXas9KI~%=pIx-S`G1D zq=C%5F9Q4y)I|$9tVLyHO?tg;E+|de_EF+m2kOG(O~i&IdrK>?RnRfNc=6e?HRY5qd6>^bOk7px$Axfr7{Uw_AusF*v)f1?QN3-ke+Rv&7@ zr{&*wrkiR#JQA79AKBB7Z8%LbjtsYMb06hiO%XIdJhm{u`l!nImEKss4Ej3IRQ&R- zIed)C!Ry7xqDGZHHe0&XuwS3w1u41;wum_=DjpXHDIv^PwSs9zU-Z2OHWQZmE7>iM zQ;j|atWZ$bd_aGNwIw4t(+rB35=>b!atv|hQWc2?_V|o@h1@~-ujGBXk^EhS+i18Z zNyX$6AlszwqKsCCd%J>$Ti|;N_Bb@hR-SL|E%`IAA+~BO6khX^6*FUNU2&%|*`bz) zhaqaqv>&qsBAv1Zh`xy9ryC?SFsAdQhW<;pGSgj30|ZuQF++6TKmzKElJLU#P*|xa zyHhz6vra+RXyy&k=e85WTc4N<^tRSgQytzRyAqUXDCmCe&|UN0lA=%NmqSa@!AEbB;gtGo-Dsw{ zQ7598&v0YXifGOqJ4PmsyY5ITIg2Ze3lYbl_({$szei>+U)=i(%kER*EUrk~hNyej zEf0KqgmRj#Dli+`*vVRHibn_*03FmJ750#{26#xJL literal 0 HcmV?d00001 diff --git a/android/res/drawable-xxxhdpi/ic_error_36px.png b/android/res/drawable-xxxhdpi/ic_error_36px.png new file mode 100644 index 0000000000000000000000000000000000000000..c25e7c8f752354343d82ed4239deaff0a2642965 GIT binary patch literal 1795 zcmcIl|3A}-AD`KTGz!=0Op|=e`r^i!&CR>r!sKR_4s#UDVcOIJi}eK9Y$Lt|3Aiuqmzu#!zf}K^fJBKv+iRKw8xWTQ+X$nuWp^*sD zrfoHSXeO-a+K7Z#Q#q}BbYqM+eI{pda8xrn!fbz3w9o*mW2K0ewJ#Z+K;48{(N*F!I_9FJbcl&#G477RDy+XSUAqb0GddG%(m zaZS53clFNlgIU5M%`kFs_Q9&tT+0tRE7z%ioCK@-chfqsE>kOmc`^!}9`65{3ZwA2 zl;3B@MdTa}KH7eEh`X(Fq@+<8$NIh5`czH@)K=!ZUG>rCDSNL7thx?d z%)@wpeE^}HBmVD|HiX>eMQ!~Vq;FydqXb}8IUwd>=F1RD>G-9MAFr==b<|u0#0JHi zyEf@qIO_{&l%R7?d?D@h0|&h&obi%Q69R z31E@-=2v^Ydqk2nQzdz`*RbY8-LnYq)4c1(?C&kav+zh)wbfW=ionF@El@LOp)`!J zU_Yv>ds&M%1kZhK&Q67{Amm(<&}4QBw%}0hp0{m_l3XxzjDv9wwO{3*dOf)hkeM)h zTk@goB`8me&c9E-c(iTgdB0D$!|Scz_}-p@n-j1{eklv$m(cl<|6X1LadeQ#_+Ic` zow&P$h-?O)!I{1M9%D8a`tY-A_u`2y$}n@A#1z3=A(k5GN}ZGO&bY||WH}&&F@x(r zHD-rHovjTSc3CK&nQ~)N1n43UYM>J}RmNLzy$v7>fENTgVIQL5(f{?!6ZNEXa*?Jx zU|kE}!%55gfE~%5Yz;uat3$-_r}8i-gl5W3S9HR$y3>|)6hX#Q94yokH+lmV&|7Bm ze1Ff;3%E$I4bB{PloF9Cd;|?8lJPFPO##RT;82Fr@iMeGDeD1p@=*B@mor>d2*qw4=|PgWupRdjUT9+oUAx$-r&-( zA~ncEc`!SlryZSr4BDz)2hsfYY?!C9BX%ep&j;oisGHa!E>q>lZOP79H^s=JG)FuA zmd@O@3&@h2@P&brhL(_ z9I5GhtT>B*2jN%e;|lI!z<{QvN?(TkOwgr)+vjh^F@_biJPPb{S(GrlbHMYL5Hq9B z;RE{<;!mWzLLITuc1^Q~a287W#`g0qtni)bO?&aHy%!ekX3D9Oet7CPfAb@K!Cll- z%OyG0av(G!B5N=kmy(Te^S|(bC|1OdjyuQ`23VDYb|-%oNa#o;PU50HYf)|1Ad2-D zT#I|lJ_U7CT+Y3}6pyA?INrlspS;t)SS}~*+^Q??XKYnOom`uGT+}26Llec%b4Qnqn6Nld+V|RbtHD(FL0|7OJ&eKc{>8!Y83) zNNw>Qf*gOG5$v1zL&l8yd~Pjr0nTfd2*XrELf~-ec}u + + + + + + +