From a7836eaded293cdc3d0fc6b60d4912233f1f1546 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 3 Mar 2017 19:20:25 +0100 Subject: [PATCH] Sending voice messages using 'Raise to speak' :-) --- .../b44t/messenger/SendMessagesHelper.java | 13 ++++++++++-- .../main/java/com/b44t/ui/ChatActivity.java | 1 + .../ui/Components/ChatActivityEnterView.java | 19 +++--------------- .../b44t/ui/Components/SeekBarWaveform.java | 2 +- .../src/main/res/drawable-hdpi/recorded.9.png | Bin 690 -> 0 bytes .../src/main/res/drawable-mdpi/recorded.9.png | Bin 460 -> 0 bytes .../main/res/drawable-xhdpi/recorded.9.png | Bin 841 -> 1251 bytes .../main/res/drawable-xxhdpi/recorded.9.png | Bin 1412 -> 0 bytes 8 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 MessengerProj/src/main/res/drawable-hdpi/recorded.9.png delete mode 100644 MessengerProj/src/main/res/drawable-mdpi/recorded.9.png delete mode 100644 MessengerProj/src/main/res/drawable-xxhdpi/recorded.9.png diff --git a/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java b/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java index f97479a0a..c021c4cbf 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java @@ -438,8 +438,17 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter { // SEND AUDIO int time_ms = 0; - if( params.get("mr_time_ms") != null ) { - time_ms = Integer.parseInt(params.get("mr_time_ms")); + if( params!=null && params.get("mr_time_ms") != null ) { + time_ms = Integer.parseInt(params.get("mr_time_ms")); // if possible, use a higher resolution + } + else { + for (int i = 0; i < document.attributes.size(); i++) { + TLRPC.DocumentAttribute a = document.attributes.get(i); + if (a instanceof TLRPC.TL_documentAttributeAudio) { + time_ms = a.duration * 1000; + break; + } + } } newMsg_id = mrChat.sendMedia( diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java index 894c036db..0e1a3dbc8 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java @@ -1944,6 +1944,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not else if (id == NotificationCenter.messageSendError) { chatAdapter.notifyDataSetChanged(); + AndroidUtilities.showErrorHint(getParentActivity()); } else if (id == NotificationCenter.contactsDidLoaded) { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java index 217522b25..db1edbc86 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java @@ -98,7 +98,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe public SeekBarWaveformView(Context context) { super(context); seekBarWaveform = new SeekBarWaveform(context); - seekBarWaveform.setColors(0xffa2cef8, 0xffffffff, 0xffa2cef8); + seekBarWaveform.setColors(0xffffffff, Theme.MSG_AUDIO_SEEKBAR_DARK_COLOR, 0xffffffff); seekBarWaveform.setDelegate(new SeekBar.SeekBarDelegate() { @Override public void onSeekBarDrag(float progress) { @@ -915,21 +915,8 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe AnimatorSet.start(); } - private void sendMessage() { - if (parentFragment != null) { - String action; - TLRPC.Chat currentChat; - if ((int) dialog_id < 0) { - currentChat = MessagesController.getInstance().getChat(-(int) dialog_id); - /*if (currentChat != null && currentChat.participants_count > MessagesController.getInstance().groupBigSize) { - action = "bigchat_message"; - } else*/ { - action = "chat_message"; - } - } else { - action = "pm_message"; - } - } + private void sendMessage() + { if (audioToSend != null) { MessageObject playing = MediaController.getInstance().getPlayingMessageObject(); if (playing != null && playing == audioToSendMessageObject) { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/SeekBarWaveform.java b/MessengerProj/src/main/java/com/b44t/ui/Components/SeekBarWaveform.java index 3d03789ca..84daaeeac 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/SeekBarWaveform.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/SeekBarWaveform.java @@ -162,7 +162,7 @@ public class SeekBarWaveform { float barCounter = 0; int nextBarNum = 0; - paintInner.setColor(messageObject != null && !messageObject.isOutOwner() && messageObject.isContentUnread() && messageObject.messageOwner.to_id.channel_id == 0 ? outerColor : (selected ? selectedColor : innerColor)); + paintInner.setColor(messageObject != null && !messageObject.isOutOwner() && messageObject.isContentUnread() ? outerColor : (selected ? selectedColor : innerColor)); paintOuter.setColor(outerColor); int y = (height - AndroidUtilities.dp(14)) / 2; diff --git a/MessengerProj/src/main/res/drawable-hdpi/recorded.9.png b/MessengerProj/src/main/res/drawable-hdpi/recorded.9.png deleted file mode 100644 index 5709cf5751b590533c64380a026bb1fdf32f2946..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 690 zcmV;j0!{siP){QM6PG&z6be!3l>MZ~JVE@Bw}H(i20PJ3cFb&%Jq`Uwn;Md#>Y^{i3@!4RMY zq!ARwiYKzxotgC7OmZ~XiuvNby`gU4 zy&#|`fB0b4aga3!bde*|T8=?#_c}6-WT#H^7<&{e>gE5JRl8SlTlufB*mh07*qoM6N<$f;YJ_lK=n! diff --git a/MessengerProj/src/main/res/drawable-mdpi/recorded.9.png b/MessengerProj/src/main/res/drawable-mdpi/recorded.9.png deleted file mode 100644 index efe1f2a7f4d575e1417d3c96e383d5c414e47b05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmV;-0WMA!rz zWuUU7GCl^zDudibA4e`>_h2;d0kEwcfF97+ULgLAo`aFO0>HNBJEGGL;*-^tN0#dW zA%vD|wA~2=sbNquJVdReB{EGA@0A@x$Hf65DuwJFefXVi_bg z2$KGSl!}L%s&eZZA>Edy>Nc4@pYf@nPM zE)}ti(@-j22dfkNi)X8@6OG6WIZbG*?*&V~a*744vYQH}E2rFWn~CCj(*xiO^MtfT z)n5bTX9+i=V{j6HlQ*%b3!y}O7w|rNK1-B_<@^A{Oo$zWkV}C800001TXu^2IC2kBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_ z000McNliru;R6E^E)&*-HVgm&1aL`2K~#9!?VQhV8&wd;zu#x8YoUgQsz@LZMJSX8 zB!uEU5VZ#%BRKRzdT52xMwD_e1lt?uKL{k=I7;P9B$OsX&3`2)4nU533FTn-PzlmT zDNBez}_k!t|PEX#UaR}hZlFq_TxkW2wMQKvZfNJRQg)0~P#B2se@sZ^?s z+ zH4+Yo`}g1~)w@O}lR1*l=dS~}facJ&VHlUA(dd%{1ChyOj;yb*e@C(lO(YSS4TVDI zs(?{BMmUbcd_F(XY!KYI(Us5VCmhGAc*84#$Y!%&0l0|f)x}&c_w~Ml<;cj$M*wEv z1Bu9a%YU+F_8cQ@+kS)OEjKapgH}bP!?LX3s*Vwk9KGOgK033HWke&{fZZ!QA`hV!EcLq_OnW7WGn;L;=bH}_L1j%k_ zCX(mNts}aipSrfq8bd=vuLgs`htN~6B@&4T3IKw^;QN|FfQWQ@UE@7nL6Cgc3!)wR zs@)6Xq{bjldO^IbF^ChJAO!zCk=9X1y%wP}h?dd?mDbt>v8FMDwM`Jz9K_#Vi}*uh z5Py%nAnt1n;=UKeyv88rw?K%IFT~LAKjD{d)o&wR)(eV?2MU6Ntx?|oB!Y#ZS*9gS8x7ci3(p4xF#sREo z0Aa-)E6RdMCX;I-GN!?7ajmqDyIdMR27h45#~ha28gA?g!m_N#A~N7(YZ&P7?_aJ6 z0su_YoD`8cA3~TjO>?r`cV$6DA`wwa^X`>T8RT(mYL0_aU45w!133trT?XI?3rKf z-PzfhG#bSoGNO7P_8WfAX2Nn@|AEbT3-k%ZK}R5|b)^4>pMSLm=L!qIo6|pJLC!b# zuG+460Zwg)oc&jAt82kED*@uV+dJ(r|2`Pr$-wy}b?_c|uhN0I;e9=0dHf+5*+q}{#`Jtmm`3vdT0aMQV0lpjb8x++64j_7ua&U>0izjgyjhvZhlxA z2qPV$ZHos1kAI)T#PbpY7!%q!=c|$)g#Dp&QpW(YB5I+{nSxLdT>h~_5cIeKHm8Fj z)4dKJe^)sO!`B3CPw|?}24OM&xT+9FV+McnUm#ShUvUUS&6rJ+LEK_{m*4_F>jDCO zL7(OWfe|AU8#RKUB{mYqi+B(^Y?gJD#r%7zK;R+M1~^BV2Ka}J%a>G6CfPV ze@P7lXmtWaM%m`7X=eRMH4lAran37GVOaQD65 xYb+I@U)s?>Iy1J5pW!)!1X2D!n;?m+@fXH%>?Z=gpe6tS002ovPDHLkV1km5ff4`! diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/recorded.9.png b/MessengerProj/src/main/res/drawable-xxhdpi/recorded.9.png deleted file mode 100644 index 0c72100abad6807ba598908c78ebf2803a0a5af0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1412 zcmV-~1$+95P)y?2NVsbKh%5UiXM8esU$?qo0Sx@L;)3(|R;r}%Kj4$*!b$W&Y`5R%T*+yz> z?Syz|GI`nxAQ=mgg*0t8ZLft8o>+W~I`vzH1jyod(}&6mF&5r_ftHYsoL4@su;K|7 znLbrYh#-~+?3zBQ8Sa|Cu@_=I{B?&XHcLqp=Rs1s=%QsjE5kzW)8uVZQMOejuUL@ahDuf^FPnqnDU1OP6h@UtS z!i)50HJ_BXK8X`2r3ztRM;HkmZC2VVMTilh-lPXEf%FaWz;INk5F=vYHM3Fx*}Yd& zenagoM2HW=+dC_6Gb$I6x@I`bT?lJ80>N8AAhgI;2r~hJ*zICdlXq_+KKkMB7i((3 zE6q@7IP6;pQuGwa><^xhr~4AZY~4X*PGWR7gCsrNo9YHg%ndiXxLuQOucUF1m;1y$ zz9k_(_uNT6L)t4ZtEQ6r>s>_H_7eP{KnCd7*D@g?I z&r;p0?PQs@5P^_mAg5%sBR^6jqLnTMa!NG>s^gu6fPv3}A#j}#CgTz@N^WAIY_@Al zh>=LX4pLkN87%Bu6N27V2SJLnUG_v2fy`X|ytAa2QF+|#NMNv6sRP;$mmS_r@)AOu4p@M>c4YQkjAWU|KcmC^DQ8#*2v zI+!?Em^cEVzX2%>jD9eKGckk1F~r0%1Xrm$SE(P~+?@>`m75SGt9EZ-zgAW?-uqDpHSE6;r$J=j z_!-3&8N@A_(i$i?>iU%wYd_Zlyr!5eh~27TFXsZhYbB{8bqxe>8rKUcNo}1+dwmpX z-wcW?(w;fCU>Rg@h^4}hEyzsXaH~Fv8s99BQNCA05$;vu z80GXecH*y>>Xj0vPnkXyL|1V_q{2Aguehgg+Vr7dnu-@<)$M8{L#h;zAWfUQxHqdO z#QNwEIYFJA;hRdO{xogOc{1iD#JV81hTd;0^K;mlo5NnunFzcN!C&?~#<3K$BJman==|2E>7