From 9ffb4c6639c22dc446d849572400bdf1727f4dc0 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Mon, 27 Mar 2017 17:45:00 +0200 Subject: [PATCH] #781 add icons to website/twitter on user info screen, cleanup --- ICONS.txt | 99 ++++++++++++++++++ drawable_resources/ic_twitter.svg | 1 + drawable_resources/ic_web.svg | 1 + .../android/ui/activity/UserInfoActivity.java | 29 +++-- .../owncloud/android/utils/DisplayUtils.java | 48 +++++++++ src/main/res/drawable-hdpi/ic_twitter.png | Bin 0 -> 958 bytes src/main/res/drawable-hdpi/ic_web.png | Bin 0 -> 1212 bytes src/main/res/drawable-mdpi/ic_twitter.png | Bin 0 -> 664 bytes src/main/res/drawable-mdpi/ic_web.png | Bin 0 -> 761 bytes src/main/res/drawable-xhdpi/ic_twitter.png | Bin 0 -> 1279 bytes src/main/res/drawable-xhdpi/ic_web.png | Bin 0 -> 1683 bytes src/main/res/drawable-xxhdpi/ic_twitter.png | Bin 0 -> 1894 bytes src/main/res/drawable-xxhdpi/ic_web.png | Bin 0 -> 2511 bytes src/main/res/drawable-xxxhdpi/ic_twitter.png | Bin 0 -> 2491 bytes src/main/res/drawable-xxxhdpi/ic_web.png | Bin 0 -> 3387 bytes src/main/res/layout/user_info_layout.xml | 55 +++++++--- src/main/res/layout/user_info_list_item.xml | 31 ------ 17 files changed, 207 insertions(+), 57 deletions(-) create mode 100644 ICONS.txt create mode 100644 drawable_resources/ic_twitter.svg create mode 100644 drawable_resources/ic_web.svg create mode 100644 src/main/res/drawable-hdpi/ic_twitter.png create mode 100644 src/main/res/drawable-hdpi/ic_web.png create mode 100644 src/main/res/drawable-mdpi/ic_twitter.png create mode 100644 src/main/res/drawable-mdpi/ic_web.png create mode 100644 src/main/res/drawable-xhdpi/ic_twitter.png create mode 100644 src/main/res/drawable-xhdpi/ic_web.png create mode 100644 src/main/res/drawable-xxhdpi/ic_twitter.png create mode 100644 src/main/res/drawable-xxhdpi/ic_web.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_twitter.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_web.png delete mode 100644 src/main/res/layout/user_info_list_item.xml diff --git a/ICONS.txt b/ICONS.txt new file mode 100644 index 0000000000..3dffdb83c1 --- /dev/null +++ b/ICONS.txt @@ -0,0 +1,99 @@ +Standard Google Material Design icons +Copyright (c) 2014, Google (http://www.google.com/design/) +uses the license at https://github.com/google/material-design-icons/blob/master/LICENSE + +Twitter icon graphic +Copyright (c) 2014, Austin Andrews (http://materialdesignicons.com/), +with Reserved Font Name Material Design Icons. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/drawable_resources/ic_twitter.svg b/drawable_resources/ic_twitter.svg new file mode 100644 index 0000000000..7c22e2523d --- /dev/null +++ b/drawable_resources/ic_twitter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/drawable_resources/ic_web.svg b/drawable_resources/ic_web.svg new file mode 100644 index 0000000000..2c65f3259e --- /dev/null +++ b/drawable_resources/ic_web.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java b/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java index 8b41b390eb..513770bd4c 100644 --- a/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java @@ -130,12 +130,18 @@ public class UserInfoActivity extends FileActivity { @BindView(R.id.website_address) public TextView mWebsiteTextView; + @BindView(R.id.website_icon) + public ImageView mWebsiteIcon; + @BindView(R.id.twitter_container) public View mTwitterContainer; @BindView(R.id.twitter_handle) public TextView mTwitterHandleTextView; + @BindView(R.id.twitter_icon) + public ImageView mTwitterIcon; + @BindView(R.id.empty_list_progress) public ProgressBar multiListProgressBar; @@ -252,16 +258,18 @@ public class UserInfoActivity extends FileActivity { populateUserInfoElement(mEmailContainer, mEmailAddressTextView, userInfo.getEmail(), mEmailIcon, tint); populateUserInfoElement(mAddressContainer, mAddressTextView, userInfo.getAddress(), mAddressIcon, tint); - populateUserInfoElement(mWebsiteContainer, mWebsiteTextView, userInfo.getWebpage()); - populateUserInfoElement(mTwitterContainer, mTwitterHandleTextView, userInfo.getTwitter()); - } - } - - private void populateUserInfoElement(View container, TextView textView, String text) { - if (!TextUtils.isEmpty(text)) { - textView.setText(text); - } else { - container.setVisibility(View.GONE); + populateUserInfoElement( + mWebsiteContainer, + mWebsiteTextView, + DisplayUtils.beautifyURL(userInfo.getWebpage()), + mWebsiteIcon, + tint); + populateUserInfoElement( + mTwitterContainer, + mTwitterHandleTextView, + DisplayUtils.beautifyTwitterHandle(userInfo.getTwitter()), + mTwitterIcon, + tint); } } @@ -275,7 +283,6 @@ public class UserInfoActivity extends FileActivity { } } - private void changeAccountPassword(Account account) { Intent updateAccountCredentials = new Intent(UserInfoActivity.this, AuthenticatorActivity.class); updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACCOUNT, account); diff --git a/src/main/java/com/owncloud/android/utils/DisplayUtils.java b/src/main/java/com/owncloud/android/utils/DisplayUtils.java index e82cb4b7b0..961d723154 100644 --- a/src/main/java/com/owncloud/android/utils/DisplayUtils.java +++ b/src/main/java/com/owncloud/android/utils/DisplayUtils.java @@ -78,6 +78,10 @@ public class DisplayUtils { private static final int RELATIVE_THRESHOLD_CRITICAL = 95; private static final String MIME_TYPE_UNKNOWN = "Unknown type"; + private static final String HTTP_PROTOCOLL = "http://"; + private static final String HTTPS_PROTOCOLL = "https://"; + private static final String TWITTER_HANDLE_PREFIX = "@"; + private static Map mimeType2HumanReadable; static { @@ -150,6 +154,50 @@ public class DisplayUtils { DateFormat df = DateFormat.getDateTimeInstance(); return df.format(date); } + + /** + * beautifies a given URL by removing any http/https protocol prefix. + * + * @param url to be beautified url + * @return beautified url + */ + public static String beautifyURL(String url) { + if (url == null) { + return ""; + } + + if (url.length() >= 7) { + if (url.substring(0,7).equalsIgnoreCase(HTTP_PROTOCOLL)) { + return url.substring(HTTP_PROTOCOLL.length()); + } + } + + if (url.length() >= 8) { + if (url.substring(0,8).equalsIgnoreCase(HTTPS_PROTOCOLL)) { + return url.substring(HTTPS_PROTOCOLL.length()); + } + } + + return url; + } + + /** + * beautifies a given twitter handle by prefixing it with an @ in case it is missing. + * + * @param handle to be beautified twitter handle + * @return beautified twitter handle + */ + public static String beautifyTwitterHandle(String handle) { + if (handle == null) { + return ""; + } + + if (handle.startsWith(TWITTER_HANDLE_PREFIX)) { + return handle; + } else { + return TWITTER_HANDLE_PREFIX + handle; + } + } /** * Converts an internationalized domain name (IDN) in an URL to and from ASCII/Unicode. diff --git a/src/main/res/drawable-hdpi/ic_twitter.png b/src/main/res/drawable-hdpi/ic_twitter.png new file mode 100644 index 0000000000000000000000000000000000000000..7fdcf2fba9650d44c8e2e37c350fbe992bc9bb22 GIT binary patch literal 958 zcmV;v13~Plyv|7{;G>CQG_I-GwgfmO^Qzcu-_p`)3cmlu{|!9`sP8Py~AlqTNb1 zGm|VxI|onm%{ZysL%VgMQapJnE|hu@N{0Jl}8L`SX6jNF$9jT*;sV9mjdTTCE-iZ~(wA01%ONlIQF7`l)ic{O^<6TrM{@ zH8u5?=Xrm$1+r~BSF6>|EH5u_^$Jrg7U$wPUIXxIo05AXvQI>|NPbK*CnCpP*FBpE zl+Wj@xQCb+=wqGWB4Zuv7QZ}r+rj*+M*aHA)jg^^9W)46Wz`km= z`pd$?!c&I0%(E&P*w z5&4Vp-O=rBdmI4&m>%W~FJWh}cT06OCq5$oTm9H2@D= zF3bQp8b#4<+qQ#ZvAC->S<|%X9$`Szb6r=p`cHjjmSrgbW|zF{Brj^3_NR#4jN^C* zfYlzEETxp!YGzuEFbu!ab^SvTd80$vP7&Ej5+u>5{!TKRfK1c;Ohi5sk)KGu1Yow` z)lz6P$!r25xgjD4Ngf;`2mm0C<2y-y(@R~cRIZ4~-C@H3*zkRSy(`el%1S+sQR z+!_$i_nzmibt~#Pp_NiM48xcsc}zrp2XMbnnBNS;_%cml>OJ-1;^LdSuKx(&^e zCF2o*O90lwFgz0k!9RW8Onab4EiEn0gkd-jV3y>xrfFkw9M?2Wdk{s@`sC!~b;oi3 gdlrb1MjE942ggY>fPn3&#Q*>R07*qoM6N<$f?&a{R{#J2 literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-hdpi/ic_web.png b/src/main/res/drawable-hdpi/ic_web.png new file mode 100644 index 0000000000000000000000000000000000000000..d86b798077560a18d940e85c008d39622dcfba8a GIT binary patch literal 1212 zcmV;t1Vj6YP) zNklW(%9Bw6j>2OiQ zsZ^qCA}F8F-<(RNUItJEu&YP66(aKL_4>OL6BD(oCa72}?kA$R0o=LSiYoj@Ld_yT^UP_r)LI5De%%jXaLPSg2=3iT1U;nIIAvy}OEbBOcLyhe*PlsVR z=s3}GRnGoUtfQrUXxvu*X z03I6~yI)FqPR&O|beH2ezpG6QF!KTcQ;E9QahwaP+EV~VwByUUt~+zt3fZ=O6Mz%3 z7-s%57Nf>FZTaa~3;-zmv{sD+vFW<*D1ce55ECj_cR@iAyn_F(ro||VUW~;g1rgE5 zEhTTB+ppQ2N~QGw)Ez+(9O-&wwrv|h5GujSCZgDW-1EF|bY2KC3E;5e3!dklXqTi|EWS!az8b#c zy6%w#{}>T{t>Sd95E0!I+ooxrZIf$z!_hD)VJ#>U3RA8m5= z$3_%IE1d)-xc(%ch`mkcx;;An7bFF(#YSIW-;Orx8%JT9=FUz*6I{#DCStGYT$3PX z{yDazC>m^&Yc)2cl>O*{1h<;x_1Jn&AaP?9LU;fQJ=gc@z;|7@*tSB3Va#r^n3kMP zf~wW(8T{LPZ55VP&IVfA4pF5Xvs9q!E(8LN#oB0xKHu9WLs)k*3-;fQNtfx z*L^tVN~KbN6h&v5dAFJxb6wZzSRnw&WHOTgE&>2E@2=PDQ@U^>s%XofZ?kKC?v!Rz z7=|BcVlJv&O=#B-{S6=w)p8KgQ>wY5q#$PAYgyKSR-FN6-m8h9Q85k6vfc-7id1VS2cZSgSfOJ@sEC6U>}0F;oYdJcF|tyZt(a=Amz0#bWWzwj~4N`~DnoxlQgjU==u#AaEfJ!}+?s z)q(H(1z;2S*=EKEYEM!JYmN5S4pemoxYmZeE2!$``uh5ZmI6~#Q*%INx8$|z7pAAD zf439>)EIL~RcHBkqjoCrpxM_bKqiy<0jvSGX9~EdYHaE{fPgclZNBkGYw6%k)|R0000?|&19Vg0WKeBYl0@*;Bis343n+n(oT^ZESR9|?qE z=+$bqWgugrDsak1zhSXkz-QnGaK#F#-QC^C<#M^{@_C&C4*5^uQM1{+4V(oUTI+eO z^*qo3&WXrPU;#J~kzjauc)63WO~Cj435PtTlzJAA$LD|qP$?FRTg75=3#b4It@WHz z>Z#{>sYt}8wp$>bPWOpO(O!2+DYaq0@7g1)j^8SPh)e2mD_G$j7jx~91fo~0P)sUM6MfSXf~T;D=RCT06`Eu0G=CTUKR?4*^YXx zipYK7p;GDvz~bWKXe<_cFCy2vYG8~x50FSCJ~=#tR{VQshz>RwVUcgd)h6)2tR)~K z-vH|M`bB4d&qj2n)6v29A}sQaxWIWuK@hwG?)50}*Gj3G&J_mpj0X~j4^>-KFMaY<2Iks&*whVSzCuS0DCrP zv7l5cHM(jLneY2~5ea|;V@y_Sy&j9jwgJ&vUj^_y?;~JDuR-XT)y89oJ=M& rrM1rWeBij|jLb=3lz$kR$KQSd&u9|Ojc(@U00000NkvXXu0mjf@4-^P literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_twitter.png b/src/main/res/drawable-xhdpi/ic_twitter.png new file mode 100644 index 0000000000000000000000000000000000000000..3c35dc24ce9bdc2fd04c6af205dad7be16c8f62e GIT binary patch literal 1279 zcmV3_>X0pU?vXQ1>OKS~cMZ8cnt)ZkBZBVc+h(9P4l-3lt2!>{} zvlHtd14@(KY`c*l)V5dkq8Dq$qE-` z%o9qfHvt^!>FGI~6Tmdhog`oJdc7^SZBM%}>Z_De10?Uuv&$s_Hh^XTn*rPf;N0x& zY-3+v-(T|swZ(dq+y$U1nM@utP19S7dE2(DMdWw^<^fqjRivpw# zKbpRLl4Sp$J$vel1(=?m-aRj0F}ea^tEOpxn5Ox*X__x)1t7T`fIjb5Q!14@ZCTdZ zLM!|I{wfhMOE3=r697JO9A`w+wDpNZ;%HU?!!V{6Npi1QkQjI-vVIE?J~VUBiR~ndW3p=dna;r zDyLGZ)Y*an06;`Oy4}Xp8o$0OEeODIoDWdM3w#Uob*_L#0b;S(HKkN5fYfaUI93z@ z0PNeh?@N-~0F=BRC`KeFCMPHRiv|FINF?$x$+ZAZlp8=P^UNWKjs^pYX$%Sqobp*k~~xf^9Oo*dJ6hr}0<^ccukd(0Eh5r_ zxgA!W3&tH0iPqHAyk*;VN$af}0D{5bI!)7pB67E;Y0E@pIRKvvhX0j_`~YBAG#dTh zjeIx!2Zn}*er;-M`ob`bJ4Iv@fTb>aA0fHh>-Dzn-MjaqTS+rMLVmx$%IEWKA^9@q zwwF~!t3;$8b4M!Pw9zR5zlq4OrfKJu pQr{*LiPPE6bSkQ-qKf|e`UhlKmeef?ArAlm002ovPDHLkV1m8xJg5Kw literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_web.png b/src/main/res/drawable-xhdpi/ic_web.png new file mode 100644 index 0000000000000000000000000000000000000000..628bc2c012087ccafa43dd9850733f0c0118d158 GIT binary patch literal 1683 zcmV;E25k9>P)nn5Ysf3L?ZDR5j_oH7J#V$CIZm%k|cmW0Dlru zkK;J|Dk>^|F-_AM(F7uq$i1qnHUd}zVDb>V_c8M>MNziKVzIuPnm{BHsSX4J>xk%e z0C!x^BmhV=^M}m5wxgrt{0&dQFpLHO?*q8|I*rRX4`795S)bgH1WeOZlgZ>J0B@9# z0P{ zQokyS@)3YRlSI@Wi^aY63!#03^;qKHV z5{adzX{K%4Ud_x;0XQvO!ptZGiEP!nieKMEJ)pvGw_6`ubu1^E-h@eR` z^9ORgJeL;k%8ZtlmInvg9UUE~bGckSfKy^WBHEhwGPDFTnT!cwoIvH6`PHtjt}_Jz z6lI~*b+2vP{c^lKw^!sG$9X|)cXoF6GV>B#S)~RrHk-|E7*Yb!Xmmn;lM?Z^ZQF-k zX0}11_MkNONPS;)N%Sy)Hi>>M8jVhL3+TFx>bm|85w&7;q202qB2PsLn5L;DlgU#6 zCXKXX34NNTO_2|PMUPM_m6|mQ%>%&1R4VnjOco`;%yUQDX(=#sz09dDqM1YmPu2>{ zvRpS5!!Y(k*kPG@o^9Lvyi7!+(Rs}Lqd@&+Syp|C_+bE>1!|V8DY^qh^l*VdQF=W5 z6s*sxs{ZXai`i_p*DHq4*bn(80H8)}F!L!7Kh=`#qb&XxU4C9W(~t=LGfW~w4l|ptag!b+XwcKw98U(^H!8VC=@z^ zD^;}7hQ7Qv?*#Ivy`3ZN)&)D=N|CCYl8Cl3^C|%40=FR+i>;BhhGF~;;8B5EQmQy* z7{<#0b_>+cmSxq+x@a`Ik(u8Vs5B96bBpP^k>zWZ+eMC50c+4Q8bDE~@Fio>Okw~m3A|1tL z&Tr%Kco;sos?(!snxSMe`5D}cyJzyn-Ek0#y8u#wKwvrm1sRC>MvL zxI5JH`c?qTOGw;G=0D{BK64e?0Ste6T||B@-;7c6fy1}FF5}RlL&xgs>OKZgK}0jI zC5D7FGj}udLff{F47Kxhy+K8z(TR@ZG!oG(xbjtUC>Xhqd@=?;vnq-*mzihcCVpnU djoY}@@gLD9TJ&v{bGrZl002ovPDHLkV1jf97m5G? literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_twitter.png b/src/main/res/drawable-xxhdpi/ic_twitter.png new file mode 100644 index 0000000000000000000000000000000000000000..a0eb86985c4920d85a8362d516e67e65c79db099 GIT binary patch literal 1894 zcmV-s2buVZP)MnDwWE<(b3V1TBHw)#p3$RX#jp7awaZJ;EI;eh0*Y&FbbcHO?%$$Gfx^CL5@l5{h;el5JIAj<` z%C_y82m85eu4yYn7UvvD{={|NWX(F&Dijf~lfy+MbH!ru<>BGsYa6YwhzvC9>yrw} zjgI4dA9E}*&QS9gS4usr>%JzimuQ-{+p?^KN~x_UPoCVlef##3S7#CFBST;PlmM)C z9A}RgV=pu5i8)3yFB~KJE2Y#fFAGS+F!q!DLdXJ@UDxgKYFxL^5Rt6_e%4@R21I0x z>`6_-FfJ$g9DoHaNFZ#Ex~}_Cug3L;c>q8*n|+?- zcK}qp*w1r(wV;}>m}OZz0qiT4O1m7#dBikL1>gaMyA%kUNk7K*=0O*T$bGR`>`l`& zUl5V6l6x}BYvJY zdkTd@rN6&_XK!z>pnCA;N!)qD`{i=^TL%st@U_eU8r*PCrBavbx;_Tr`bJ~45)s*v z&1S#Zh_A0!uzvme4gk#O^M7<*_Xb_pmjg(nHQN+T=p*+w>g?;+Po+`=x~@+EcniR3 z0KKRlo6K88WLGwu9c>D;Rxey_ECK%r15_xJZdws7IXGRZ5Ni4`#WdwP1-6$*tw z_Rj;E%I|Gz(8lgLqkJ-3l=O`Eh1L}SVr<<5$S7@ zI43ksTb0RVUJf#7Xv+lCG*<(75Wt7SRtCU3B(HKD=cS+nH+5ZQHbzHBFRWB5n?>X{ zv}T=lg5;Vo#6ge=*tXp>H8pjoh*$tV)B<6E>Iuaf*L8iJRQRE3fl{f|a!u22Bl+zX z3IhQ9bX^}zr_*nT`4Ha%jf{-+Rw|XtNq$i&wU*?kTPO+uoF+MT~LDR$h z^uGWvMfHCipHNCIAvpk`2h~gAodDiO_2SaIsP13C2H+5Y38mDZa=F|D>RiW-h=_=Y gh=_=Yh?rOW2LVTM-y@NGG5`Po07*qoM6N<$f?X<&s{jB1 literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_web.png b/src/main/res/drawable-xxhdpi/ic_web.png new file mode 100644 index 0000000000000000000000000000000000000000..bd139a757811ee609579717ec522bd48b277d83a GIT binary patch literal 2511 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 literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxxhdpi/ic_web.png b/src/main/res/drawable-xxxhdpi/ic_web.png new file mode 100644 index 0000000000000000000000000000000000000000..f37365234a9b767cfe1fed10e58d7162db54241a GIT binary patch literal 3387 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 R@16hv002ovPDHLkV1hO6OcVeB literal 0 HcmV?d00001 diff --git a/src/main/res/layout/user_info_layout.xml b/src/main/res/layout/user_info_layout.xml index 8080b4fbc0..76c15f9430 100644 --- a/src/main/res/layout/user_info_layout.xml +++ b/src/main/res/layout/user_info_layout.xml @@ -174,17 +174,27 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + android:layout_height="wrap_content"> + + @@ -192,31 +202,43 @@ android:id="@+id/website_address" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginRight="@dimen/standard_margin" + android:layout_marginBottom="@dimen/standard_margin" + android:layout_below="@+id/website_headline" + android:layout_toEndOf="@id/website_icon" + android:layout_toRightOf="@id/website_icon" android:maxLines="3" - android:text="@string/user_info_twitter" + android:text="@string/user_info_website" android:textColor="?android:attr/textColorSecondary"/> - + - + android:layout_height="wrap_content"> + + @@ -225,12 +247,15 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="@dimen/standard_margin" - android:layout_marginLeft="@dimen/standard_margin" - android:maxLines="1" + android:layout_marginBottom="@dimen/standard_margin" + android:layout_below="@+id/twitter_headline" + android:layout_toEndOf="@id/twitter_icon" + android:layout_toRightOf="@id/twitter_icon" + android:maxLines="3" android:text="@string/placeholder_filename" android:textColor="?android:attr/textColorSecondary"/> - + diff --git a/src/main/res/layout/user_info_list_item.xml b/src/main/res/layout/user_info_list_item.xml deleted file mode 100644 index d33a2a4315..0000000000 --- a/src/main/res/layout/user_info_list_item.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - \ No newline at end of file