From e6cb12dfe414497b4317820497985c110cb81864 Mon Sep 17 00:00:00 2001 From: Raphael Pohl Date: Sun, 19 Jul 2015 14:26:03 +0200 Subject: [PATCH] changed message bubble appearance --- art/message_bubble_received.svg | 165 ++++++++++++++++++ art/message_bubble_sent.svg | 165 ++++++++++++++++++ art/render.rb | 128 +++++++++++--- .../ui/adapter/MessageAdapter.java | 37 ++-- .../res/drawable-hdpi/ic_secure_indicator.png | Bin 294 -> 294 bytes .../ic_secure_indicator_white.png | Bin 0 -> 322 bytes .../message_bubble_received.9.png | Bin 0 -> 759 bytes .../drawable-hdpi/message_bubble_sent.9.png | Bin 0 -> 693 bytes .../res/drawable-mdpi/ic_secure_indicator.png | Bin 295 -> 295 bytes .../ic_secure_indicator_white.png | Bin 0 -> 306 bytes .../message_bubble_received.9.png | Bin 0 -> 589 bytes .../drawable-mdpi/message_bubble_sent.9.png | Bin 0 -> 570 bytes .../drawable-xhdpi/ic_secure_indicator.png | Bin 410 -> 410 bytes .../ic_secure_indicator_white.png | Bin 0 -> 434 bytes .../message_bubble_received.9.png | Bin 0 -> 922 bytes .../drawable-xhdpi/message_bubble_sent.9.png | Bin 0 -> 832 bytes .../drawable-xxhdpi/ic_secure_indicator.png | Bin 380 -> 380 bytes .../ic_secure_indicator_white.png | Bin 0 -> 441 bytes .../message_bubble_received.9.png | Bin 0 -> 1319 bytes .../drawable-xxhdpi/message_bubble_sent.9.png | Bin 0 -> 1195 bytes .../message_bubble_received.9.png | Bin 0 -> 1672 bytes .../message_bubble_sent.9.png | Bin 0 -> 1519 bytes ...ge_border.xml => account_image_border.xml} | 0 .../activity_publish_profile_picture.xml | 2 +- src/main/res/layout/fragment_conversation.xml | 5 +- src/main/res/layout/message_received.xml | 55 +++--- src/main/res/layout/message_sent.xml | 50 +++--- src/main/res/layout/message_status.xml | 10 +- src/main/res/values/dimens.xml | 1 + 29 files changed, 521 insertions(+), 97 deletions(-) create mode 100644 art/message_bubble_received.svg create mode 100644 art/message_bubble_sent.svg create mode 100644 src/main/res/drawable-hdpi/ic_secure_indicator_white.png create mode 100644 src/main/res/drawable-hdpi/message_bubble_received.9.png create mode 100644 src/main/res/drawable-hdpi/message_bubble_sent.9.png create mode 100644 src/main/res/drawable-mdpi/ic_secure_indicator_white.png create mode 100644 src/main/res/drawable-mdpi/message_bubble_received.9.png create mode 100644 src/main/res/drawable-mdpi/message_bubble_sent.9.png create mode 100644 src/main/res/drawable-xhdpi/ic_secure_indicator_white.png create mode 100644 src/main/res/drawable-xhdpi/message_bubble_received.9.png create mode 100644 src/main/res/drawable-xhdpi/message_bubble_sent.9.png create mode 100644 src/main/res/drawable-xxhdpi/ic_secure_indicator_white.png create mode 100644 src/main/res/drawable-xxhdpi/message_bubble_received.9.png create mode 100644 src/main/res/drawable-xxhdpi/message_bubble_sent.9.png create mode 100644 src/main/res/drawable-xxxhdpi/message_bubble_received.9.png create mode 100644 src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png rename src/main/res/drawable/{message_border.xml => account_image_border.xml} (100%) diff --git a/art/message_bubble_received.svg b/art/message_bubble_received.svg new file mode 100644 index 000000000..4f4158616 --- /dev/null +++ b/art/message_bubble_received.svg @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/art/message_bubble_sent.svg b/art/message_bubble_sent.svg new file mode 100644 index 000000000..90ad5091a --- /dev/null +++ b/art/message_bubble_sent.svg @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/art/render.rb b/art/render.rb index 312dd06b1..926c7544d 100755 --- a/art/render.rb +++ b/art/render.rb @@ -1,11 +1,15 @@ #!/bin/env ruby -resolutions={ - 'mdpi'=> 1, + +require 'xml' + +resolutions = { + 'mdpi' => 1, 'hdpi' => 1.5, 'xhdpi' => 2, 'xxhdpi' => 3, 'xxxhdpi' => 4, } + images = { 'conversations_baloon.svg' => ['ic_launcher', 48], 'conversations_mono.svg' => ['ic_notification', 24], @@ -14,38 +18,110 @@ images = { 'ic_send_text_online.svg' => ['ic_send_text_online', 36], 'ic_send_text_away.svg' => ['ic_send_text_away', 36], 'ic_send_text_dnd.svg' => ['ic_send_text_dnd', 36], - 'ic_send_photo_online.svg' => ['ic_send_photo_online', 36], - 'ic_send_photo_offline.svg' => ['ic_send_photo_offline', 36], - 'ic_send_photo_away.svg' => ['ic_send_photo_away', 36], - 'ic_send_photo_dnd.svg' => ['ic_send_photo_dnd', 36], + 'ic_send_photo_online.svg' => ['ic_send_photo_online', 36], + 'ic_send_photo_offline.svg' => ['ic_send_photo_offline', 36], + 'ic_send_photo_away.svg' => ['ic_send_photo_away', 36], + 'ic_send_photo_dnd.svg' => ['ic_send_photo_dnd', 36], 'ic_send_location_online.svg' => ['ic_send_location_online', 36], - 'ic_send_location_offline.svg' => ['ic_send_location_offline', 36], - 'ic_send_location_away.svg' => ['ic_send_location_away', 36], - 'ic_send_location_dnd.svg' => ['ic_send_location_dnd', 36], + 'ic_send_location_offline.svg' => ['ic_send_location_offline', 36], + 'ic_send_location_away.svg' => ['ic_send_location_away', 36], + 'ic_send_location_dnd.svg' => ['ic_send_location_dnd', 36], 'ic_send_voice_online.svg' => ['ic_send_voice_online', 36], - 'ic_send_voice_offline.svg' => ['ic_send_voice_offline', 36], - 'ic_send_voice_away.svg' => ['ic_send_voice_away', 36], - 'ic_send_voice_dnd.svg' => ['ic_send_voice_dnd', 36], + 'ic_send_voice_offline.svg' => ['ic_send_voice_offline', 36], + 'ic_send_voice_away.svg' => ['ic_send_voice_away', 36], + 'ic_send_voice_dnd.svg' => ['ic_send_voice_dnd', 36], 'ic_send_cancel_online.svg' => ['ic_send_cancel_online', 36], - 'ic_send_cancel_offline.svg' => ['ic_send_cancel_offline', 36], - 'ic_send_cancel_away.svg' => ['ic_send_cancel_away', 36], - 'ic_send_cancel_dnd.svg' => ['ic_send_cancel_dnd', 36], - 'ic_send_picture_online.svg' => ['ic_send_picture_online', 36], - 'ic_send_picture_offline.svg' => ['ic_send_picture_offline', 36], - 'ic_send_picture_away.svg' => ['ic_send_picture_away', 36], - 'ic_send_picture_dnd.svg' => ['ic_send_picture_dnd', 36], + 'ic_send_cancel_offline.svg' => ['ic_send_cancel_offline', 36], + 'ic_send_cancel_away.svg' => ['ic_send_cancel_away', 36], + 'ic_send_cancel_dnd.svg' => ['ic_send_cancel_dnd', 36], + 'ic_send_picture_online.svg' => ['ic_send_picture_online', 36], + 'ic_send_picture_offline.svg' => ['ic_send_picture_offline', 36], + 'ic_send_picture_away.svg' => ['ic_send_picture_away', 36], + 'ic_send_picture_dnd.svg' => ['ic_send_picture_dnd', 36], 'md_switch_thumb_disable.svg' => ['switch_thumb_disable', 48], 'md_switch_thumb_off_normal.svg' => ['switch_thumb_off_normal', 48], 'md_switch_thumb_off_pressed.svg' => ['switch_thumb_off_pressed', 48], 'md_switch_thumb_on_normal.svg' => ['switch_thumb_on_normal', 48], 'md_switch_thumb_on_pressed.svg' => ['switch_thumb_on_pressed', 48], + 'message_bubble_received.svg' => ['message_bubble_received.9', 0], + 'message_bubble_sent.svg' => ['message_bubble_sent.9', 0], } -images.each do |source, result| - resolutions.each do |name, factor| - size = factor * result[1] - path = "../src/main/res/drawable-#{name}/#{result[0]}.png" - cmd = "inkscape -e #{path} -C -h #{size} -w #{size} #{source}" - puts cmd - system cmd + +# Executable paths for Mac OSX +# "/Applications/Inkscape.app/Contents/Resources/bin/inkscape" + +inkscape = "inkscape" +imagemagick = "convert" + +def execute_cmd(cmd) + puts cmd + system cmd +end + +images.each do |source_filename, settings| + svg_content = File.read(source_filename) + + svg = XML::Document.string(svg_content) + base_width = svg.root["width"].to_i + base_height = svg.root["height"].to_i + + guides = svg.find(".//sodipodi:guide") + + resolutions.each do |resolution, factor| + output_filename, base_size = settings + + if base_size > 0 + width = factor * base_size + height = factor * base_size + else + width = factor * base_width + height = factor * base_height + end + + path = "../src/main/res/drawable-#{resolution}/#{output_filename}.png" + execute_cmd "#{inkscape} -f #{source_filename} -z -C -w #{width} -h #{height} -e #{path}" + + top = [] + right = [] + bottom = [] + left = [] + + guides.each do |guide| + orientation = guide["orientation"] + x, y = guide["position"].split(",") + x, y = x.to_i, y.to_i + + if orientation == "1,0" and y == base_height + top.push(x * factor) + end + + if orientation == "0,1" and x == base_width + right.push((base_height - y) * factor) + end + + if orientation == "1,0" and y == 0 + bottom.push(x * factor) + end + + if orientation == "0,1" and x == 0 + left.push((base_height - y) * factor) + end + end + + next if top.length != 2 + next if right.length != 2 + next if bottom.length != 2 + next if left.length != 2 + + execute_cmd "#{imagemagick} -background none PNG32:#{path} -gravity center -extent #{width+2}x#{height+2} PNG32:#{path}" + + draw_format = "-draw \"rectangle %d,%d %d,%d\"" + top_line = draw_format % [top.min + 1, 0, top.max, 0] + right_line = draw_format % [width + 1, right.min + 1, width + 1, right.max] + bottom_line = draw_format % [bottom.min + 1, height + 1, bottom.max, height + 1] + left_line = draw_format % [0, left.min + 1, 0, left.max] + draws = "#{top_line} #{right_line} #{bottom_line} #{left_line}" + + execute_cmd "#{imagemagick} -background none PNG32:#{path} -fill black -stroke none #{draws} PNG32:#{path}" end end diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 08e0f2989..679fb3558 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -81,15 +81,31 @@ public class MessageAdapter extends ArrayAdapter { return 3; } + public int getItemViewType(Message message) { + if (message.getType() == Message.TYPE_STATUS) { + return STATUS; + } else if (message.getStatus() <= Message.STATUS_RECEIVED) { + return RECEIVED; + } + + return SENT; + } + @Override public int getItemViewType(int position) { - if (getItem(position).getType() == Message.TYPE_STATUS) { - return STATUS; - } else if (getItem(position).getStatus() <= Message.STATUS_RECEIVED) { - return RECEIVED; - } else { - return SENT; + return this.getItemViewType(getItem(position)); + } + + private int getMessageTextColor(Message message) { + int type = this.getItemViewType(message); + + if (type == SENT) { + return activity.getResources().getColor(R.color.black87); + } else if (type == RECEIVED) { + return activity.getResources().getColor(R.color.white); } + + return activity.getPrimaryTextColor(); } private void displayStatus(ViewHolder viewHolder, Message message) { @@ -150,7 +166,7 @@ public class MessageAdapter extends ArrayAdapter { if (error) { viewHolder.time.setTextColor(activity.getWarningTextColor()); } else { - viewHolder.time.setTextColor(activity.getSecondaryTextColor()); + viewHolder.time.setTextColor(this.getMessageTextColor(message)); } if (message.getEncryption() == Message.ENCRYPTION_NONE) { viewHolder.indicator.setVisibility(View.GONE); @@ -294,7 +310,7 @@ public class MessageAdapter extends ArrayAdapter { } else { viewHolder.messageBody.setText(""); } - viewHolder.messageBody.setTextColor(activity.getPrimaryTextColor()); + viewHolder.messageBody.setTextColor(this.getMessageTextColor(message)); viewHolder.messageBody.setTypeface(null, Typeface.NORMAL); viewHolder.messageBody.setTextIsSelectable(true); } @@ -363,8 +379,9 @@ public class MessageAdapter extends ArrayAdapter { scalledW = (int) target; scalledH = (int) (params.height / ((double) params.width / target)); } - viewHolder.image.setLayoutParams(new LinearLayout.LayoutParams( - scalledW, scalledH)); + LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(scalledW, scalledH); + layoutParams.setMargins(0, (int)(metrics.density * 4), 0, (int)(metrics.density * 4)); + viewHolder.image.setLayoutParams(layoutParams); activity.loadBitmap(message, viewHolder.image); viewHolder.image.setOnClickListener(new OnClickListener() { diff --git a/src/main/res/drawable-hdpi/ic_secure_indicator.png b/src/main/res/drawable-hdpi/ic_secure_indicator.png index 2a2934fb1f6ab2f8b92e34c3760c13e58a8fa8a8..220463fc7ac0647354b2bacfa1097db0bd3954d6 100644 GIT binary patch delta 20 ccmZ3+w2Wy&AlH3%0YO299oJmFCPtqI07a$;NB{r; delta 20 ccmZ3+w2Wy&AlE%k5fKG>Q;qPw6QfT906_N!vH$=8 diff --git a/src/main/res/drawable-hdpi/ic_secure_indicator_white.png b/src/main/res/drawable-hdpi/ic_secure_indicator_white.png new file mode 100644 index 0000000000000000000000000000000000000000..46eb1195b286a0b51d01382ba7eff4c51a5ce3f8 GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|wj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwgots}?_4xcl>w!Y&JzX3_EKa|j=$pk9DA2O{esw~D z==+CS4{Z0i_dP9SdZfDPwBH4eQ`23uJgoghj`k)v8vE>h^=khGh6X7?_6NR~&U|rq z(b;Vt%M{SaR`aR5m${gC#os+Yj`Mi3dxl;*_GQOoB_+Mm;0DY38B7mnsMYaJDR$$H zV9ZXK=>FjZ_x`mF(~8?;%Kzo5rWP7cH(lRWsq9_$ zO4&Wa_~WPjee0fi$M(K!axFh}`GsI_)cgOxPyLy$xVYT&ceM0R#(5Lwy!;~d*dFLL N22WQ%mvv4FO#ne{fAatU literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-hdpi/message_bubble_received.9.png b/src/main/res/drawable-hdpi/message_bubble_received.9.png new file mode 100644 index 0000000000000000000000000000000000000000..eb44a1b6d82bfa9f3c2cbf9366c055edd461a2bd GIT binary patch literal 759 zcmeAS@N?(olHy`uVBq!ia0vp^7C@}Y!3HD~cwQ+0DVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(FffQ0%-I!a1C(G(@^*It(m?Rjd3QaK z;wmiP6u8*bbvv~r(-6gBHO%1bEgoU1ANY^M}j)d88&|4k>P$75U^4pX@R;>?j@D9 zjLjj1m$sD3ZvT1wNa3H8Wqh+8a(6ti2)wh-V&X{!XT?*8TiHcFWZT?5mpiv%qViQP z|C!D1c^_poC)9jgl+kg@aK2T<*KObS)J%w5qPcCo)D?NB4So`qPbB|E?p|-}cwx5A zig~}BAFFQOJ|!u0+iEG*33*}fS6yewS%3M;^B{HyZil5MF?PoL&uCv2^N(k;W|;J0 zUfvwGnD-1nm_K};s5{?Hlym+>36?9Ynl%x8OjlSfg#w~eBo<6NvBBZ(gu@J5o%pz~ zuvv0#kgr@PrOf<7DVjlQmEooay-Pv86FGZwk`}z{Y}}Qu*3hUOY?ZE7Rj|rg@NMhe zjSS1J3=Ld%TzhcSU6gJ}hG#`iu?)?Fu9 zc2%?bIQ`AD*kyao@w@wNLD4B!8$9<$FaKq1e9p(^XnDqsO5-5u|BRVzTYs8g{qYDG zzp5p!5hW>!C8<`)MX5lF!N|bSRM)^<*U&7)(9+7l!phi0+rY@mz@V)5;3pIfx%nxX zX_dG&uq#yh0X0a1YzWRzD=AMbN@XZ7FW1Y=%Pvk%EJ)SMFG`>N&PEETh{4m<&t;uc GLK6U86B?ud literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-hdpi/message_bubble_sent.9.png b/src/main/res/drawable-hdpi/message_bubble_sent.9.png new file mode 100644 index 0000000000000000000000000000000000000000..9daa36bd158a05a0402e06ea5a3a163ea0e48fa9 GIT binary patch literal 693 zcmeAS@N?(olHy`uVBq!ia0vp^7C@}Y!3HD~cwQ+0DVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(FffQ0%-I!a1C(G(@^*It(m?Rjd3QaK z;wAq@Nw1p1JZAHtS;=|pp$vZiRWcW#SFQXd2hWEYdFOf za_gr!U1q!C8(C<#A;y3D;*<69vf=9^GUJZ$d0sY|6y(>nXolv}Q_ga(foGOXnQY># zJew`{e9P&lMMg4w^JDC;=$u|RNu`p_%Gi7SgAZ=0@;z97Zr<8YOlN-N_v8o6pA92lRee~(H|OoH(gRlY=dQitEBu>THs`_~j{U_V2g3YY`WLZB&*i)E zrR2b}<;-TbaZKXfN9V5HR>>*T>t^oM!7lywvk-^C@sDc-9$nnhdygqsaWC5~hbn#( zS2L!JrW~Gv_>{#BzZFW&r&i9}f0ftBg>9GgzGt6*X5W?~H2gTtJ^f$53*%a&dJ(o3)StG&s zXx@~3=>@-+T-E*@8znEDoPFK!L5WR0^EZ!+0p(|%-UDMtwZt`|BqgyV)hf9t6-Y4{ z85o-C8kp-EnuQozS{Yba8JlSv7+Dz@JbZNFHj0Ma{FKbJO57SI?9WICYLEok5S*V@ pQl40p%1~Zju9umYU7Va)kgAtols@~NjTBH3gQu&X%Q~loCII062PXgk literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-mdpi/ic_secure_indicator.png b/src/main/res/drawable-mdpi/ic_secure_indicator.png index 5a73aef4b4b14f1c354f2fef34eb35ecb209d8bf..690d4d03d6f23e1dd8cc181726eec6c7700c55ee 100644 GIT binary patch delta 20 ccmZ3^w47-|AlH3%0YO1!#rq;3CPtqD07IPzH2?qr delta 20 ccmZ3^w47-|AlE%k5fMd(h1S`e6Qj=n06{4Rb^rhX diff --git a/src/main/res/drawable-mdpi/ic_secure_indicator_white.png b/src/main/res/drawable-mdpi/ic_secure_indicator_white.png new file mode 100644 index 0000000000000000000000000000000000000000..e2f894ef4436f7a918f952db1db4c2b7059914cd GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwgots}?D_r5e9Z+b$r;B5V#`&rJwpmVzA};4^y##`m zU)5sa_KvO2y7Cm32)J}~%oDlCFQ>*fCoL`E**})_fa(Lm zw+dZ+u6A&|UZ_?1f-}2x@~>9=W%pE8`&~)wy$! zfk$L9(Cq6V%;=;sy8xMY)*0!@~HLlNWDRkUes8tHqDRU1fzq0gkI(9W_ci#FTfw77*bPJl~z3cVe@u z<-Ok@h2F(A&VF%ZbHNt>iOE6HF>k|WMO`S^xBJ@smQ{A^eC;RAPdQa&Sv7ah`|!l; zwb4hq>n6-KahLL8wBLMek7(Wds&l!jA90?1*^Xse{MnV)4> zjmWbQj?l9RzQK9U{08IpZ-Q(BKe={$bIsuONniJf<5{Z8yuQ70eqUt z?U%YH_{p>M8%v{)RP3*B+@9|e;G_f!T-6fSh?11Vl2ohYqEsNoU}Ruus%v1bYiJf? zXlZ3&VP$NrZD3?&V6get{~8nxx%nxXX_dG&9BOwz0MsA}vLQG>t)x7$D3zhSyj(9c eFS|H7u^?41zbJk7I~ysWA_h-aKbLh*2~7YD#?ey% literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-mdpi/message_bubble_sent.9.png b/src/main/res/drawable-mdpi/message_bubble_sent.9.png new file mode 100644 index 0000000000000000000000000000000000000000..74fb8d41a27b8c4b8e03d727dcf0a82baf89ec2b GIT binary patch literal 570 zcmeAS@N?(olHy`uVBq!ia0vp^YCtT*!3Gk!b2b%7v7|ftIx;Y9?C1WI$O_~uBzpw; zGB8vD6*jamF#G}vHN0S8C^cYUc$L7wU^Rn*LA+qju0R{01Y44~y9wy$! zfk$L9(Cq6V%;=;sy8SN}Qr zhwcuZY9lf6Yco08J_~28757@%E09#@TbTX!n#5+Eu1B^lGjeX1%~m;C+%dI0cKhki zHGDGbMZJ3r)mpCTdug(k$gPifS)pOe_2ua9Wl#RRa6hP9ramKL%Jk$b)?%uYZ>T(T z4h_{0>`IN?b}4GVn>yQsWiM~J=UwRed4gB&-@c;7b57Y6`E6X5`AzvW=kyyJbxv>J zwa)(7l;UmI4hS1C%k9klp4j03pnLMQ-|Ib9KO8WSv|+fHU#IVm6RtIr81P4m+NKbWfvzW7NqLs7p2dBXCnnv O#Ng@b=d#Wzp$PzvRne*d literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_secure_indicator.png b/src/main/res/drawable-xhdpi/ic_secure_indicator.png index 1f4c9a32e377fc4859013dc6bd8230f720b933c7..cd0d1391a79451135e31157478c79d4ec4adc438 100644 GIT binary patch delta 21 dcmbQmJd1fkAlH3%0YO2vz^xDJH%8kt0su>22NeJS delta 21 dcmbQmJd1fkAlE%k5fM4f-QhPQH%8kt0su@e2MhoJ diff --git a/src/main/res/drawable-xhdpi/ic_secure_indicator_white.png b/src/main/res/drawable-xhdpi/ic_secure_indicator_white.png new file mode 100644 index 0000000000000000000000000000000000000000..b624a8ce6f899b026d106f77bbbe87401a49748c GIT binary patch literal 434 zcmV;j0ZsmiP){Sr_sDzS87>DG<2^d9sMFmZ$)r8^Vi6zt82kcdc0^J8(qiqeoY z6H+aG`Xu}L`TOH%S%(3V1RyiJF|%tAy_;E9$0T7x4Vd`80-k`JU(4OMir7<%Y=Fv1 zE1>iheVbFs*G^LSo&hhuvPNt@gg6BfU>ly~8CV3&!hN-EJtyr`U<%AUaSyx!%NE?y zV|&NWfN2w#{88^G_%~y(h#2mcR|G#)I1Ly_x>MOk{)VK)k>695RUDqQ{V26Sf4KwNk!Wy zl`Z6z`{JtN>$nV@TQmC_FoW7= c(q-iQ28(7b+iT|Ao&W#<07*qoM6N<$g7$H^p8x;= literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/message_bubble_received.9.png b/src/main/res/drawable-xhdpi/message_bubble_received.9.png new file mode 100644 index 0000000000000000000000000000000000000000..0f5f1ac6e494b91b758e0aafaac51aafd4fee9bb GIT binary patch literal 922 zcmeAS@N?(olHy`uVBq!ia0vp^UO;Td!3HD~4ERq2DVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(FffQ0%-I!a1C(G(@^*It(m?Rjd3QaK z;waU*$^DajE)db)REM!j6e-Mh^ro%zxiL`{VZ?E8oAF zv*=6ig3gC;jXIkqu3%1J;5oEa-~UnmMdSNFcRFd7N^aK3RrX@m+`#{aY4^j$>!m{{ zwJz>z>Rb~a5jXYiy6c`X3xm=LdbV_MdV1RMt=Z+?+le5A_ zuDDF&4h&$9T<79=G;GwAZF$}1vM#II$D{U9dk3TOGdSu@{lUWxhOYJW+EYSNO zA1{3OV_4Lb1{MHl8SM{09f1&Ivz_Relk9Q&IhWYHT zZPwc}1W7laHF>-Om;_ZzTq8mmtT}V T`<;yxP!WTttDnm{r-UW|&ckvm literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png new file mode 100644 index 0000000000000000000000000000000000000000..7939f213f0f486f93cfb199c62c0d9e9fcca2ca6 GIT binary patch literal 832 zcmeAS@N?(olHy`uVBq!ia0vp^UO;Td!3HD~4ERq2DVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(FffQ0%-I!a1C(G(@^*It(m?Rjd3QaK z;w-PUWh=XNZ|oL3Vt#A(UcRd47ft~kQx1j}s9RS*JmECu z^UPu!{b z!26#ybvJX&DkcUN{juv~UAV2{+!i6UV#)Q_cguI*{d_RtL-xi9 zo1gPi;&Pj(eq~{nVd7oDTH|T2|5-7iF+G9Lr@`WH#m<+m>`nT!7+%Zo-tVAW8#^=q zUBvm*454B9f4HUdRtevoaQ^@7xa;9F!>?GK&Jxv)SeP3V7%e+-{W^h7>-BsuZwY#q z6@0HWS?5mTNB;bY6Ys96bmIdi6x9;fh?11Vl2ohYqEsNoU}Ruus%v1bYiJf?XlZ3& zVP$NtZD3?&VBkLWc0P)R-29Zxv`X9>%uXa<25OK5*$|wcR#Ki=l*&+EUaps!mtCBk aSdglhUz9%kosASw5re0zpUXO@geCy;(oKB; literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_secure_indicator.png b/src/main/res/drawable-xxhdpi/ic_secure_indicator.png index 1ee9b67dccc335d96dc3a37b7e141d6cbde7f652..6a74ccbefd22f5c4216b52a50e65ea2dfca98a88 100644 GIT binary patch delta 21 dcmeyv^oMCeAlH3%0YO2z%Iy&kH%2Qm0svYK2ekkI delta 21 dcmeyv^oMCeAlE%k5fKH(^XggmHbyHl0svVU2ZR6s diff --git a/src/main/res/drawable-xxhdpi/ic_secure_indicator_white.png b/src/main/res/drawable-xxhdpi/ic_secure_indicator_white.png new file mode 100644 index 0000000000000000000000000000000000000000..4945c9595fbde5ad2bb34e0164fd658319350264 GIT binary patch literal 441 zcmV;q0Y?6bP)2QE&&-_~ogQLl#p=0L5#LcZV970V_#Ov<1DS9Wc+? z?~cwT?YuTbqXAaHY;=Zv@sp&FG!MTx9%4O9I+$5M*}?c|6`%riuZEn|m85o}x2!g^ zZm>f@1?-d0i8fi&Gf>ev6x1dq`}7kfw`GS6#Mo`VR@-{766yj}fC^9nDnJFO02QDc jKrfQ&Kj>Y1um7zt0#H@V=1JnH00000NkvXXu0mjfsA{xX literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png new file mode 100644 index 0000000000000000000000000000000000000000..c47974c5f967120836abdaf3407874316661fe5b GIT binary patch literal 1319 zcmeAS@N?(olHy`uVBq!ia0vp^c|aV%!3HFMXgjC@DVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMpj<->1H&(%P{RubhEf9thF1v;3|2E37{m+a>;l3ZO6OuC1sE8ZKYF@2hE&{oJ9mG+jH^h) z{+rhEIqZ%L96dw=Jyv80u(E2d{K@@8I>VWYly41qd zdL&&~)k`M+aeVc@*`6D%cWyrTKZ8G8aQcL*Ud@icBrYBm{n_BR=K<9_t&4S?A#kSEAW5kIKHXy&yVYi_pdLOw0>*d z+GYH7YHUPRdgHX8N@ZF{9{src_S4I~=ik|;bWOa$wdekn+%&VgS9h!aJ~q}hPPXfs z%REuy+$=NsoHKbf$LBvh>wM(r#cNDf2Xfv|zbC&wwr18*Q@|6RRdDd2s(#>r5k$!?p|5l6-IOw0-E_q;hZef9NU z{Gaoao;#>WzGu#L^WVZbyVX!nkG-rRSK)nJT=c8|lk26e`7aq9+rxQA;KvtkQTEn7 ziWkyV^0;rjj0>y`zO+an{B}pP)14hQ`arR;%HW4b54L<-CdjU}KC5X-ulWqNso}DY z!on8wECMPoTC4+-fh(M3R_r;p(hEqstqcOOS44r>E1ZGkt(D$DGHPWoh`k~j#LfVz zKa~km@0AHse<~wN=Fk2;bKgzfy7Y$ULj}#=e!t3QQwQ2?S8zKvW_RND+z;m-T-tE^TUmMGTedwG7D-8!npYP| zo|=1A^3ulHWtHy^-Kk!de6LG3LiUF4?mhnwZ$AH-{il^{Zo>SAMboDoIrt)`xoqF8 z@74Ri*3GpyzkS+IGC3;kUP_u>S;O&zymyRuTke^B|Nh^7zpuVZ+Ba!^@RXqULGLu= zC#?wipuCQG4qKe&`pB->L(Six`3uDV-si5Ey?M_z4w=G@+CltfrvgRH-WmO3s^OTE z)HU~zaPpo8WBuPR+;2A=;Pmo(RP+28_pjWa#mjrHc28D2@BJ~|?2F{d*VAkHW`!=B z(eTl@=9WnRNwdZ7sa=NthklqT{#!DIQ91L`(VsiwWGavSn>a1&jQhhI_MhG~-e*C;H5{l9qST9fmu!D=~I_qI&U>z%{%IP`hM|&P2bXXT;VnYmItaO zt`Q|Ei6yC4$wjF^iowXh&{WsJT-VSn#L&{pz{1MdMBBi~%D|wk_TVQJ4Y~O#nQ4`{ zHLxpG`T;daf@}!RPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw{mw=TsEEPS)z4*}Q$iB} DR;onI literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png new file mode 100644 index 0000000000000000000000000000000000000000..2117c187b45e92022ee982694742b1ba26eb3fa9 GIT binary patch literal 1195 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 literal 0 HcmV?d00001 diff --git a/src/main/res/drawable/message_border.xml b/src/main/res/drawable/account_image_border.xml similarity index 100% rename from src/main/res/drawable/message_border.xml rename to src/main/res/drawable/account_image_border.xml diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml index 4b2497458..3b249a665 100644 --- a/src/main/res/layout/activity_publish_profile_picture.xml +++ b/src/main/res/layout/activity_publish_profile_picture.xml @@ -12,7 +12,7 @@ android:layout_centerHorizontal="true" android:layout_marginBottom="8dp" android:layout_marginTop="24dp" - android:background="@drawable/message_border" > + android:background="@drawable/account_image_border" > + android:paddingTop="@dimen/activity_horizontal_margin" + android:paddingBottom="@dimen/activity_horizontal_margin" + android:clipToPadding="false" + tools:listitem="@layout/message_sent"> + android:paddingBottom="0dp" + android:paddingLeft="@dimen/activity_vertical_margin" + android:paddingRight="4dp" + android:paddingTop="0dp"> + + + android:orientation="vertical">