From d61e4cce1075e3561406be96b402def5f90dcd58 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 13 Oct 2014 14:36:19 +0200 Subject: [PATCH] reworked muc details and contact details a bit --- art/ic_action_copy.svg | 108 ----------- art/render.rb | 2 +- res/drawable-hdpi/ic_action_copy.png | Bin 717 -> 381 bytes res/drawable-mdpi/ic_action_copy.png | Bin 585 -> 288 bytes res/drawable-xhdpi/ic_action_copy.png | Bin 763 -> 353 bytes res/drawable-xxhdpi/ic_action_copy.png | Bin 1040 -> 470 bytes res/drawable/section_header.xml | 11 -- res/layout/activity_contact_details.xml | 168 +++++++++--------- res/layout/activity_edit_account.xml | 108 ++++++----- res/layout/activity_muc_details.xml | 77 ++++---- res/values-nl/styles.xml | 19 -- res/values/styles.xml | 11 -- .../ui/ConferenceDetailsActivity.java | 3 + .../conversations/ui/EditAccountActivity.java | 12 +- 14 files changed, 193 insertions(+), 326 deletions(-) delete mode 100644 art/ic_action_copy.svg delete mode 100644 res/drawable/section_header.xml delete mode 100644 res/values-nl/styles.xml diff --git a/art/ic_action_copy.svg b/art/ic_action_copy.svg deleted file mode 100644 index 485fd2ed7..000000000 --- a/art/ic_action_copy.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/art/render.rb b/art/render.rb index a78a2f473..f2d66b9ad 100755 --- a/art/render.rb +++ b/art/render.rb @@ -1,6 +1,6 @@ #!/bin/env ruby resolutions={'mdpi'=> 1, 'hdpi' => 1.5, 'xhdpi' => 2, 'xxhdpi' => 3} -images = { 'conversations.svg' => ['ic_launcher', 48], 'conversations_baloon.svg' => ['ic_activity', 32], 'conversations_mono.svg' => ['ic_notification', 24], 'ic_received_indicator.svg' => ['ic_received_indicator', 12], 'ic_action_copy.svg' => ['ic_action_copy', 32] } +images = { 'conversations.svg' => ['ic_launcher', 48], 'conversations_baloon.svg' => ['ic_activity', 32], 'conversations_mono.svg' => ['ic_notification', 24], 'ic_received_indicator.svg' => ['ic_received_indicator', 12] } images.each do |source, result| resolutions.each do |name, factor| size = factor * result[1] diff --git a/res/drawable-hdpi/ic_action_copy.png b/res/drawable-hdpi/ic_action_copy.png index b47bb69c9a0e8e02bb84b3dedb65032133644af9..22327391e9d1820b2dedfe3df093c1bcf581e153 100644 GIT binary patch delta 354 zcmV-o0iFKM1^oh$B!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0003W zNkl5JZQ{Hm$aPfX;{b1s~u$e1Kn|m2dC>X_GRx)Lv#N7)B8A2$#4! z!-N@SV-&cbcz5(=I` zI&}eQ^}=yu%B}k<1Q=1Y&R^aMFu2pRb*^YXHOHNPiGT=qf(r%bLeks`5&{7vF*7I$ z4>X*6E^A8mTr>efJ@E0d;v+zB*!|Z$VwF%Iaw4unkkHT?NXVyz*xYC>30bibh+RVX zkU>HtB;<Jn82L7?f3 zRXxdyl2VL~a&?>0mG~zK84rGM5&!_=##?{^0My@LMmbyNUH||907*qoM6N<$fe3e_NxO%>fs-NXsP8 zBrSOiTLS=&1B32*!n_7j0;qBTu&|uztOG@>Ni=|az{iq-rf|D*@2<^h0aTy%NYXE_ zb1!B#U-`(DK7SCOfz4?)vqQkaVE-oGS3fYbV-2=zlMgXE1Cx1r8Mx?@m&?M&1?+-- zU|IleGq59w)<6^QfX7L`>bMS^scYy`1Cxv-twvROF|*%IZP66kaYT!_cQxRi0W%u_ z*9tVOO1fLn56G(l7@w173N$q4w}-4%2uX{;tt@|DdVjwU^nNGKEaJn!Y&SWZtVsIq zF^ty0pO&^+;6~726HkB_9>cU50Db^(0`_eTy@qMasH88z1Mk3D^uCC9{ZYb=nVkYI zb#${J$({d@dz6>~<|2dF@RC3QL*fhopBcY)>B6^Yhs;&zC$Jb5(3L&+g{EyM-WDP$ zWVED^nSY(9+fm}7q*u{S#c$?nSZ92kC}mXADYJ+_0e4D7bYagG@xaVZ{}&~NL~205 z72qv!zuIVKM}c!mx|SrZcnnK+;-;naByhFBUmcHtlmNuPt3y)&L*Th*PzPVVhOGfe zng^=Co;2AGfv4Vqv*`U7nyl04Su?wtt0UX)5wwyhkLLY#&EFl4wCvU9p bf4BJy>Ar`R4$R1fT+tB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0002O zNkl8jtvEUE~Szb(`1A2k@79mAU104k{ zgcJaSF`X0xfzdaUstzC{P4pt^QzMinSco)~W@%#ZrvX~0iG2YNfuR=#&|nn?QdVff zH-XV}Yh;7~4xkPU8FeK7F<^+i9Z?|w%ch%0Y#JEN1<1MJ4KOs0QzZmQt>5Vq0?_=u znU)TCg50p6dk8>VF1K*BYz8(8sGTN;Og5xOns_qW4;+*LAiw}8XFTUBnZ^^hv+vA&Gb`InQqLxu9hi>Yl=P8*2X}3IqY40c2~0H*eL)7z@kOdp z7l4}MKCs&p;4@(0PalAwf$d+CW`O6F0PEpI(p)TV3LrQTrpR01LnS~;C%_iu`*-Yf zwA6v1b71oc`F~b{l@fq14Q*fd%`WNDfb0S=cP=~(vH;9yat&>tmO$mYAf_c?ITQB> z@U<6!q;~SyAlw1Il?3kv5I8!LV|xUQ#tD#gK++=cx+2HOcBf;xSrGfudEiwAz%cc& z%Yo1Zj~uYQ2kcbg}vK+Vd8~9QK@E6!_U7vHm_K$ZtZkF4l_B}}f yV1_#T!zugWbT$i+(E{+P79gdG|D0;lzvnmQczcYXmx+P^0000pjaB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o00034 zNklX9TI zd->eo@W}u&06znYSpuOngikdf{&}&m1TcU`D5+0?01Uu@W-_3JJ|P%{5JCv;(NBN@ Y0PWdN4A#nvH2?qr07*qoM6N<$fs|K@i5j zQWH0UAY|hSvWR!^0PeEMHjpdmDr75&>zqLF2Cf1T2?PRJcz*#QSw>WzXo!E%&rOh_ zpE%uB)!pOF{J_N4;6MUh_t)h zmtH{4m;`G(P@9w-5Q-HY0V1-JGX4=JB)>b%b5E&WV1L@{4tnSOKgN;MEQ{ zIR{`Cpnp^;oFj?4%$X7a;WwUg4UX+_R~hR7gYDoVpqEjQk_1CiUW_L!(t zDeQe*+~zA)2zj@|6R(L%y%z6fJ3Odcpto4A!IvWPK}6m;`&1N54wwh<8o*K8z)bCM zlM9kxHHMZtAcY+5aFY`NDgjF6fZSDN_8&`M0bKYA;2P8U;BT98m)qee0Z3i}*vjln z6$XC|=B@-^iO8GGYnaF_z|#M}&NBETFbYuHf!c`Ye~*jEEV}*b?1sUHT?KfG+ySv9 VlV)WqKW6{{002ovPDHLkV1i|EH01yQ diff --git a/res/drawable-xxhdpi/ic_action_copy.png b/res/drawable-xxhdpi/ic_action_copy.png index 3a0e8449eebca78f718dc20da92634a51f03f724..a0508df8c408c743e6933b6d5d581c289e89495a 100644 GIT binary patch delta 444 zcmbQhagBL`O1)%>YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_s6oPZ!6K zid%2)>@PfIAkt7cd2v$PmB<6mh78394$nNUePCL5_mZ0Kr;8V!2z8{|d+vXK&b^(# zevkbn=Mq^45IB(aW?IGMeed~SKHd5u-H`Y2hppdyzjN=cKmX^0e=E1e^6Z%3%k(E5 z*e2k>z^Jew_S??<2~oR~m+;StdR8vTz%vJle?;AQNM=k+a|e#f~uMx;!8MQHz}~DzG*u2mUrtl*4Eq7 zlbT!_^f*{N9JiJ^swGL61BnZ)nuin`7^d89+gJKiEh%}G;qxrkJM%YomHqQ(`7?Lr z?z1_?AAAqI&wcSHyLIC+j(`?U1qRV84Rc&4HB9SX0&(hD(={!N|8Cz5b#;kjchKQ` k7oWUl289^|*JG^%4D)1TPRJbC0h|c|oCyJ(2?3lroYPoDZUV;& z`O-QcRP}x7PO}66ZUHAsI5Gm>0mTK#or0u@7vmszuudd$z;H|kTSR~}CSmoDql_!U zegc1buA2)joO%ts%M-Dgz+;y<)$phf`qzjfCu~Fp! zFD!FF2rz&sMK}`?;7mk-GnT8Mln8hMd@SroEv^99_kY`{wNk{os;+uFk%EYvOKBH5 zz?sMa&O|N9nTP;qA_q7VwIF9&TZRH4B8$M~iY8Z8^?5~m|7rC^>^P9Lu1;jLqOD!T zD#)2uBVcZizDskcqODytnFCby8Su>8j~c`>)S1Wu&csgGnGnF4$N|no1US>$kt6^j zatXLl(0`W_Y^v%~=}wyzfbPe?QOc1*d;yk9cN)u3XQCYKOp~Pu;4R$)6D{$>qSF$^ zxM?FjIRaF59av9oKPHl=An|&r>VOd&F=uiF5Mm>iO+?Tv(Y=evlc&HNYkwoTNjS*FG6y72L9;||4zP-XHKTs_ z!{G)wFQoQYC|GnU1;5MThg0`&dJA;17EpA%jbkp()DU#aTXOj`#Mt7Ygf;Nri( z=jcwjLVyWaortCW9{?h9o4POS7{Z3CJ}%v9joZ^xmZT?vGX}ooV6wBXbtD;Oi77NW z1UmBU3(cXlJl{$3$y| oHd9n};%5xOL4aU4F$FpE7c?TU0&*^2C;$Ke07*qoM6N<$f^E9G2LJ#7 diff --git a/res/drawable/section_header.xml b/res/drawable/section_header.xml deleted file mode 100644 index 9db04f906..000000000 --- a/res/drawable/section_header.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml index 1dceab534..f7cb2198c 100644 --- a/res/layout/activity_contact_details.xml +++ b/res/layout/activity_contact_details.xml @@ -1,110 +1,114 @@ - + - + android:orientation="vertical" > - - - + android:layout_margin="8dp" + android:background="@drawable/infocard_border" + android:padding="16dp" > - + + android:layout_marginLeft="16dp" + android:layout_toRightOf="@+id/details_contact_badge" + android:orientation="vertical" > + + + + + + + + + + + - - - - + android:layout_alignParentRight="true" + android:layout_below="@+id/details_jidbox" + android:layout_marginTop="32dp" + android:text="@string/using_account" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo" /> + - - - - - - - + android:layout_margin="8dp" + android:background="@drawable/infocard_border" + android:divider="?android:dividerHorizontal" + android:orientation="vertical" + android:padding="8dp" + android:showDividers="middle" > + - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml index 91bda7b10..97289628c 100644 --- a/res/layout/activity_edit_account.xml +++ b/res/layout/activity_edit_account.xml @@ -2,7 +2,7 @@ + android:background="@color/secondarybackground" > + android:padding="16dp" > + android:inputType="textEmailAddress" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> + android:inputType="textPassword" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> + android:visibility="gone" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> - - - + android:text="@string/server_info_session_established" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:text="@string/server_info_stream_management" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:text="@string/server_info_carbon_messages" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> - + + android:id="@+id/otr_fingerprint_box" + android:layout_marginTop="32dp"> + + android:orientation="vertical"> + + + android:visibility="visible" /> + + @@ -251,4 +269,4 @@ android:textColor="@color/secondarytext" /> - + \ No newline at end of file diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml index 1a676548b..f689f10d3 100644 --- a/res/layout/activity_muc_details.xml +++ b/res/layout/activity_muc_details.xml @@ -1,46 +1,35 @@ + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@color/secondarybackground" > - + - - - + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" + android:layout_marginBottom="16dp"/> + + android:layout_height="wrap_content"> - - - - + android:layout_gravity="right" + android:layout_marginTop="32dp" + android:text="@string/using_account" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo" /> + + + + -