From 19a6178b54ace1fe90cd6b1d382412e29b70e8ee Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
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
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
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
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
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)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>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|<x
zr(AH*>*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}AbokPxSO<W1!`J_0pmDkNIp`XIc>u-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*<rh1yn!
zhNSNROaeep&r)6xbT6gUv6cQUTPazVce~yEo&Nqmo$0h7oIBU7T)p~AdnO}{sw%mx
zX{Ot`oZuZEuI`FNTyq^AD`;!W*}~yEF`pM6D~gh;v?B^+v%+6z&o;-WrW}DxMp)yV
ze8Cvo*nEU3rNiUn;wQ(Cw_00Ta?xy72mlBGcvMkGL@E6gzySbrf}mf&e?Ky^+4=qZ
z-+oV3O(6g>fKkTSH)XqkQfdRx4PXSow_{_GCtDFtB$QcMmPd@oHOaC(swj$DZtGn|
nDfLy*y89@lRWE<x{?qa|Q|5=<_nWp800000NkvXXu0mjfBPAcZ
diff --git a/briar-android/res/drawable-mdpi/rating_not_important.png b/briar-android/res/drawable-mdpi/rating_not_important.png
deleted file mode 100644
index 392eeb00c565a513412e8cf90a208c2fe8826e2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1463
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVip#M0Tq#K6_m$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1O$kUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dR<{@#
z7@3;5;4}}aHwCL(z<P1}Lm%iEeNfaQMKw$an0`P^c)|s8;7LC<518JIfC)P%?b;>=
z1}05U7srr_TW_YH*LDdMIiB8g=*QY4XCg9`M8brPCM}vGVm52(rbTQ1u!@PDx|FtQ
zV_@A<&q+zDS(hSi{4njFsG<2dy-wxW_bcIhO_J};{yuAa;p@w_#rG}0*FN7<eQxi0
zsqUjXY1??ZPo6DdoOw!KuHSuiz1eSbUB86^CpK`D2n5G9@@^5HEy*PHLjQ{NCN`68
zejARy)+?BCj$=oI@Ec)q&)Ez=zpFp!lquHHWh!!1z7f`wTdZR)%e3c#n2SiVU|;1|
zy+cY9SU*+h)-s-8Z#}?wCqeIAj8Lm$+HvlR2d^tx&Oey<*LwY9t_gGAv6nxXlx#nF
z&gT0J%L`d#J}|0sT})lj^<CS+kfUL%3)7Qh;xE`{$HZjazApc*G(lud)7O;Jgt>we
z%-jj?={u*b_;tYMMsRe;H;tqgMcySpKGZFH&SP<D7V9H}qf>3yY`k~-#p9<k?kkrq
z)H&iAW?R{AsU<hhIa<9||LZkIPf7a~X;Nz0Ww(A!eYtGAfaL++j#V3aFI`JaQC-6r
z?r@gV%<Z<6GHXavL6b;!x3S!^e#PgE)~Ab}OjnRUy?IO6wI1%H_bxc!7vIaYq@~Va
z&8FMD4QU%zui&5b{;`cTOU7@<`^I~j?!<)nCJ4kBZ=d>d>xoCIfioGrzZ6O<IvjeN
z7`MLRfxKz5)RqRjTlKGEnKzkEFJhl!`zW;afx`Lry$hxl?^&+puqkC);`K`|FN`$&
kr)6II-ygi0wT9b(VOMj_T4w7-nxLZ8)78&qol`;+00G$<$N&HU
diff --git a/briar-android/res/drawable-xhdpi/rating_important.png b/briar-android/res/drawable-xhdpi/rating_important.png
deleted file mode 100644
index 78f1bf5e4e729b9d6be3bb87f1b8344e62c781c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3114
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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<F
zp=DJziZUs;*040sNJ^A0ww3M_R*|RQOq+K9`1L!_bI$v|-{<rBe6P>@oZOJ$4Mql*
z1_%Vgh!#K%Rj=NfS5HU%J;P0Ypk9{4ehfHF5D%xZL=eJ<E!YkLG#-lsg+eTLdU7}9
zfj}&>;f6C{20e%zC*WaO8Vpv#6ROz=gol?z$cjsZU|>7M;qpDv<5ybI0GI8Fjv~@Q
zy3iL&;09!fps<YK@VJb`I1(G}wI1-0kktY_2xb8iUJ_qSmUyB+>5|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@!gVR3l65W<B*VnK>1PTjb8jK-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~HBKQ0<utiMXi{+g~K$0iTj4bH5%7@vC~D
zx$LjU;`UW8P8|$R)7pQvdcmZgAI<j5;HnQ_Mjzs<=Ut>8?7=P95)p{SMKr2Uxa983
z(m8>7gn1VyaER~F@YX2_dD?uBY3^;ujSAyFLUqKc3Oh@SY2EkT*?tsiHfYJr-MnH|
z_4FPf_GoBkYz46@R1X;3c={d`J<I6r&a}Hclys$b=zh2A<e#O*s^R9b2jk5%!(!F2
z&L3~&qny)qnOI1>2U(~;(HI^)Q&Cx2X*}y2vtjbr>R*28DsYW;n0RG6XmGU=X#gBp
ze8+NTQC6we4)#*%(pKkPGFb$uwI%(@3T?je?!~_WN>`?_j4ZIYrPrd9ksXM?8)m2-
zsb7NpsCNj_%)}&2EYfn<e~#>0{877^+2&-=)oysa0*R6SCSAK$Szqc9b^+ON;nlQ$
z#=)^>kLZBnd>f!6t5$W#`jXcMJ4qz1IK;uUF1T*Xjoy+?g^#aB(}(ggv1XXeAh7Vy
zdE;?Mhv-mbj4fl0-2Q1vdCW3s;B9HXb?hlw<V5`=rQxV5q^js)AyO+!uLKX@=N67v
zCAqdvXRfXBQLb!HIu{XhJHOYg#@uPy2gi5L2WK0U<I)$%dtjc)b(Q5-)4XJ>u?!Lu
zS)KhKW93-O(x>w=<S6=v#JodMlZ^wOev5E%k2-HA^rIkRRNZpvn&TFmeUt#&0FMu_
z92v?6_9q_{|74<d*t8)C1^tjW<rKU8AgbJi^Gvw=h4J{3co5Wm2LGs~N0E!m=%x^f
zeKts%JXP{4a?|9+AbrWPo=aeU&+I0txYM4R$3+qSxhFc=YqoGW*XqB6hl{roJKvUa
zlr5FWXfcpnE5nr9$_`2bL3@d@?Z%F=NUaNUTF3H{KJy1p`Wqs2N9S#*@kz*av@IUi
z^0FT0J`}DS-JY7dWZL#Y@Q9e*@C|&v^C!wK9p~EE@@Al^-vh_6eiuE_NqC(aoRt$P
z51UxFf17d5jQ7}`{vwM89;d0Sx6_1dD>=$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;oY7pe<hYG=CE8vTs0!r(
zT`0^rl3;q|gfQJ5RjJwmONw%Ien2!TtYz(Ik!xRsn^~-$^lqa)PrcnDr+Ir0%x0cM
zD}0`Rd+K@t(&_w5CBLa_>r%$E)$4VucjlHN<>~$jw#&=KHo@`vh|7E2dUmKr=FD4*
zD_-lvDLZp>3~K7*kIse`-rmHV`7U*!aX+V5pKtz>#`2!K(f6auq1IT2Z*#dB(r-(<
z<u`yyF4aGwlLu58eca~SK8Iu;$)Ocy!A`zoby0dZ98S}I@245c>|Cb{W;~0^6cK?f
z%n66lh^fRI%|+jPQzj4JiB5g}CP4c5G3wfyzV`=?>FMDq1^WG4*9{n&koS0@(^);-
zYcEbob&*j8f80fE&bB-m?-ke<hJ3nDDeJrOK4^x{$gsL7aGLWDPuiPNh?;kSk39;G
z?;sY<m&wf17%9WN%TsS|8EHQsEZKYh=8EFiXF*2EukQzszkX&Dz24-5y?oW<YX7ia
z!_2*hSn$B;4&7m(jWkh{d$da!k%;OJu1ayM*xk$?+IQxXse#vZtO<T9Lz?55k2z3W
z)l~MXvix$-=4%g~V~y&6Hn^W{UYg^-vJ|0Go;0l5*<{)-d0zf8wa5=~|Di=e4&c8r
ztj~&8bLCz|M~k7>lJa#4qZ7FvQQA+om$xb&S!^s!@bnex^5h{ku>oclUgq-2Lot-J
m;M`;0@4YsB|K&pbfNMkad$AGBj<y`le+$hon0k&9EB!A#&cRjy
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index bb5a5d51d6..8a160a8049 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -5,7 +5,7 @@
<string name="notification_text">Touch to quit.</string>
<string name="contact_list_button">Contacts</string>
<string name="messages_button">Messages</string>
- <string name="boards_button">Boards</string>
+ <string name="groups_button">Groups</string>
<string name="blogs_button">Blogs</string>
<string name="synchronize_button">Synchronize</string>
<string name="quit_button">Quit</string>
diff --git a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
index 82f7a80882..090ceca84d 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 630522efc4..39cb91c6c1 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 c6419ce7fe..056935ad82 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<PrivateMessageHeader> {
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<PrivateMessageHeader> {
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 80627b99e7..f58645f0fd 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 d0842efca0..8ef55dd07b 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<PrivateMessageHeader> 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 a5e302485c..6f7e1052f2 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 4c3bbe6cc7..638a762bd0 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));
--
GitLab