From 19a6178b54ace1fe90cd6b1d382412e29b70e8ee Mon Sep 17 00:00:00 2001 From: akwizgran Date: Mon, 11 Mar 2013 10:57:44 +0000 Subject: [PATCH] Removed star icons, added padding around text, renamed boards -> groups. --- .../res/drawable-hdpi/rating_important.png | Bin 2177 -> 0 bytes .../drawable-hdpi/rating_not_important.png | Bin 1839 -> 0 bytes .../res/drawable-mdpi/rating_important.png | Bin 1121 -> 0 bytes .../drawable-mdpi/rating_not_important.png | Bin 1463 -> 0 bytes .../res/drawable-xhdpi/rating_important.png | Bin 3114 -> 0 bytes .../drawable-xhdpi/rating_not_important.png | Bin 2340 -> 0 bytes briar-android/res/values/strings.xml | 2 +- .../sf/briar/android/HomeScreenActivity.java | 14 ++--- .../android/contact/ContactListAdapter.java | 5 +- .../android/messages/ConversationAdapter.java | 11 ++-- .../messages/ConversationListAdapter.java | 12 ++--- .../messages/ConversationListItem.java | 14 ++--- .../android/messages/ReadMessageActivity.java | 48 ++---------------- .../messages/WriteMessageActivity.java | 2 +- 14 files changed, 26 insertions(+), 82 deletions(-) delete mode 100644 briar-android/res/drawable-hdpi/rating_important.png delete mode 100644 briar-android/res/drawable-hdpi/rating_not_important.png delete mode 100644 briar-android/res/drawable-mdpi/rating_important.png delete mode 100644 briar-android/res/drawable-mdpi/rating_not_important.png delete mode 100644 briar-android/res/drawable-xhdpi/rating_important.png delete mode 100644 briar-android/res/drawable-xhdpi/rating_not_important.png diff --git a/briar-android/res/drawable-hdpi/rating_important.png b/briar-android/res/drawable-hdpi/rating_important.png deleted file mode 100644 index a6edc3cfae0b8eccc4bd7189fa0f862ee71fe9dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2177 zcmV-{2!8j8P)Px-J4r-ARA}DqSZi!l#})o&?!Eh7?|S{h>nApDY~lyyCc(uH!GN(7MNm*%g^0hA z_~jo+h)5)r(kK#9)GBf$D#(vkQHT(g5K$G97+ENS#E7uQPht`~7{At!U2k{S`@Hwg z^v}3*QE9QU5vV@WXs<>)XU=!dcjlZKU|rT_UDoA6qN-|+s;W6_xd&Zi412_Q`T(e^ zY6Gwpz*h17)J0$`fP68wK2-otpU$U}#G7Q9&C4>Imn7bF`gH!9>?N&*(uIZcYR1TK zs;gt2d3oAoAfPl34cTswj?TUQksPFDNfhjB$=_&CRuWPc#6|L6S+@s3qJ>1mTH zNhoP<4oy&s5&#|mS(KuJVA2|PgnI0xYzWY?~`O3ul%H8l$(Znu#MzzIMBAOmo^-G;lSW?_UevU%68 zx@Q*GJ?j4dQ-P|gq_Q$5hr_a@>%^W&P^V!KCu77e%iJYN+(jw38wROX6khnj2P5Cq z)x~}Z;1>X_VvhuXAN%_3w~ieve<__Nq?F_%j> zhKB6A&*$UI0-&nu766q1OaN?zaE~PMOhVuy1QxM|Q_86CX0n}o6XR-Y+0B& zetbL*U^9Sh5di?u0n7oo{r>w!ww@kGUOXZ}-z-~ggE=m07tSo&pH#Z&3&eoX6qiZggp2*D9wW6Yw zR9u{NXJu(FMd5Z?<_-X*B6;N{4wA&&=3~dkXLX(UHI2lAK_xOaW(kdtn~hLNR>EP~ zIzKNffq+71XHCgqP|h+8yvR9`0dxx69*#n)sII01SWeg(qtZOcRTA`E`7GLGLZqGTzI(vK&}Ab5CBX?rYY4$;U0p0KHgf^6 zEb%s3GX7i6ktJZHB{cpAfZ$=z^tz0_Pg(v$d@j8R9z=GT`uEK zmoN9ttm=JWcz8C^(2(hiMrGINsHLI5-;ro&h>V-f+$2CK%K*ScZSY5<(w!40%G_OD z8C9H5v!sf!l}BWrS@85js?Z@gjZzI)e-sVQ?qcej(MYIM@+H0TWnu9L9c zZuG3g_(y8yQYo@Ymbt06HWm?Qy7T~V^9NAZT35Fam1S;fpk(-;gdpuf5*Ga{hGb?*`S<#}tKD$fTN#TYK=}B4sS0(1c z(+dFn0Q$fCE@SZeb>|>}J~6i-{=)%Ck_06`KRsm_r0C+s?2MJzBCljoBqEhk%1vcu z$)ITD3}IXZfIkqBr`p>K?Ok0N^#FKdWB7-*w#lB%OuZ1m1^{lchL)8jgI!%26_JQk z3Sj=R03ZY#Wtr24hHzZymi z&yE2oUTnFyZx6@MpU#WiNo?HEktSRc!|FI;DJ;QeG-a7`NMv^Bo<1Hy^f|at^w8Z|!rj znDjftKoMhPlrfSE;4`1kcX_RoxEO$gF_Hvu&g0R(x^$^Oxt!!91dQ{(?_YVPraur+ zS{WmIMJ*{_^=Fm)yl(;UdvUq`o6qN)T8+mkRaLzJek&fs{^0ZZ9=ao4Ry*zWdTjuv z0Q}wO^F^>q;`jTbUa$9iQL!U_zdwa_S(kPB|B!zIW_5jKO9qRJ00000NkvXXu0mjf Dzflg* diff --git a/briar-android/res/drawable-hdpi/rating_not_important.png b/briar-android/res/drawable-hdpi/rating_not_important.png deleted file mode 100644 index c10325fe114dd69e75297bc427d5d1530466ff20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1839 zcmaJ?X;2eq7!DvPArTcZDr%RARm5a>Ljoii5<)f5rVGyL_ zQ8gZbc+rX#1zY2RQH$VNysF}bq5)ex2d@!rH!9d4rMt8HecwCJ^StNI7A7W4qEm-c zDHIA_7AuvLE989od64g^u5Sy-Wf&2yAd>MkB1>sPDUljng#t26sYT_eQj={wjZUOc z+yZnd3PORz3)DEqRyr|k3uYkM6v{-A#h_GYpah^owK~0!`SkEHCZN*@nNxWPgczdG zbX{zY2~EyPNKxlxsQDVEC<2&h5s(5HN+ z?29}Jndt;!5P)D-Ru(%en2npXAk63UL5Kr#I4lyuGH2@vrG=$8kM35GqGq*8XCQRA z9&jouRrq{D$Rs2Elmcexk=2_&mx(MGXi*wKm<>5o>INdn|3fjX2W=+g=$Cl^Q`nr6 zZ9qXeYR2cA)MVq*Mmt>@1W_hbN#Ldw9G}-+#l&=+z|HBn0fxMNPU)R1;&uG2mm;0$uO1@O#z!%+>TBOJuKHkPHTNw)S7G z?lzJ0f^xrrfyA~vb_^p=5?8gaqhf7-{`&p3 zFJ?dLWOaFzaDugtTbtc#?iDoD{61~LqIXp_*P68>BFexE7tRm#89?69?A(S{_|k`o zA0Bhgq+;0PgMYUorR5UU^x$OipvEz>%)vkj2-q@xS}1Re-?K-BcLb!m+uWYyJxsN3 z>GNP|#54Jj{!QM$T#vRdoVN1OLhn_r2Re#!T>K)LmY>4LHh6Xv&2=fHm3fyZ8S7TH zy|5rxs0z1BcAxV2=MkloTX{)A;&o?3TIfw}=$ys1R0VZ^ByT9KNz_<3Z+1qkIp4Z= z=YT*@c_XcU-)}GDmajR!vD0^{{8`Dh*Q*!TKc@`!uZwlBO1p23DbOyn0>1IPfHKME z5#Hw8ODKY<;%lcfG_u=Os;8lE>QP0X_b&AE1jIhIy8k@)CCA4;Tjh~+aszxIlYT2P zyCQJ2J$j~XXWpbv=@3=e*SGkpDfsMtPt?M1s4Dk9v@R*zSh8!S3H3=P|xB!;($yhcr*<#jdK z`m(+HVwB&@HA&}eR%8=#J-vedTGOvFHTz=4$rvw8qhN`joOPX}@X}#NYgg^K%Gl#7 zw>ow-`q7QIRX^Mqxr5HYHtzqb-;jt41MaP%W#&Gfa7SNLI;`KIn1tr4nmDmQyO(cw zXocen{oZYVQ{0xdjNUT7(rWl77~3%;P&{QNe$M5CLzVxk>BrU;NB0fZEKsx^Nxd`| zofC@L_E5J<`@h=gHwrx%yK;%=t+GVb5!a{3L#llqyx5IhjX#-g&a86ZRdbs~;&%%`4g@FfM z?^Fg<$Ib{pIle&s9Se9BZj2Yl=bm@(Vx&@xw!ZBjwr{9){=#I@3DTb>sd@hZNzKEr diff --git a/briar-android/res/drawable-mdpi/rating_important.png b/briar-android/res/drawable-mdpi/rating_important.png deleted file mode 100644 index 7afcd9d54feaa62213aa9c6dd1267eeec4c1b5b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1121 zcmV-n1fKheP)Px(8%ab#R9M69S6@h5R~Y~0-25}Si6+-+a&@!KTnlPt+hOg7L)=P@l(3bS*23_) zD-=p;-^YAdnGby#bbHv#7#)E^nX?ZoWo;i^t;G{9HnO!#>Zb9cCK_#$Cg$9G_i`Q5 zH42Hy2L0f04(FcVcYf#l$9I93@_!aeshv`4uS5r_kVBU-cAfyGQ~=Nkpwn3IxCQnZ zcmklUTqWjmffkF_-P)R+0Dx%J83gd496hEo&EMeh6h8}xrwRaY@??uWmlHm}dv|*dpu#Oox9*Ll7CNwH`;xFaz@DRr97+FK`1Ec^z*3c%XiyYM?9`kRze=T2Cl z!|UaRW5<#o0H_C0fAnaw%j@L@LiG153PMV04FDSe5kQSGy8*ZWR0D7jqBnPUFWm?5 z5de!3M~%VY($JMF^+zbBZ2)orRscK&unHgpAZ^SA##p*k7IXqQ0$|x<(UjWSqRZjX z@^-tHvDvhYD5}Z!_DrI$Z~jB$_3J@gf96c$U5|&~o|q7MCL@T20+I50(v-^)dopQx zS}YPj01tp40sK@l3n--_0Kv}AbokPxSOu-d_9ib}2>g2I zj;9yE4aV5@ji7&3Fhx-w$+EmUGh^$Uo3qBcx>jldya7NmUf?cKKLq2O#~31j+5Y~f z*v*^X9$h#6z!>}GMIgL@#EjoB$K!GP$5T_zKZ3z!6+o?Vv1yCCVlu4o@cjALAK$uF z)1s>6E5=v^C0L^biAA5U;Xxu{4c@!wUOs#{l_LbwW|(!ebB^e#Q+wve##|ETWPmXi zD|L8NWs0J#`g{$e$)x4L$Vjz*=+LrewdysSq_3LIlIhc@_bf)E&I0G;OUBqjMRkBN zmgbyXj>oI2Qz=W#NU>7#ES0jv;_<3#vswRoW4cvZi2P2cnr>_?$N(IhoU3YVEXbm$ zu5fPhZ)YXk>vr=+LLhFytO1xc#@f0|34!Qx@dZsY?cGiSyZrvOX=7b9E{$Bg_}Yzu zfmeS95CJf=PQ>qDo7Q#g+7<$oQis{BNx|UKGh=IVa8UX_6xx>=9F%rnyH*fKkTSH)XqkQfdRx4PXSow_{_GCtDFtB$QcMmPd@oHOaC(swj$DZtGn| nDfLy*y89@lRWEl3^w)^1&PVosU-?Y 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 Ef_%Tw761SM diff --git a/briar-android/res/drawable-xhdpi/rating_not_important.png b/briar-android/res/drawable-xhdpi/rating_not_important.png deleted file mode 100644 index 7ff6c8d0e68f491e420faa9a955c9a6c19f8ea1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2340 zcmaJ@dpK0-A0L|Bmd&*$<<~KT5Hn|(p_vF{$izslvr%I*$C#LlnS&vVX1lD?4Ua@oZOJ$4Mql* z1_%Vgh!#K%Rj=NfS5HU%J;P0Ypk9{4ehfHF5D%xZL=eJ;f6C{20e%zC*WaO8Vpv#6ROz=gol?z$cjsZU|>7M;qpDv<5ybI0GI8Fjv~@Q zy3iL&;09!fps5|oZjTwgqK0)9_ zPxRkGG3X(HuRsI=L@ekW2fE<_Hv$$<07(Rr6W{{kK^)!%2f91sK{C;u4B~;$4_fU_ z#EvJ2QvE;sQlC802{0@q<8WzdY1lMZtU$!U;YlPC4s^k}xHzj3&f;`F%#t|s#h3*J zDkP2*afL8fzy~yntnGpn*b}Xe^zRgS!Y{IX@#iwB3x<=hgg87F)TFckq|^UDl*jvm z7Q>;?Kk@!gVR3l65W1PTjb8jK-Ca>??v;us{?p5F{;BF(g3%3&aTmA>bQE z#Nq)uD~`+8SUxf6bTW-EhFSbLh(`59t2MA(E}KjsxPUH1f;*7{Qt@~{Jc)oO`4K3- zKK?|!JAr~<;8F!~DLjY|FL2raaMym7s~HBKQ08?7=P95)p{SMKr2Uxa983 z(m8>7gn1VyaER~F@YX2_dD?uBY3^;ujSAyFLUqKc3Oh@SY2EkT*?tsiHfYJr-MnH| z_4FPf_GoBkYz46@R1X;3c={d`J2U(~;(HI^)Q&Cx2X*}y2vtjbr>R*28DsYW;n0RG6XmGU=X#gBp ze8+NTQC6we4)#*%(pKkPGFb$uwI%(@3T?je?!~_WN>`?_j4ZIYrPrd9ksXM?8)m2- zsb7NpsCNj_%)}&2EYfn0{877^+2&-=)oysa0*R6SCSAK$Szqc9b^+ON;nlQ$ z#=)^>kLZBnd>f!6t5$W#`jXcMJ4qz1IK;uUF1T*Xjoy+?g^#aB(}(ggv1XXeAh7Vy zdE;?Mhv-mbj4fl0-2Q1vdCW3s;B9HXb?hlwu?!Lu zS)KhKW93-O(x>w==$Lv#svbk*qnw8^yPGMR}LXdKy<(CuTQ3 zLS*g29{39lw^-f3*Z`%ur8-1!0{0rBezsmx&uop#v7$K7W0HCuR~f9gFIqFa3n#-S zu2|Qxjxmy{usCdHuNZvN;u!BF!#+6%zoWJDf@srCsw>0kTgQ51r?7et8eZmISY6@6 z`yG2pVOJv>RH*iyuGhD^GW_)Fy^%UQH>SekTpFo%S%u1;oY7per%$E)$4VucjlHN<>~$jw#&=KHo@`vh|7E2dUmKr=FD4* zD_-lvDLZp>3~K7*kIse`-rmHV`7U*!aX+V5pKtz>#`2!K(f6auq1IT2Z*#dB(r-(< z|Cb{W;~0^6cK?f z%n66lh^fRI%|+jPQzj4JiB5g}CP4c5G3wfyzV`=?>FMDq1^WG4*9{n&koS0@(^);- zYcEbob&*j8f80fE&bB-m?-kelJa#4qZ7FvQQA+om$xb&S!^s!@bnex^5h{ku>oclUgq-2Lot-J m;M`;0@4YsB|K&pbfNMkad$AGBjTouch to quit. Contacts Messages - Boards + Groups Blogs Synchronize Quit diff --git a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java index 82f7a8088..090ceca84 100644 --- a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java +++ b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java @@ -80,18 +80,18 @@ public class HomeScreenActivity extends BriarActivity { }); buttons.add(messagesButton); - Button boardsButton = new Button(this); - boardsButton.setLayoutParams(matchParent); - boardsButton.setBackgroundResource(0); - boardsButton.setCompoundDrawablesWithIntrinsicBounds(0, + Button groupsButton = new Button(this); + groupsButton.setLayoutParams(matchParent); + groupsButton.setBackgroundResource(0); + groupsButton.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.social_chat, 0, 0); - boardsButton.setText(R.string.boards_button); - boardsButton.setOnClickListener(new OnClickListener() { + groupsButton.setText(R.string.groups_button); + groupsButton.setOnClickListener(new OnClickListener() { public void onClick(View view) { // FIXME: Hook this button up to an activity } }); - buttons.add(boardsButton); + buttons.add(groupsButton); Button blogsButton = new Button(this); blogsButton.setLayoutParams(matchParent); diff --git a/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java b/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java index 630522efc..39cb91c6c 100644 --- a/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java +++ b/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java @@ -37,7 +37,7 @@ implements OnItemClickListener { layout.setGravity(CENTER_VERTICAL); ImageView bulb = new ImageView(ctx); - bulb.setPadding(5, 5, 5, 5); + bulb.setPadding(10, 10, 10, 10); if(item.isConnected()) bulb.setImageResource(R.drawable.green_bulb); else bulb.setImageResource(R.drawable.grey_bulb); layout.addView(bulb); @@ -46,12 +46,13 @@ implements OnItemClickListener { // Give me all the unused width name.setLayoutParams(CommonLayoutParams.WRAP_WRAP_1); name.setTextSize(18); + name.setPadding(0, 10, 10, 10); name.setText(item.getName()); layout.addView(name); TextView connected = new TextView(ctx); connected.setTextSize(14); - connected.setPadding(5, 0, 5, 0); + connected.setPadding(0, 10, 10, 10); if(item.isConnected()) { connected.setText(R.string.contact_connected); } else { diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java index c6419ce7f..056935ad8 100644 --- a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java +++ b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java @@ -34,15 +34,9 @@ class ConversationAdapter extends ArrayAdapter { layout.setOrientation(HORIZONTAL); layout.setGravity(CENTER_VERTICAL); - ImageView star = new ImageView(ctx); - star.setPadding(5, 5, 5, 5); - if(item.isStarred()) star.setImageResource(R.drawable.rating_important); - else star.setImageResource(R.drawable.rating_not_important); - layout.addView(star); - if(!item.getContentType().equals("text/plain")) { ImageView attachment = new ImageView(ctx); - attachment.setPadding(0, 5, 5, 5); + attachment.setPadding(10, 10, 10, 10); attachment.setImageResource(R.drawable.content_attachment); layout.addView(attachment); } @@ -52,13 +46,14 @@ class ConversationAdapter extends ArrayAdapter { subject.setLayoutParams(CommonLayoutParams.WRAP_WRAP_1); subject.setTextSize(14); subject.setMaxLines(2); + subject.setPadding(10, 10, 10, 10); if(!item.isRead()) subject.setTypeface(null, BOLD); subject.setText(item.getSubject()); layout.addView(subject); TextView date = new TextView(ctx); date.setTextSize(14); - date.setPadding(10, 0, 10, 0); + date.setPadding(0, 10, 10, 10); long then = item.getTimestamp(), now = System.currentTimeMillis(); date.setText(DateUtils.formatSameDayTime(then, now, SHORT, SHORT)); layout.addView(date); diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationListAdapter.java b/briar-android/src/net/sf/briar/android/messages/ConversationListAdapter.java index 80627b99e..f58645f0f 100644 --- a/briar-android/src/net/sf/briar/android/messages/ConversationListAdapter.java +++ b/briar-android/src/net/sf/briar/android/messages/ConversationListAdapter.java @@ -9,7 +9,6 @@ import static java.text.DateFormat.SHORT; import java.util.ArrayList; -import net.sf.briar.R; import net.sf.briar.android.widgets.CommonLayoutParams; import android.content.Context; import android.content.Intent; @@ -19,7 +18,6 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; -import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -39,12 +37,6 @@ implements OnItemClickListener { layout.setOrientation(HORIZONTAL); layout.setGravity(CENTER_VERTICAL); - ImageView star = new ImageView(ctx); - star.setPadding(5, 5, 5, 5); - if(item.isStarred()) star.setImageResource(R.drawable.rating_important); - else star.setImageResource(R.drawable.rating_not_important); - layout.addView(star); - LinearLayout innerLayout = new LinearLayout(ctx); // Give me all the unused width innerLayout.setLayoutParams(CommonLayoutParams.WRAP_WRAP_1); @@ -53,12 +45,14 @@ implements OnItemClickListener { TextView name = new TextView(ctx); name.setTextSize(18); + name.setPadding(10, 10, 10, 0); name.setText(item.getName() + " (" + item.getLength() + ")"); innerLayout.addView(name); TextView subject = new TextView(ctx); subject.setTextSize(14); subject.setMaxLines(2); + subject.setPadding(10, 0, 10, 10); if(!item.isRead()) subject.setTypeface(null, BOLD); subject.setText(item.getSubject()); innerLayout.addView(subject); @@ -66,7 +60,7 @@ implements OnItemClickListener { TextView date = new TextView(ctx); date.setTextSize(14); - date.setPadding(10, 0, 10, 0); + date.setPadding(0, 10, 10, 10); long then = item.getTimestamp(), now = System.currentTimeMillis(); date.setText(DateUtils.formatSameDayTime(then, now, SHORT, SHORT)); layout.addView(date); diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationListItem.java b/briar-android/src/net/sf/briar/android/messages/ConversationListItem.java index d0842efca..8ef55dd07 100644 --- a/briar-android/src/net/sf/briar/android/messages/ConversationListItem.java +++ b/briar-android/src/net/sf/briar/android/messages/ConversationListItem.java @@ -13,7 +13,7 @@ class ConversationListItem { private final String name, subject; private final long timestamp; private final int length; - private final boolean read, starred; + private final boolean read; ConversationListItem(Contact contact, List headers) { if(headers.isEmpty()) throw new IllegalArgumentException(); @@ -23,13 +23,9 @@ class ConversationListItem { subject = headers.get(0).getSubject(); timestamp = headers.get(0).getTimestamp(); length = headers.size(); - boolean allRead = true, anyStarred = false; - for(PrivateMessageHeader h : headers) { - allRead &= h.isRead(); - anyStarred |= h.isStarred(); - } + boolean allRead = true; + for(PrivateMessageHeader h : headers) allRead &= h.isRead(); read = allRead; - starred = anyStarred; } ContactId getContactId() { @@ -52,10 +48,6 @@ class ConversationListItem { return read; } - boolean isStarred() { - return starred; - } - int getLength() { return length; } diff --git a/briar-android/src/net/sf/briar/android/messages/ReadMessageActivity.java b/briar-android/src/net/sf/briar/android/messages/ReadMessageActivity.java index a5e302485..6f7e1052f 100644 --- a/briar-android/src/net/sf/briar/android/messages/ReadMessageActivity.java +++ b/briar-android/src/net/sf/briar/android/messages/ReadMessageActivity.java @@ -58,7 +58,7 @@ implements OnClickListener { private String contactName = null; private MessageId messageId = null; private boolean first, last, starred, read; - private ImageButton starButton = null, readButton = null; + private ImageButton readButton = null; private ImageButton prevButton = null, nextButton = null; private ImageButton replyButton = null; private TextView content = null; @@ -132,14 +132,14 @@ implements OnClickListener { // Give me all the unused width name.setLayoutParams(CommonLayoutParams.WRAP_WRAP_1); name.setTextSize(18); - name.setPadding(10, 0, 0, 0); + name.setPadding(10, 10, 10, 10); String format = getResources().getString(R.string.message_from); name.setText(String.format(format, contactName)); header.addView(name); TextView date = new TextView(this); date.setTextSize(14); - date.setPadding(0, 0, 10, 0); + date.setPadding(0, 10, 10, 10); long now = System.currentTimeMillis(); date.setText(DateUtils.formatSameDayTime(timestamp, now, SHORT, SHORT)); header.addView(date); @@ -148,7 +148,7 @@ implements OnClickListener { if(contentType.equals("text/plain")) { // Load and display the message body content = new TextView(this); - content.setPadding(10, 10, 10, 10); + content.setPadding(10, 0, 10, 10); message.addView(content); loadMessageBody(); } @@ -162,15 +162,6 @@ implements OnClickListener { footer.setOrientation(HORIZONTAL); footer.setGravity(CENTER); - starButton = new ImageButton(this); - starButton.setPadding(10, 10, 10, 10); - starButton.setBackgroundResource(0); - if(starred) starButton.setImageResource(R.drawable.rating_important); - else starButton.setImageResource(R.drawable.rating_not_important); - starButton.setOnClickListener(this); - footer.addView(starButton); - footer.addView(new HorizontalSpace(this)); - readButton = new ImageButton(this); readButton.setPadding(10, 10, 10, 10); readButton.setBackgroundResource(0); @@ -255,30 +246,7 @@ implements OnClickListener { } public void onClick(View view) { - if(view == starButton) { - final MessageId messageId = this.messageId; - final boolean starred = !this.starred; - dbExecutor.execute(new Runnable() { - public void run() { - try { - serviceConnection.waitForStartup(); - db.setStarredFlag(messageId, starred); - runOnUiThread(new Runnable() { - public void run() { - setStarred(starred); - } - }); - } catch(DbException e) { - if(LOG.isLoggable(WARNING)) - LOG.log(WARNING, e.toString(), e); - } catch(InterruptedException e) { - if(LOG.isLoggable(INFO)) - LOG.info("Interrupted while waiting for service"); - Thread.currentThread().interrupt(); - } - } - }); - } else if(view == readButton) { + if(view == readButton) { final MessageId messageId = this.messageId; final boolean read = !this.read; dbExecutor.execute(new Runnable() { @@ -318,12 +286,6 @@ implements OnClickListener { } } - private void setStarred(boolean starred) { - this.starred = starred; - if(starred) starButton.setImageResource(R.drawable.rating_important); - else starButton.setImageResource(R.drawable.rating_not_important); - } - private void setRead(boolean read) { this.read = read; if(read) readButton.setImageResource(R.drawable.content_unread); diff --git a/briar-android/src/net/sf/briar/android/messages/WriteMessageActivity.java b/briar-android/src/net/sf/briar/android/messages/WriteMessageActivity.java index 4c3bbe6cc..638a762bd 100644 --- a/briar-android/src/net/sf/briar/android/messages/WriteMessageActivity.java +++ b/briar-android/src/net/sf/briar/android/messages/WriteMessageActivity.java @@ -80,7 +80,7 @@ implements OnClickListener { TextView to = new TextView(this); // Give me all the unused width to.setLayoutParams(CommonLayoutParams.WRAP_WRAP_1); - to.setPadding(10, 0, 0, 0); + to.setPadding(10, 10, 10, 10); to.setTextSize(18); String format = getResources().getString(R.string.message_to); to.setText(String.format(format, contactName));