Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Display time of arrival for messages

Browse source
This commit is contained in:
Sylvain Berfini 2012-06-22 12:26:52 +02:00
parent bde8fdff1a
commit 3bc93a8583
4 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/values/custom.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="messages_date_format">HH:mm:ss d MMM</string>
<string name="app_name">Linphone 2</string>
<string name="notification_title">Linphone</string>

1
res/values/non_localizable_custom.xml
View file

@ -12,6 +12,7 @@
<bool name="useFirstLoginActivity">true</bool>
<bool name="disable_animations">false</bool>
<bool name="show_full_remote_address_on_incoming_call">true</bool>
<bool name="display_messages_time">true</bool> <!-- Used to show the time of each message arrival -->
<bool name="allow_transfers">true</bool>
<bool name="allow_edit_in_dialer">true</bool>

11
src/org/linphone/ChatFragment.java
View file

@ -79,7 +79,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneO
previousMessageID = -1;
for (ChatMessage msg : messagesList) {
displayMessage(msg.getId(), msg.getMessage(), msg.isIncoming(), messagesLayout);
displayMessage(msg.getId(), msg.getMessage(), msg.getTimestamp(), msg.isIncoming(), messagesLayout);
}
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
@ -89,11 +89,11 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneO
return view;
}
private void displayMessage(final int id, final String message, final boolean isIncoming, final RelativeLayout layout) {
private void displayMessage(final int id, final String message, final String time, final boolean isIncoming, final RelativeLayout layout) {
mHandler.post(new Runnable() {
@Override
public void run() {
BubbleChat bubble = new BubbleChat(layout.getContext(), id, message, isIncoming, previousMessageID);
BubbleChat bubble = new BubbleChat(layout.getContext(), id, message, time, isIncoming, previousMessageID);
previousMessageID = id;
layout.addView(bubble.getView());
}
@ -107,6 +107,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneO
LinphoneActivity.instance().selectMenu(FragmentsAvailable.CHAT);
LinphoneActivity.instance().updateChatFragment(this);
}
scrollToEnd();
}
@Override
@ -121,7 +122,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneO
LinphoneActivity.instance().onMessageSent(sipUri, messageToSend);
}
displayMessage(previousMessageID + 1, messageToSend, false, messagesLayout);
displayMessage(previousMessageID + 1, messageToSend, "", false, messagesLayout);
scrollToEnd();
}
}
@ -137,7 +138,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneO
@Override
public void onMessageReceived(LinphoneAddress from, String message) {
displayMessage(previousMessageID + 1, message, true, messagesLayout);
displayMessage(previousMessageID + 1, message, "", true, messagesLayout);
scrollToEnd();
}
}

24
src/org/linphone/ui/BubbleChat.java
View file

@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
import java.text.SimpleDateFormat;
import java.util.Calendar;
import org.linphone.R;
import android.content.Context;
@ -32,7 +35,7 @@ import android.widget.TextView;
public class BubbleChat {
private RelativeLayout view;
public BubbleChat(Context context, int id, String message, boolean isIncoming, int previousID) {
public BubbleChat(Context context, int id, String message, String time, boolean isIncoming, int previousID) {
view = new RelativeLayout(context);
LayoutParams layoutParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
@ -51,6 +54,7 @@ public class BubbleChat {
}
TextView messageView = new TextView(context);
messageView.setId(id);
messageView.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
messageView.setText(message);
messageView.setTextColor(Color.BLACK);
@ -58,9 +62,27 @@ public class BubbleChat {
view.setId(id);
view.setLayoutParams(layoutParams);
view.addView(messageView);
if (context.getResources().getBoolean(R.bool.display_messages_time)) {
TextView timeView = new TextView(context);
LayoutParams timeParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
timeParams.addRule(RelativeLayout.BELOW, id);
timeView.setLayoutParams(timeParams);
timeView.setText(timestampToHumanDate(context, time));
timeView.setTextColor(Color.GRAY);
timeView.setTextSize(12);
view.addView(timeView);
}
}
public View getView() {
return view;
}
private String timestampToHumanDate(Context context, String timestamp) {
SimpleDateFormat dateFormat = new SimpleDateFormat(context.getResources().getString(R.string.messages_date_format));
Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(Long.parseLong(timestamp));
return dateFormat.format(cal.getTime());
}
}