From 74c673e7c7034ec9a0b207054dec933109005a13 Mon Sep 17 00:00:00 2001 From: Dmitry Donskoy Date: Mon, 28 Jan 2019 11:30:33 +0300 Subject: [PATCH] [android] Added update guides btns, reordered sharing options --- android/res/drawable-hdpi/ic_undo.png | Bin 0 -> 720 bytes android/res/drawable-mdpi/ic_undo.png | Bin 0 -> 474 bytes android/res/drawable-xhdpi/ic_undo.png | Bin 0 -> 976 bytes android/res/drawable-xxhdpi/ic_undo.png | Bin 0 -> 1520 bytes android/res/drawable-xxxhdpi/ic_undo.png | Bin 0 -> 2037 bytes .../fragment_ugc_routes_sharing_options.xml | 217 ++++++++++-------- android/res/layout/update_guide_container.xml | 41 ++++ .../ugc/routes/UgcSharingOptionsFragment.java | 55 ++++- 8 files changed, 202 insertions(+), 111 deletions(-) create mode 100755 android/res/drawable-hdpi/ic_undo.png create mode 100755 android/res/drawable-mdpi/ic_undo.png create mode 100755 android/res/drawable-xhdpi/ic_undo.png create mode 100755 android/res/drawable-xxhdpi/ic_undo.png create mode 100755 android/res/drawable-xxxhdpi/ic_undo.png create mode 100644 android/res/layout/update_guide_container.xml diff --git a/android/res/drawable-hdpi/ic_undo.png b/android/res/drawable-hdpi/ic_undo.png new file mode 100755 index 0000000000000000000000000000000000000000..ad804fe81797f2c1e463cf8ddb85ef7fae135deb GIT binary patch literal 720 zcmV;>0x$iEP)Px%ib+I4R9Fe^m(Pn%Q5eVHJ42?VnJg4)M20dunj}d!7N{W$I~%f*#UvX^{sY-5 zEG(6hgatbm2!+vXOxYkmHkv76xIW)I@9F)z-TS`xHut?#%v0Zco^#Ige4p=o&i!%T zMq|PLrxl3fcmP}iujc)CBVrW11BuO>AgZqb*Jfq>b=^#F9q6k~9L4s6FCfb%ZSX1n z8L*+N;wW$e%z!L&L1A98SHSA734?qDyaZ_*W8f-yk)EJG4Gwfu)M5&p1>ZqpUW|bu za31_fCTB0dX-<1w<1xKCp9tND$QrE`#uX!YyT5)insJ)*#&i?w64AhS)=(<4y#ng#$x^ zS_-VC*$;MuL7=VDmg!RPx$lu1NER7efwlszv)VHC%EB_iH}K|&%S24XQZG1OqRS%_dK5u;K15lnmnd<14h zVl#BmP$CvI5`(2)NQ~lCa$?#vtSb>ntOn(9O!H1qCRg!;kJ_G?|UfWs1WYcpc*aP*&A*DtuE(Z?-%RS+SM zTWy70)VcZvM>OPYUIh{Ig4LdSo>vZ>JfqiUuMic zxw+a2uF&*A-p<@KoIx-EMLTdz9tyVh|Dz`8Us>%NITNO>IY*cVUGh%72TPEFDOd)% z=@&@6z-*04qX!1$Ci-t<8 literal 0 HcmV?d00001 diff --git a/android/res/drawable-xhdpi/ic_undo.png b/android/res/drawable-xhdpi/ic_undo.png new file mode 100755 index 0000000000000000000000000000000000000000..0acbe9f5cf643452aab041da70bc1b6ee3d9170c GIT binary patch literal 976 zcmV;>126oEP)Px&ib+I4RA>e5na@j9Q545#q%^BV8~X)GL?$gH+8DGbD5EHlHq|0%(Xt>CTDY_R zfv8Qn>0d}HiXv!H5H3;>+N59+T150yD=TyQoY%~F=XBro{hT+8ci=nkoO{pD`{Ui~ zvrxz>AAx)X5+8w5sni9Yg0aM%r|FP{o53aU3wV@fyhMGI?Jn^AU)qbmi3Ul-8L6%W zm%*RKv}?HiNV~yi(2_6dusw3%qzp-794tj<0a{mz*^^X0 zq5Tki2N=;=DcMy(MfEmJN9Y8SFd*wJDU_zVJMpL{5=>5PTbW zTu!F?(9Y=C3I>2AtVv!37qm^?WP%sL8SoW&{ONiOJXGabpbx`4rcT526fgiZWp_@59WgR* z0k2dA!(shos!#H#Q~@Gpf9(i5DkLih;|IywpngC5CcloX+Ka{FJhAVp_(zr8*dil; z!WeyF<*>6}#T#x0%0oM$hPa5lLA80JZvj;NSxPU{kj*&7wzn4F8!c@G-vUrxWf=T4 z_$eg9kIRkGD1MBn|{YkU7cxFD;c&;U68p!Q(Mb#>O zrqdF_%%|GzDqymzRVcK=_ZV{8Y_AG1i~L@-d7`U;d&;0LhY2$+@B2e4_I(bx1=Z#j zanuUFfeOvStan?*?rSgXN16;nP_t_kR(Rt-b>qGr-> zgzj3c%M{C3IXNdn5jGt_ zFHf30dd+XVrK7XKq5SjWk>~#ZpDCKogLZ9a%Jeq@c`?WbExjyh^5_%4J54(mFZb-g zgyUwEuY=PLqfz=sfE@jDEtV^YZ2C=LA8?KAIQ_jGS}%B}M-(D^!fyoWibM~viuS&b zQYyjZ?c}$H!&ESV^6@A+Bw|BwS<_O8dF?=4lAfV)7A%jGNT@yF3Pd9ECOQD*qwE$S y>s}yxK=y*{iD~cz++v+i@ysb7fqVpFj=*2eC4qOO7!bq&0000Px)s!2paRCodHn_H+ART#(JS)pZOYL=B<(CVS6hzx?P4)q`+A<~OM5F~-V^b%1) zaR`g@A*hGwLOq5gJycW>s00Op7!m~?w6L3LpyUPX96FwU|IVJxo^{r3=FB>K&pz|P zpFQhaYkimhteIJ}X6-q18fh447-$%17-$%17%0iW#KgpWupJx+@0K((nB5@cUT^?p za&|B?EtnN-ECg?Wvl%nlZ$VRo*Bm0&gWobj%-_MwI5H!MSPI@V2{Fr&=4Px}YbHEF z!Y2H@29`$ndz3cI!711ivs*0xPilG&l%J!(c%oKWWVp_*QTd6p@$_WZFA| zVhcDoZAJ;K6ZBQ!GY~69?^)e;_fxn!K^o~z68OX5Sa&wIV?}~~F}MwE1kV87pkw7v z8s3#YqXZrZd>MG(m#NDweXa#hg71C(+jXP-YPwKQA@~j8a66gYPbecA&jpWxqq&au z!V4jLeOpgHi@-Z(Uawxb`smraN z_oS{QFCYoM#9p51iu}^=X7Dp`iEiBWe7Y4O!q*l8E(6&}v=OB#K>g-PzNCxRL4Zcm zX&XCj-Ik&@2d+ItJm?`vGwyo6mQ;DBAmJ4cNyAn8s--Q+(G$yHeXnqFV4~um(n5IHHL0)3?+j;g2cf`4kEPPG~ZFzQO^c~_I0w&A1L?h@~Ww& z*+9_YscCmKH*}612T=qu6o0o|$J-q?`%SHnk1o*%O0Pr_gazCCi@to;L3|_VqEG^{ z1YH<1)W`Lj54ps4;&W|d2^!7ynk)o|r=?FXRK7UJLIK4RWV@V7t^S1qN>J~M)0S5* zgjj;~@@IvM-i-*2jQo`8Pv)cs!-OVECYp$!gwU#J=3%LwF7M=(cu<3Hl4>!@Q1+TH1qKj>?M z2=xKr%5hIVm1&kZ8zYw4v{biF({!@##J0;3v(%d_b&SDn4riZM>Zl@P#Co42Ua7}G z%znxEXfSxaEIVW<-ctIO#MlD+9I;C6TSzM(AckE-R{MAQ=8;b<4*{Q~Sxv;_YA|JY zd^?h-%2QumPhwdC^nuVN)!v-V(DAy%;dvaro*F$9{A&}$H;(wE*2!I+G(a4z1iH!D zL?7jDN*aK}IDU2C*=Y-^OSi+(y;?O6U+r>g9_m}vE!BGTTf^UZ;4L!{qpXwad+qQ$ zDN>801>jpFfbODpSZpj}vus=ZECG8!NVb;sQK}!&Tm!T*$tAkpp9OPEIf&?lZEbh? z5rpLR2y@jpA*waNbwA32{*Ht7ReHzXa_}Yy?N6l1#BR{LjZ-+^tSBPn3)S5)%PRk&{YR0YC5}nnQqW7+P z{uN3L6TDtgfrmFAu_3;A@^tqx?3~Fwij2Fwij2Fwig%WZ*wz W`z(H%{cmgl0000Px+uSrBfRCodHom;3CRT#%TnwJvG)H0<=!%K!2q%sKtGfR|S6fuGnN-L_DAbaRV zqXNN*ddPf;3@m)e2P=w5DigefX+B6u2XF*D<+;1% zaSyTwgEgR9PLwA?k0XKc`QUIh^Oa?f-EMu?AbB|WutIjD-`0=P(+D7Y5jft6^y)HC z-EUpDAa^AAqMBsWa_dIwndgw)6Fdt}n+UJ3^DKl*@Jl^Aj_XMhP;FutD+|CCMP{OBfyUblv@NFPyt4-EB?*f`AzTz< zRH8>71nVv>75nEF%)bq`lY~2)?Mh(@V06+B<`eK7AS0Ke<#rtSh9s;6R~GF|Q|%M* zK=2N5k%e@6AAAOW0y6SRE23vyQ%Uf_7(vefiB8V-e$!uuwiCe9;A3zSxX39wJzTH9 z^y>uOAG{7O0IS#tK|w$82-pac%71it&Ss;O^#nc@$WYNJNrFew6tKmpuyN%IioLjM zkR;yJZ3(&$kXdZ(aoxoT`sDt?L6AgNxY#O1A6S|QzHP*oYk=sIL(>Z&Hn|P#b6p(wvUxNFq>s*)7GY0Gj z8j;aa_Zy1ZuBVlY^}1*vc7Y-R(qwU6*RYxu1CaZ!Fl>>ZsW0@V zPFC@Hrw3wh1e!z90`HtJi$f&fRbZ1{Wr^3jIAC7p2i7O_XybIFKb*lWDd(=;F`8&D z#4WU_3e~O*uyqdr)z_d{jfgz*lK8o!um>oz!d@Ux-F;+fI*9taEo~yzApsFeVhh&B z)^t@&?^+B?nKHoPMQ)Ya?j3B&)M!vv%K!n^W;>$e& zM-7}N8Uq{j_*$ij&%{q8E|)!Ee?&`HfxP%uX3@lF;wQq5O9D*Oae2n_`iPbC6x^c- z#l%mfyGsJ(GXQZSFEQL3SJ}$tY*^Rf{{%%0CVnE_T@tW8qNTQAR_$tO)@Blk?Jb$z z9e2<24VtaNbUo+<^`^;MzRu;OotQocHhD9td6zvvY%$3Vh9V#n zFN*HUCO9<5vMJaOQ%XyIG$YpKmUyLF?uK346pt~~7ua6wd7vrI`JYAyjf-OXdCsmlUA)#57&s{6-%6z>gFDHu`2KJ+T>9WIaRwvaHGLlTaeWM0TSJe zS36;9h*8^90`0UJV$$Jj9e%fg4L~Ey3W)>Hf@=T$QDvcA!WN=y&5N+gh$^(_E^J|6^ zn(wy#OS}8>^CG=w{JR1C3bf+Kn=yDRuXg^a@LIO4dFiRjUITuO0|yi_RGMtc-is6( z@#>+9XO>?%wk`wS%n|TqHqcDAXm&|tV;h-*u6(-Ulx=c$+5O9Z*YQ*MMLT?00_3IZ zBr-Q222*M!0{H~YcL^f-p0<-xnsw@q-63FY0$(dl-*7V6tWJ123>>U@tN1-n8~H@p zHO=r5JM!6^CxE*wgXaD2q|So_xb+444R}f$3lbNF$%pc|LZ}q)`&rH`fG+QAm-;wIztj zvYvs+b2sfk9)LOxVEM((y4Nw0<$c4F#HON6k)xTqcpvSjvlbl5F7&XfUICQ*aqq0zpg?=kibA-ATSUZ2n+-U0t118z(8QY4+j1RW>pcQ T#%}Fe00000NkvXXu0mjf^a{Kn literal 0 HcmV?d00001 diff --git a/android/res/layout/fragment_ugc_routes_sharing_options.xml b/android/res/layout/fragment_ugc_routes_sharing_options.xml index 36f0a28bb5..4abbfb1f4d 100644 --- a/android/res/layout/fragment_ugc_routes_sharing_options.xml +++ b/android/res/layout/fragment_ugc_routes_sharing_options.xml @@ -24,6 +24,118 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + layout="@layout/update_guide_container"/> diff --git a/android/res/layout/update_guide_container.xml b/android/res/layout/update_guide_container.xml new file mode 100644 index 0000000000..8378d3a1a6 --- /dev/null +++ b/android/res/layout/update_guide_container.xml @@ -0,0 +1,41 @@ + + + + + + diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java b/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java index 0858a2edf7..23b005c97a 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java @@ -96,15 +96,35 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl @SuppressWarnings("NullableProblems") @NonNull - private View mUploadAndPublishText; + private TextView mUploadAndPublishText; @SuppressWarnings("NullableProblems") @NonNull - private View mGetDirectLinkText; + private TextView mGetDirectLinkText; @Nullable private BookmarkCategory.AccessRules mCurrentMode; + @SuppressWarnings("NullableProblems") + @NonNull + private View mUpdateGuideDirectLinkBtn; + + @SuppressWarnings("NullableProblems") + @NonNull + private View mUpdateGuidePublicAccessBtn; + + @SuppressWarnings("NullableProblems") + @NonNull + private TextView mDirectLinkCreatedText; + + @SuppressWarnings("NullableProblems") + @NonNull + private TextView mDirectLinkDescriptionText; + + @SuppressWarnings("NullableProblems") + @NonNull + private View mShareDirectLinkBtn; + @Override public void onCreate(@Nullable Bundle savedInstanceState) { @@ -139,8 +159,15 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl mGetDirectLinkCompletedStatusContainer = root.findViewById(R.id.get_direct_link_completed_status_container); mUploadAndPublishText = root.findViewById(R.id.upload_and_publish_text); mGetDirectLinkText = root.findViewById(R.id.get_direct_link_text); - TextView licenceAgreementText = root.findViewById(R.id.license_agreement_message); + mUpdateGuideDirectLinkBtn = root.findViewById(R.id.direct_link_update_btn); + mUpdateGuidePublicAccessBtn = root.findViewById(R.id.upload_and_publish_update_btn); + mDirectLinkCreatedText = root.findViewById(R.id.direct_link_created_text); + mDirectLinkDescriptionText = root.findViewById(R.id.direct_link_description_text); + mShareDirectLinkBtn = mGetDirectLinkCompletedStatusContainer.findViewById(R.id.share_direct_link_btn); + mUpdateGuideDirectLinkBtn.setSelected(true); + mUpdateGuidePublicAccessBtn.setSelected(true); + TextView licenceAgreementText = root.findViewById(R.id.license_agreement_message); String src = getResources().getString(R.string.ugc_routes_user_agreement, Framework.nativeGetPrivacyPolicyLink()); Spanned spanned = Html.fromHtml(src); @@ -151,14 +178,21 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl private void toggleViews() { boolean isPublished = mCategory.getAccessRules() == BookmarkCategory.AccessRules.ACCESS_RULES_PUBLIC; - UiUtils.hideIf(isPublished, mUploadAndPublishText, mGetDirectLinkContainer); - UiUtils.showIf(isPublished, mPublishingCompletedStatusContainer); + UiUtils.hideIf(isPublished, mUploadAndPublishText); + UiUtils.showIf(isPublished, mPublishingCompletedStatusContainer, mUpdateGuidePublicAccessBtn); mPublishCategoryImage.setSelected(!isPublished); boolean isLinkSuccessFormed = mCategory.getAccessRules() == BookmarkCategory.AccessRules.ACCESS_RULES_DIRECT_LINK; - UiUtils.hideIf(isLinkSuccessFormed, mGetDirectLinkText); - UiUtils.showIf(isLinkSuccessFormed, mGetDirectLinkCompletedStatusContainer); - mGetDirectLinkImage.setSelected(!isLinkSuccessFormed); + UiUtils.hideIf(isLinkSuccessFormed || isPublished, mGetDirectLinkText); + UiUtils.showIf(isLinkSuccessFormed || isPublished, mGetDirectLinkCompletedStatusContainer); + + UiUtils.showIf(isLinkSuccessFormed, mUpdateGuideDirectLinkBtn); + mGetDirectLinkImage.setSelected(!isLinkSuccessFormed && !isPublished); + mGetDirectLinkCompletedStatusContainer.setEnabled(!isPublished); + + mDirectLinkCreatedText.setText(isPublished ? R.string.upload_and_publish_success : R.string.direct_link_success); + mDirectLinkDescriptionText.setText(isPublished ? R.string.upload_and_publish_success : R.string.get_direct_link_desc); + UiUtils.hideIf(isPublished, mShareDirectLinkBtn); } @Nullable @@ -180,10 +214,11 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl { View getDirectLinkView = root.findViewById(R.id.get_direct_link_text); getDirectLinkView.setOnClickListener(directLinkListener -> onGetDirectLinkClicked()); + mUpdateGuideDirectLinkBtn.setOnClickListener(directLinkListener -> onGetDirectLinkClicked()); View uploadAndPublishView = root.findViewById(R.id.upload_and_publish_text); uploadAndPublishView.setOnClickListener(uploadListener -> onUploadAndPublishBtnClicked()); - View shareDirectLinkBtn = mGetDirectLinkCompletedStatusContainer.findViewById(R.id.share_direct_link_btn); - shareDirectLinkBtn.setOnClickListener(v -> onDirectLinkShared()); + mUpdateGuidePublicAccessBtn.setOnClickListener(uploadListener -> onUploadAndPublishBtnClicked()); + mShareDirectLinkBtn.setOnClickListener(v -> onDirectLinkShared()); View sharePublishedBtn = mPublishingCompletedStatusContainer.findViewById(R.id.share_published_category_btn); sharePublishedBtn.setOnClickListener(v -> onPublishedCategoryShared()); View editOnWebBtn = root.findViewById(R.id.edit_on_web_btn);